You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2015/11/23 23:07:13 UTC

[01/51] [partial] tomee git commit: removing ^M (windows eol)

Repository: tomee
Updated Branches:
  refs/heads/master eb7a8fc40 -> 6e2a4f7c4


http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java b/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
index 93f6b75..15a0f22 100644
--- a/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
+++ b/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
@@ -1,77 +1,77 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.moviefun;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.ejb.EJB;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(Arquillian.class)
-public class MoviesEJBTest {
-
-    @Deployment
-    public static WebArchive createDeployment() {
-        return ShrinkWrap.create(WebArchive.class, "test.war")
-                .addClasses(Movie.class, MoviesBean.class, MoviesEJBTest.class)
-                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml")
-                .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
-    }
-
-    @EJB
-    private MoviesBean movies;
-
-    @Before
-    @After
-    public void clean() {
-        movies.clean();
-    }
-
-    @Test
-    public void shouldBeAbleToAddAMovie() throws Exception {
-        assertNotNull("Verify that the ejb was injected", movies);
-
-        final Movie movie = new Movie();
-        movie.setDirector("Michael Bay");
-        movie.setGenre("Action");
-        movie.setRating(9);
-        movie.setTitle("Bad Boys");
-        movie.setYear(1995);
-        movies.addMovie(movie);
-
-        assertEquals(1, movies.count("title", "a"));
-        final List<Movie> moviesFound = movies.getMovies(0, 100, "title", "Bad Boys");
-        assertEquals(1, moviesFound.size());
-        assertEquals("Michael Bay", moviesFound.get(0).getDirector());
-        assertEquals("Action", moviesFound.get(0).getGenre());
-        assertEquals(9, moviesFound.get(0).getRating());
-        assertEquals("Bad Boys", moviesFound.get(0).getTitle());
-        assertEquals(1995, moviesFound.get(0).getYear());
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.moviefun;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.ejb.EJB;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(Arquillian.class)
+public class MoviesEJBTest {
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        return ShrinkWrap.create(WebArchive.class, "test.war")
+                .addClasses(Movie.class, MoviesBean.class, MoviesEJBTest.class)
+                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml")
+                .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
+    }
+
+    @EJB
+    private MoviesBean movies;
+
+    @Before
+    @After
+    public void clean() {
+        movies.clean();
+    }
+
+    @Test
+    public void shouldBeAbleToAddAMovie() throws Exception {
+        assertNotNull("Verify that the ejb was injected", movies);
+
+        final Movie movie = new Movie();
+        movie.setDirector("Michael Bay");
+        movie.setGenre("Action");
+        movie.setRating(9);
+        movie.setTitle("Bad Boys");
+        movie.setYear(1995);
+        movies.addMovie(movie);
+
+        assertEquals(1, movies.count("title", "a"));
+        final List<Movie> moviesFound = movies.getMovies(0, 100, "title", "Bad Boys");
+        assertEquals(1, moviesFound.size());
+        assertEquals("Michael Bay", moviesFound.get(0).getDirector());
+        assertEquals("Action", moviesFound.get(0).getGenre());
+        assertEquals(9, moviesFound.get(0).getRating());
+        assertEquals("Bad Boys", moviesFound.get(0).getTitle());
+        assertEquals(1995, moviesFound.get(0).getYear());
+    }
+
+}


[08/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/startup/ModuleStartupObserver.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/startup/ModuleStartupObserver.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/startup/ModuleStartupObserver.java
index 9af7889..0fb2a6b 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/startup/ModuleStartupObserver.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/startup/ModuleStartupObserver.java
@@ -1,38 +1,38 @@
-/*
- * 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.superbiz.deltaspike.startup;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-@Singleton
-@Startup
-public class ModuleStartupObserver {
-    private Logger logger = Logger.getLogger(ModuleStartupObserver.class.getName());
-
-    @PostConstruct
-    public void logStartup() {
-        if (logger.isLoggable(Level.INFO)) {
-            logger.info("starting application module");
-        }
-    }
-}
+/*
+ * 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.superbiz.deltaspike.startup;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@Singleton
+@Startup
+public class ModuleStartupObserver {
+    private Logger logger = Logger.getLogger(ModuleStartupObserver.class.getName());
+
+    @PostConstruct
+    public void logStartup() {
+        if (logger.isLoggable(Level.INFO)) {
+            logger.info("starting application module");
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/FeedbackPage.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/FeedbackPage.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/FeedbackPage.java
index 69b32e4..c359e3e 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/FeedbackPage.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/FeedbackPage.java
@@ -1,74 +1,74 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.superbiz.deltaspike.view;
-
-import org.apache.deltaspike.core.api.config.view.controller.PreRenderView;
-import org.apache.deltaspike.core.api.scope.GroupedConversation;
-import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
-import org.superbiz.deltaspike.domain.Feedback;
-import org.superbiz.deltaspike.repository.FeedbackRepository;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.Serializable;
-import java.util.List;
-
-@Named
-@GroupedConversationScoped
-public class FeedbackPage implements Serializable {
-    private static final long serialVersionUID = 744025508253889974L;
-
-    private List<Feedback> feedbackList;
-
-    @Inject
-    private GroupedConversation conversation;
-
-    @Inject
-    private FeedbackRepository feedbackRepository;
-
-    private Feedback feedback;
-
-    @PostConstruct
-    protected void init() {
-        this.feedback = new Feedback();
-    }
-
-    @PreRenderView
-    public void reloadFeedbackList() {
-        this.feedbackList = this.feedbackRepository.findAll();
-    }
-
-    public void save() {
-        this.feedbackRepository.save(this.feedback);
-        this.conversation.close();
-    }
-
-    /*
-     * generated
-     */
-
-    public List<Feedback> getFeedbackList() {
-        return feedbackList;
-    }
-
-    public Feedback getFeedback() {
-        return feedback;
-    }
-}
+/*
+ * 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.superbiz.deltaspike.view;
+
+import org.apache.deltaspike.core.api.config.view.controller.PreRenderView;
+import org.apache.deltaspike.core.api.scope.GroupedConversation;
+import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
+import org.superbiz.deltaspike.domain.Feedback;
+import org.superbiz.deltaspike.repository.FeedbackRepository;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.Serializable;
+import java.util.List;
+
+@Named
+@GroupedConversationScoped
+public class FeedbackPage implements Serializable {
+    private static final long serialVersionUID = 744025508253889974L;
+
+    private List<Feedback> feedbackList;
+
+    @Inject
+    private GroupedConversation conversation;
+
+    @Inject
+    private FeedbackRepository feedbackRepository;
+
+    private Feedback feedback;
+
+    @PostConstruct
+    protected void init() {
+        this.feedback = new Feedback();
+    }
+
+    @PreRenderView
+    public void reloadFeedbackList() {
+        this.feedbackList = this.feedbackRepository.findAll();
+    }
+
+    public void save() {
+        this.feedbackRepository.save(this.feedback);
+        this.conversation.close();
+    }
+
+    /*
+     * generated
+     */
+
+    public List<Feedback> getFeedbackList() {
+        return feedbackList;
+    }
+
+    public Feedback getFeedback() {
+        return feedback;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/InfoPage.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/InfoPage.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/InfoPage.java
index 66d635a..aa161df 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/InfoPage.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/InfoPage.java
@@ -1,36 +1,36 @@
-/*
- * 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.superbiz.deltaspike.view;
-
-import org.apache.deltaspike.core.api.config.view.metadata.ViewMetaData;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Target({TYPE})
-@Retention(RUNTIME)
-@Documented
-
-@ViewMetaData
-public @interface InfoPage {
-}
+/*
+ * 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.superbiz.deltaspike.view;
+
+import org.apache.deltaspike.core.api.config.view.metadata.ViewMetaData;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({TYPE})
+@Retention(RUNTIME)
+@Documented
+
+@ViewMetaData
+public @interface InfoPage {
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/MenuBean.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/MenuBean.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/MenuBean.java
index b797a86..a3fb281 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/MenuBean.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/MenuBean.java
@@ -1,61 +1,61 @@
-/*
- * 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.superbiz.deltaspike.view;
-
-import org.apache.deltaspike.core.spi.scope.conversation.GroupedConversationManager;
-import org.superbiz.deltaspike.view.config.Pages;
-
-import javax.enterprise.inject.Model;
-import javax.inject.Inject;
-
-@Model
-public class MenuBean {
-    @Inject
-    private GroupedConversationManager groupedConversationManager;
-
-    public Class<? extends Pages> home() {
-        //close all conversations of the current window
-        this.groupedConversationManager.closeConversations();
-        return Pages.Index.class;
-    }
-
-    public Class<? extends Pages.Secure> feedback() {
-        //close all conversations of the current window
-        this.groupedConversationManager.closeConversations();
-        return Pages.Secure.FeedbackList.class;
-    }
-
-    public Class<? extends Pages> about() {
-        //close all conversations of the current window
-        this.groupedConversationManager.closeConversations();
-        return Pages.About.class;
-    }
-
-    public Class<? extends Pages> login() {
-        //close all conversations of the current window
-        this.groupedConversationManager.closeConversations();
-        return Pages.Login.class;
-    }
-
-    public Class<? extends Pages> register() {
-        //close all conversations of the current window
-        this.groupedConversationManager.closeConversations();
-        return Pages.Registration.class;
-    }
-}
+/*
+ * 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.superbiz.deltaspike.view;
+
+import org.apache.deltaspike.core.spi.scope.conversation.GroupedConversationManager;
+import org.superbiz.deltaspike.view.config.Pages;
+
+import javax.enterprise.inject.Model;
+import javax.inject.Inject;
+
+@Model
+public class MenuBean {
+    @Inject
+    private GroupedConversationManager groupedConversationManager;
+
+    public Class<? extends Pages> home() {
+        //close all conversations of the current window
+        this.groupedConversationManager.closeConversations();
+        return Pages.Index.class;
+    }
+
+    public Class<? extends Pages.Secure> feedback() {
+        //close all conversations of the current window
+        this.groupedConversationManager.closeConversations();
+        return Pages.Secure.FeedbackList.class;
+    }
+
+    public Class<? extends Pages> about() {
+        //close all conversations of the current window
+        this.groupedConversationManager.closeConversations();
+        return Pages.About.class;
+    }
+
+    public Class<? extends Pages> login() {
+        //close all conversations of the current window
+        this.groupedConversationManager.closeConversations();
+        return Pages.Login.class;
+    }
+
+    public Class<? extends Pages> register() {
+        //close all conversations of the current window
+        this.groupedConversationManager.closeConversations();
+        return Pages.Registration.class;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/RegistrationPage.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/RegistrationPage.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/RegistrationPage.java
index 9853f7c..266d164 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/RegistrationPage.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/RegistrationPage.java
@@ -1,93 +1,93 @@
-/*
- * 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.superbiz.deltaspike.view;
-
-import org.apache.deltaspike.core.api.scope.GroupedConversation;
-import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
-import org.apache.deltaspike.jsf.api.message.JsfMessage;
-import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
-import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
-import org.superbiz.deltaspike.WebappMessageBundle;
-import org.superbiz.deltaspike.domain.User;
-import org.superbiz.deltaspike.domain.validation.Full;
-import org.superbiz.deltaspike.repository.UserRepository;
-import org.superbiz.deltaspike.view.config.Pages;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.Serializable;
-
-@Named
-@GroupedConversationScoped
-public class RegistrationPage implements Serializable {
-    private static final long serialVersionUID = 3844502441069448490L;
-
-    @Inject
-    private UserRepository userService;
-
-    @Inject
-    private GroupedConversation conversation;
-
-    @Inject
-    private JsfMessage<WebappMessageBundle> webappMessages;
-
-    private User user = new User();
-
-    @Inject
-    private UserHolder userHolder;
-
-    @Equals("user.password")
-    private String repeatedPassword;
-
-    @BeanValidation(useGroups = Full.class) //triggers UniqueUserNameValidator
-    public Class<? extends Pages> register() {
-        this.userService.save(this.user);
-        this.webappMessages.addInfo().msgUserRegistered(this.user.getUserName());
-
-        //in order to re-use the page-bean for the login-page
-        this.conversation.close();
-
-        return Pages.Login.class;
-    }
-
-    public Class<? extends Pages> login() {
-        User user = this.userService.findByUserName(this.user.getUserName());
-        if (user != null && user.getPassword().equals(this.user.getPassword())) {
-            this.webappMessages.addInfo().msgLoginSuccessful();
-            this.userHolder.setCurrentUser(user);
-            return Pages.About.class;
-        }
-
-        this.webappMessages.addError().msgLoginFailed();
-
-        return null;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public String getRepeatedPassword() {
-        return repeatedPassword;
-    }
-
-    public void setRepeatedPassword(String repeatedPassword) {
-        this.repeatedPassword = repeatedPassword;
-    }
+/*
+ * 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.superbiz.deltaspike.view;
+
+import org.apache.deltaspike.core.api.scope.GroupedConversation;
+import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
+import org.apache.deltaspike.jsf.api.message.JsfMessage;
+import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
+import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
+import org.superbiz.deltaspike.WebappMessageBundle;
+import org.superbiz.deltaspike.domain.User;
+import org.superbiz.deltaspike.domain.validation.Full;
+import org.superbiz.deltaspike.repository.UserRepository;
+import org.superbiz.deltaspike.view.config.Pages;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.Serializable;
+
+@Named
+@GroupedConversationScoped
+public class RegistrationPage implements Serializable {
+    private static final long serialVersionUID = 3844502441069448490L;
+
+    @Inject
+    private UserRepository userService;
+
+    @Inject
+    private GroupedConversation conversation;
+
+    @Inject
+    private JsfMessage<WebappMessageBundle> webappMessages;
+
+    private User user = new User();
+
+    @Inject
+    private UserHolder userHolder;
+
+    @Equals("user.password")
+    private String repeatedPassword;
+
+    @BeanValidation(useGroups = Full.class) //triggers UniqueUserNameValidator
+    public Class<? extends Pages> register() {
+        this.userService.save(this.user);
+        this.webappMessages.addInfo().msgUserRegistered(this.user.getUserName());
+
+        //in order to re-use the page-bean for the login-page
+        this.conversation.close();
+
+        return Pages.Login.class;
+    }
+
+    public Class<? extends Pages> login() {
+        User user = this.userService.findByUserName(this.user.getUserName());
+        if (user != null && user.getPassword().equals(this.user.getPassword())) {
+            this.webappMessages.addInfo().msgLoginSuccessful();
+            this.userHolder.setCurrentUser(user);
+            return Pages.About.class;
+        }
+
+        this.webappMessages.addError().msgLoginFailed();
+
+        return null;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public String getRepeatedPassword() {
+        return repeatedPassword;
+    }
+
+    public void setRepeatedPassword(String repeatedPassword) {
+        this.repeatedPassword = repeatedPassword;
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/UserHolder.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/UserHolder.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/UserHolder.java
index b59849e..7cef222 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/UserHolder.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/UserHolder.java
@@ -1,54 +1,54 @@
-/*
- * 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.superbiz.deltaspike.view;
-
-import org.apache.deltaspike.core.api.scope.WindowScoped;
-import org.superbiz.deltaspike.domain.User;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.Serializable;
-
-//due to the enhanced entities it isn't possible to use them directly (due to final methods)
-@WindowScoped
-public class UserHolder implements Serializable {
-    private static final long serialVersionUID = -7687528373042288584L;
-
-    @Inject
-    @New
-    private User user;
-
-    @Produces
-    @Dependent
-    @Named("currentUser")
-    protected User createCurrentUser() {
-        return this.user;
-    }
-
-    public void setCurrentUser(User user) {
-        this.user = user;
-    }
-
-    public boolean isLoggedIn() {
-        return this.user.getId() != null;
-    }
-}
+/*
+ * 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.superbiz.deltaspike.view;
+
+import org.apache.deltaspike.core.api.scope.WindowScoped;
+import org.superbiz.deltaspike.domain.User;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.Serializable;
+
+//due to the enhanced entities it isn't possible to use them directly (due to final methods)
+@WindowScoped
+public class UserHolder implements Serializable {
+    private static final long serialVersionUID = -7687528373042288584L;
+
+    @Inject
+    @New
+    private User user;
+
+    @Produces
+    @Dependent
+    @Named("currentUser")
+    protected User createCurrentUser() {
+        return this.user;
+    }
+
+    public void setCurrentUser(User user) {
+        this.user = user;
+    }
+
+    public boolean isLoggedIn() {
+        return this.user.getId() != null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/config/Pages.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/config/Pages.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/config/Pages.java
index d973520..d1a6622 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/config/Pages.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/config/Pages.java
@@ -1,55 +1,55 @@
-/*
- * 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.superbiz.deltaspike.view.config;
-
-import org.apache.deltaspike.core.api.config.view.DefaultErrorView;
-import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.core.api.config.view.controller.ViewControllerRef;
-import org.apache.deltaspike.jsf.api.config.view.View;
-import org.apache.deltaspike.security.api.authorization.Secured;
-import org.superbiz.deltaspike.view.FeedbackPage;
-import org.superbiz.deltaspike.view.InfoPage;
-import org.superbiz.deltaspike.view.security.LoginAccessDecisionVoter;
-
-import static org.apache.deltaspike.jsf.api.config.view.View.NavigationMode.REDIRECT;
-
-@View(navigation = REDIRECT)
-public interface Pages extends ViewConfig {
-    class Index implements Pages {
-    }
-
-    @InfoPage
-    class About implements Pages {
-    }
-
-    class Registration implements Pages {
-    }
-
-    class Login extends DefaultErrorView implements Pages /*just to benefit from the config*/ {
-    }
-
-    @Secured(LoginAccessDecisionVoter.class)
-            //@Secured(value = LoginAccessDecisionVoter.class, errorView = Login.class)
-    interface Secure extends Pages {
-        @ViewControllerRef(FeedbackPage.class)
-                //optional: @View
-        class FeedbackList implements Secure {
-        }
-    }
-}
+/*
+ * 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.superbiz.deltaspike.view.config;
+
+import org.apache.deltaspike.core.api.config.view.DefaultErrorView;
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+import org.apache.deltaspike.core.api.config.view.controller.ViewControllerRef;
+import org.apache.deltaspike.jsf.api.config.view.View;
+import org.apache.deltaspike.security.api.authorization.Secured;
+import org.superbiz.deltaspike.view.FeedbackPage;
+import org.superbiz.deltaspike.view.InfoPage;
+import org.superbiz.deltaspike.view.security.LoginAccessDecisionVoter;
+
+import static org.apache.deltaspike.jsf.api.config.view.View.NavigationMode.REDIRECT;
+
+@View(navigation = REDIRECT)
+public interface Pages extends ViewConfig {
+    class Index implements Pages {
+    }
+
+    @InfoPage
+    class About implements Pages {
+    }
+
+    class Registration implements Pages {
+    }
+
+    class Login extends DefaultErrorView implements Pages /*just to benefit from the config*/ {
+    }
+
+    @Secured(LoginAccessDecisionVoter.class)
+            //@Secured(value = LoginAccessDecisionVoter.class, errorView = Login.class)
+    interface Secure extends Pages {
+        @ViewControllerRef(FeedbackPage.class)
+                //optional: @View
+        class FeedbackList implements Secure {
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/security/LoginAccessDecisionVoter.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/security/LoginAccessDecisionVoter.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/security/LoginAccessDecisionVoter.java
index 71a3cfa..1729e49 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/security/LoginAccessDecisionVoter.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/security/LoginAccessDecisionVoter.java
@@ -1,48 +1,48 @@
-/*
- * 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.superbiz.deltaspike.view.security;
-
-import org.apache.deltaspike.security.api.authorization.AbstractAccessDecisionVoter;
-import org.apache.deltaspike.security.api.authorization.AccessDecisionVoterContext;
-import org.apache.deltaspike.security.api.authorization.SecurityViolation;
-import org.superbiz.deltaspike.WebappMessageBundle;
-import org.superbiz.deltaspike.view.UserHolder;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import java.util.Set;
-
-@ApplicationScoped
-public class LoginAccessDecisionVoter extends AbstractAccessDecisionVoter {
-    private static final long serialVersionUID = -6332617547592896599L;
-
-    @Inject
-    private UserHolder userHolder;
-
-    @Inject
-    private WebappMessageBundle webappMessageBundle;
-
-    @Override
-    protected void checkPermission(AccessDecisionVoterContext accessDecisionVoterContext,
-                                   Set<SecurityViolation> violations) {
-        if (!this.userHolder.isLoggedIn()) {
-            violations.add(newSecurityViolation(this.webappMessageBundle.msgAccessDenied()));
-        }
-    }
-}
+/*
+ * 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.superbiz.deltaspike.view.security;
+
+import org.apache.deltaspike.security.api.authorization.AbstractAccessDecisionVoter;
+import org.apache.deltaspike.security.api.authorization.AccessDecisionVoterContext;
+import org.apache.deltaspike.security.api.authorization.SecurityViolation;
+import org.superbiz.deltaspike.WebappMessageBundle;
+import org.superbiz.deltaspike.view.UserHolder;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import java.util.Set;
+
+@ApplicationScoped
+public class LoginAccessDecisionVoter extends AbstractAccessDecisionVoter {
+    private static final long serialVersionUID = -6332617547592896599L;
+
+    @Inject
+    private UserHolder userHolder;
+
+    @Inject
+    private WebappMessageBundle webappMessageBundle;
+
+    @Override
+    protected void checkPermission(AccessDecisionVoterContext accessDecisionVoterContext,
+                                   Set<SecurityViolation> violations) {
+        if (!this.userHolder.isLoggedIn()) {
+            violations.add(newSecurityViolation(this.webappMessageBundle.msgAccessDenied()));
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/util/InfoBean.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/util/InfoBean.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/util/InfoBean.java
index 3f10344..a7c2bab 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/util/InfoBean.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/util/InfoBean.java
@@ -1,135 +1,135 @@
-/*
- * 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.superbiz.deltaspike.view.util;
-
-import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigDescriptor;
-import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
-import org.apache.deltaspike.core.spi.scope.window.WindowContext;
-import org.apache.deltaspike.jsf.api.message.JsfMessage;
-import org.apache.myfaces.extensions.validator.ExtValInformation;
-import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.superbiz.deltaspike.WebappMessageBundle;
-import org.superbiz.deltaspike.view.InfoPage;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.Persistence;
-import javax.validation.Validation;
-import java.io.Serializable;
-
-@SuppressWarnings("CdiUnproxyableBeanTypesInspection")
-@Named
-@SessionScoped
-public class InfoBean implements Serializable {
-    private static final long serialVersionUID = -1748909261695527800L;
-
-    @Inject
-    private WindowContext windowContext;
-
-    @Inject
-    private JsfMessage<WebappMessageBundle> webappMessages;
-
-    @Inject
-    private ProjectStage projectStage;
-
-    @Inject
-    private ViewConfigResolver viewConfigResolver;
-
-    private String applicationMessageVersionInfo;
-
-    private String beanValidationVersion;
-
-    private String jpaVersion;
-
-    @PostConstruct
-    protected void showWelcomeMessage() {
-        String versionString = ClassUtils.getJarVersion(InfoBean.class);
-
-        if (versionString != null) {
-            this.applicationMessageVersionInfo = " (v" + versionString + ")";
-        }
-
-        this.beanValidationVersion =
-                ClassUtils.getJarVersion(Validation.buildDefaultValidatorFactory().getValidator().getClass());
-
-        this.jpaVersion =
-                ClassUtils.getJarVersion(Persistence.createEntityManagerFactory("demoApplicationPU").getClass());
-
-        if (!ProjectStage.IntegrationTest.equals(this.projectStage)) {
-            this.webappMessages.addInfo().msgWelcome();
-        }
-    }
-
-    public boolean isInfoPage() {
-        ViewConfigDescriptor viewConfigDescriptor =
-                this.viewConfigResolver.getViewConfigDescriptor(FacesContext.getCurrentInstance().getViewRoot().getViewId());
-
-        if (viewConfigDescriptor == null) {
-            return false;
-        }
-
-        return !viewConfigDescriptor.getMetaData(InfoPage.class).isEmpty();
-    }
-
-    public String getProjectStage() {
-        return this.projectStage.toString();
-    }
-
-    public String getApplicationVersion() {
-        return this.applicationMessageVersionInfo;
-    }
-
-    public String getDeltaSpikeVersion() {
-        return ClassUtils.getJarVersion(BeanManagerProvider.class);
-    }
-
-    public String getCdiVersion() {
-        try {
-            return ClassUtils.getJarVersion(BeanManagerProvider.getInstance().getBeanManager().getClass());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "Failed to get CDI Version: " + e.getMessage();
-        }
-    }
-
-    public String getExtValVersion() {
-        return ExtValInformation.VERSION;
-    }
-
-    public String getJsfVersion() {
-        return ClassUtils.getJarVersion(FacesContext.class);
-    }
-
-    public String getBeanValidationVersion() {
-        return this.beanValidationVersion;
-    }
-
-    public String getJpaVersion() {
-        return this.jpaVersion;
-    }
-
-    public String getWindowId() {
-        return this.windowContext.getCurrentWindowId();
-    }
-}
+/*
+ * 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.superbiz.deltaspike.view.util;
+
+import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigDescriptor;
+import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
+import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
+import org.apache.deltaspike.core.spi.scope.window.WindowContext;
+import org.apache.deltaspike.jsf.api.message.JsfMessage;
+import org.apache.myfaces.extensions.validator.ExtValInformation;
+import org.apache.myfaces.extensions.validator.util.ClassUtils;
+import org.superbiz.deltaspike.WebappMessageBundle;
+import org.superbiz.deltaspike.view.InfoPage;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.SessionScoped;
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.persistence.Persistence;
+import javax.validation.Validation;
+import java.io.Serializable;
+
+@SuppressWarnings("CdiUnproxyableBeanTypesInspection")
+@Named
+@SessionScoped
+public class InfoBean implements Serializable {
+    private static final long serialVersionUID = -1748909261695527800L;
+
+    @Inject
+    private WindowContext windowContext;
+
+    @Inject
+    private JsfMessage<WebappMessageBundle> webappMessages;
+
+    @Inject
+    private ProjectStage projectStage;
+
+    @Inject
+    private ViewConfigResolver viewConfigResolver;
+
+    private String applicationMessageVersionInfo;
+
+    private String beanValidationVersion;
+
+    private String jpaVersion;
+
+    @PostConstruct
+    protected void showWelcomeMessage() {
+        String versionString = ClassUtils.getJarVersion(InfoBean.class);
+
+        if (versionString != null) {
+            this.applicationMessageVersionInfo = " (v" + versionString + ")";
+        }
+
+        this.beanValidationVersion =
+                ClassUtils.getJarVersion(Validation.buildDefaultValidatorFactory().getValidator().getClass());
+
+        this.jpaVersion =
+                ClassUtils.getJarVersion(Persistence.createEntityManagerFactory("demoApplicationPU").getClass());
+
+        if (!ProjectStage.IntegrationTest.equals(this.projectStage)) {
+            this.webappMessages.addInfo().msgWelcome();
+        }
+    }
+
+    public boolean isInfoPage() {
+        ViewConfigDescriptor viewConfigDescriptor =
+                this.viewConfigResolver.getViewConfigDescriptor(FacesContext.getCurrentInstance().getViewRoot().getViewId());
+
+        if (viewConfigDescriptor == null) {
+            return false;
+        }
+
+        return !viewConfigDescriptor.getMetaData(InfoPage.class).isEmpty();
+    }
+
+    public String getProjectStage() {
+        return this.projectStage.toString();
+    }
+
+    public String getApplicationVersion() {
+        return this.applicationMessageVersionInfo;
+    }
+
+    public String getDeltaSpikeVersion() {
+        return ClassUtils.getJarVersion(BeanManagerProvider.class);
+    }
+
+    public String getCdiVersion() {
+        try {
+            return ClassUtils.getJarVersion(BeanManagerProvider.getInstance().getBeanManager().getClass());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "Failed to get CDI Version: " + e.getMessage();
+        }
+    }
+
+    public String getExtValVersion() {
+        return ExtValInformation.VERSION;
+    }
+
+    public String getJsfVersion() {
+        return ClassUtils.getJarVersion(FacesContext.class);
+    }
+
+    public String getBeanValidationVersion() {
+        return this.beanValidationVersion;
+    }
+
+    public String getJpaVersion() {
+        return this.jpaVersion;
+    }
+
+    public String getWindowId() {
+        return this.windowContext.getCurrentWindowId();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/MockedPageBeanTest.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/MockedPageBeanTest.java b/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/MockedPageBeanTest.java
index 72632f9..88be950 100644
--- a/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/MockedPageBeanTest.java
+++ b/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/MockedPageBeanTest.java
@@ -1,99 +1,99 @@
-/*
- * 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.superbiz.deltaspike.test;
-
-import org.apache.deltaspike.cdise.api.ContextControl;
-import org.apache.deltaspike.core.spi.scope.window.WindowContext;
-import org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.superbiz.deltaspike.WebappMessageBundle;
-import org.superbiz.deltaspike.domain.User;
-import org.superbiz.deltaspike.repository.UserRepository;
-import org.superbiz.deltaspike.view.RegistrationPage;
-import org.superbiz.deltaspike.view.config.Pages;
-
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-//@RunWith(CdiTestRunner.class)
-public class MockedPageBeanTest {
-
-    @Inject
-    private RegistrationPage registrationPage; //will use a the mocked UserRepository
-
-    @Inject
-    private WindowContext windowContext;
-
-    @Inject
-    private WebappMessageBundle webappMessageBundle;
-
-    @Inject
-    private DynamicMockManager mockManager;
-
-    @Inject
-    private UserRepository userRepository; //will inject the mocked instance
-
-    @Inject
-    private ContextControl contextControl;
-
-    @Ignore("Does no work because DS cannot mock dynamic repositories")
-    @Test
-    public void saveUserWithMockedBean() {
-        final String userName = "gp";
-        final String firstName = "Gerhard";
-        final String lastName = "Petracek";
-
-        // mockito doesn't support interfaces...seriously? but you can mock CDI impl
-        // here we don't have one so implementing for the test the interface
-        final UserRepository mockedUserRepository = (UserRepository) Proxy.newProxyInstance(
-                Thread.currentThread().getContextClassLoader(),
-                new Class<?>[]{UserRepository.class},
-                new InvocationHandler() {
-                    @Override
-                    public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
-                        return new User(userName, firstName, lastName.toUpperCase() /*just to illustrate that the mock-instance is used*/);
-                    }
-                });
-        mockManager.addMock(mockedUserRepository);
-
-
-        this.windowContext.activateWindow("testWindow");
-
-        this.registrationPage.getUser().setUserName(userName);
-        this.registrationPage.getUser().setFirstName(firstName);
-        this.registrationPage.getUser().setLastName(lastName);
-        this.registrationPage.getUser().setPassword("123");
-
-        final Class<? extends Pages> targetPage = this.registrationPage.register();
-
-        Assert.assertEquals(Pages.Login.class, targetPage);
-        Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
-        Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
-
-        final User user = this.userRepository.findByUserName(userName);
-        Assert.assertNotNull(user);
-        Assert.assertEquals(firstName, user.getFirstName());
-        Assert.assertEquals(lastName.toUpperCase(), user.getLastName());
-    }
-}
+/*
+ * 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.superbiz.deltaspike.test;
+
+import org.apache.deltaspike.cdise.api.ContextControl;
+import org.apache.deltaspike.core.spi.scope.window.WindowContext;
+import org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.superbiz.deltaspike.WebappMessageBundle;
+import org.superbiz.deltaspike.domain.User;
+import org.superbiz.deltaspike.repository.UserRepository;
+import org.superbiz.deltaspike.view.RegistrationPage;
+import org.superbiz.deltaspike.view.config.Pages;
+
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+//@RunWith(CdiTestRunner.class)
+public class MockedPageBeanTest {
+
+    @Inject
+    private RegistrationPage registrationPage; //will use a the mocked UserRepository
+
+    @Inject
+    private WindowContext windowContext;
+
+    @Inject
+    private WebappMessageBundle webappMessageBundle;
+
+    @Inject
+    private DynamicMockManager mockManager;
+
+    @Inject
+    private UserRepository userRepository; //will inject the mocked instance
+
+    @Inject
+    private ContextControl contextControl;
+
+    @Ignore("Does no work because DS cannot mock dynamic repositories")
+    @Test
+    public void saveUserWithMockedBean() {
+        final String userName = "gp";
+        final String firstName = "Gerhard";
+        final String lastName = "Petracek";
+
+        // mockito doesn't support interfaces...seriously? but you can mock CDI impl
+        // here we don't have one so implementing for the test the interface
+        final UserRepository mockedUserRepository = (UserRepository) Proxy.newProxyInstance(
+                Thread.currentThread().getContextClassLoader(),
+                new Class<?>[]{UserRepository.class},
+                new InvocationHandler() {
+                    @Override
+                    public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
+                        return new User(userName, firstName, lastName.toUpperCase() /*just to illustrate that the mock-instance is used*/);
+                    }
+                });
+        mockManager.addMock(mockedUserRepository);
+
+
+        this.windowContext.activateWindow("testWindow");
+
+        this.registrationPage.getUser().setUserName(userName);
+        this.registrationPage.getUser().setFirstName(firstName);
+        this.registrationPage.getUser().setLastName(lastName);
+        this.registrationPage.getUser().setPassword("123");
+
+        final Class<? extends Pages> targetPage = this.registrationPage.register();
+
+        Assert.assertEquals(Pages.Login.class, targetPage);
+        Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+        Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
+
+        final User user = this.userRepository.findByUserName(userName);
+        Assert.assertNotNull(user);
+        Assert.assertEquals(firstName, user.getFirstName());
+        Assert.assertEquals(lastName.toUpperCase(), user.getLastName());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/PageBeanTest.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/PageBeanTest.java b/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/PageBeanTest.java
index b3855c7..a7239ca 100644
--- a/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/PageBeanTest.java
+++ b/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/PageBeanTest.java
@@ -1,127 +1,127 @@
-/*
- * 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.superbiz.deltaspike.test;
-
-import org.apache.deltaspike.cdise.api.ContextControl;
-import org.apache.deltaspike.core.spi.scope.window.WindowContext;
-import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.superbiz.deltaspike.WebappMessageBundle;
-import org.superbiz.deltaspike.domain.User;
-import org.superbiz.deltaspike.repository.UserRepository;
-import org.superbiz.deltaspike.view.RegistrationPage;
-import org.superbiz.deltaspike.view.config.Pages;
-
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.persistence.PersistenceException;
-
-@RunWith(CdiTestRunner.class)
-public class PageBeanTest {
-    @Inject
-    private RegistrationPage registrationPage;
-
-    @Inject
-    private WindowContext windowContext;
-
-    @Inject
-    private WebappMessageBundle webappMessageBundle;
-
-    @Inject
-    private UserRepository userRepository;
-
-    @Inject
-    private ContextControl contextControl;
-
-    @Test(expected = PersistenceException.class)
-    public void duplicatedUser() {
-        final String userName = "tomee";
-        final String firstName = "Apache";
-        final String lastName = "TomEE";
-
-        this.userRepository.saveAndFlush(new User(userName, firstName, lastName));
-        this.userRepository.saveAndFlush(new User(userName, firstName + "2", lastName + "2"));
-    }
-
-    @Test
-    public void saveUser() {
-        final String userName = "GP";
-        final String firstName = "Gerhard";
-        final String lastName = "Petracek";
-        this.windowContext.activateWindow("testWindow");
-
-        this.registrationPage.getUser().setUserName(userName);
-        this.registrationPage.getUser().setFirstName(firstName);
-        this.registrationPage.getUser().setLastName(lastName);
-        this.registrationPage.getUser().setPassword("123");
-
-        Class<? extends Pages> targetPage = this.registrationPage.register();
-
-        Assert.assertEquals(Pages.Login.class, targetPage);
-        Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
-        Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
-
-        User user = this.userRepository.findByUserName(userName);
-        Assert.assertNotNull(user);
-        Assert.assertEquals(firstName, user.getFirstName());
-        Assert.assertEquals(lastName, user.getLastName());
-    }
-
-    @Test
-    public void saveUserAndLogin() {
-        final String userName = "tt";
-        final String firstName = "Tom";
-        final String lastName = "Tester";
-        this.windowContext.activateWindow("testWindow");
-
-        Assert.assertTrue(FacesContext.getCurrentInstance().getMessageList().isEmpty());
-
-        this.registrationPage.getUser().setUserName(userName);
-        this.registrationPage.getUser().setFirstName(firstName);
-        this.registrationPage.getUser().setLastName(lastName);
-        this.registrationPage.getUser().setPassword("123");
-
-        Class<? extends Pages> targetPage = this.registrationPage.register();
-
-        Assert.assertEquals(Pages.Login.class, targetPage);
-        Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
-        Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
-
-        User user = this.userRepository.findByUserName(userName);
-        Assert.assertNotNull(user);
-        Assert.assertEquals(firstName, user.getFirstName());
-        Assert.assertEquals(lastName, user.getLastName());
-
-        this.contextControl.stopContexts();
-        this.contextControl.startContexts();
-        this.windowContext.activateWindow("testWindow");
-
-        Assert.assertTrue(FacesContext.getCurrentInstance().getMessageList().isEmpty());
-
-        this.registrationPage.getUser().setUserName(userName);
-        this.registrationPage.getUser().setFirstName(firstName);
-        this.registrationPage.getUser().setLastName(lastName);
-        this.registrationPage.getUser().setPassword("123");
-
-        targetPage = this.registrationPage.login();
-        Assert.assertEquals(Pages.About.class, targetPage);
-    }
-}
+/*
+ * 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.superbiz.deltaspike.test;
+
+import org.apache.deltaspike.cdise.api.ContextControl;
+import org.apache.deltaspike.core.spi.scope.window.WindowContext;
+import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.superbiz.deltaspike.WebappMessageBundle;
+import org.superbiz.deltaspike.domain.User;
+import org.superbiz.deltaspike.repository.UserRepository;
+import org.superbiz.deltaspike.view.RegistrationPage;
+import org.superbiz.deltaspike.view.config.Pages;
+
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+import javax.persistence.PersistenceException;
+
+@RunWith(CdiTestRunner.class)
+public class PageBeanTest {
+    @Inject
+    private RegistrationPage registrationPage;
+
+    @Inject
+    private WindowContext windowContext;
+
+    @Inject
+    private WebappMessageBundle webappMessageBundle;
+
+    @Inject
+    private UserRepository userRepository;
+
+    @Inject
+    private ContextControl contextControl;
+
+    @Test(expected = PersistenceException.class)
+    public void duplicatedUser() {
+        final String userName = "tomee";
+        final String firstName = "Apache";
+        final String lastName = "TomEE";
+
+        this.userRepository.saveAndFlush(new User(userName, firstName, lastName));
+        this.userRepository.saveAndFlush(new User(userName, firstName + "2", lastName + "2"));
+    }
+
+    @Test
+    public void saveUser() {
+        final String userName = "GP";
+        final String firstName = "Gerhard";
+        final String lastName = "Petracek";
+        this.windowContext.activateWindow("testWindow");
+
+        this.registrationPage.getUser().setUserName(userName);
+        this.registrationPage.getUser().setFirstName(firstName);
+        this.registrationPage.getUser().setLastName(lastName);
+        this.registrationPage.getUser().setPassword("123");
+
+        Class<? extends Pages> targetPage = this.registrationPage.register();
+
+        Assert.assertEquals(Pages.Login.class, targetPage);
+        Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+        Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
+
+        User user = this.userRepository.findByUserName(userName);
+        Assert.assertNotNull(user);
+        Assert.assertEquals(firstName, user.getFirstName());
+        Assert.assertEquals(lastName, user.getLastName());
+    }
+
+    @Test
+    public void saveUserAndLogin() {
+        final String userName = "tt";
+        final String firstName = "Tom";
+        final String lastName = "Tester";
+        this.windowContext.activateWindow("testWindow");
+
+        Assert.assertTrue(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+
+        this.registrationPage.getUser().setUserName(userName);
+        this.registrationPage.getUser().setFirstName(firstName);
+        this.registrationPage.getUser().setLastName(lastName);
+        this.registrationPage.getUser().setPassword("123");
+
+        Class<? extends Pages> targetPage = this.registrationPage.register();
+
+        Assert.assertEquals(Pages.Login.class, targetPage);
+        Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+        Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
+
+        User user = this.userRepository.findByUserName(userName);
+        Assert.assertNotNull(user);
+        Assert.assertEquals(firstName, user.getFirstName());
+        Assert.assertEquals(lastName, user.getLastName());
+
+        this.contextControl.stopContexts();
+        this.contextControl.startContexts();
+        this.windowContext.activateWindow("testWindow");
+
+        Assert.assertTrue(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+
+        this.registrationPage.getUser().setUserName(userName);
+        this.registrationPage.getUser().setFirstName(firstName);
+        this.registrationPage.getUser().setLastName(lastName);
+        this.registrationPage.getUser().setPassword("123");
+
+        targetPage = this.registrationPage.login();
+        Assert.assertEquals(Pages.About.class, targetPage);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-i18n/src/main/java/org/superbiz/deltaspike/i18n/MessageHelper.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-i18n/src/main/java/org/superbiz/deltaspike/i18n/MessageHelper.java b/examples/deltaspike-i18n/src/main/java/org/superbiz/deltaspike/i18n/MessageHelper.java
index 17ddb8e..350bc46 100644
--- a/examples/deltaspike-i18n/src/main/java/org/superbiz/deltaspike/i18n/MessageHelper.java
+++ b/examples/deltaspike-i18n/src/main/java/org/superbiz/deltaspike/i18n/MessageHelper.java
@@ -1,27 +1,27 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.i18n;
-
-import org.apache.deltaspike.core.api.message.MessageBundle;
-import org.apache.deltaspike.core.api.message.MessageTemplate;
-
-@MessageBundle
-public interface MessageHelper {
-
-    @MessageTemplate("{openejb.and.deltaspike}")
-    String openejbAndDeltaspike();
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.i18n;
+
+import org.apache.deltaspike.core.api.message.MessageBundle;
+import org.apache.deltaspike.core.api.message.MessageTemplate;
+
+@MessageBundle
+public interface MessageHelper {
+
+    @MessageTemplate("{openejb.and.deltaspike}")
+    String openejbAndDeltaspike();
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-i18n/src/test/java/org/superbiz/deltaspike/i18n/MessageHelperTest.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-i18n/src/test/java/org/superbiz/deltaspike/i18n/MessageHelperTest.java b/examples/deltaspike-i18n/src/test/java/org/superbiz/deltaspike/i18n/MessageHelperTest.java
index b2c7ad6..8f24444 100644
--- a/examples/deltaspike-i18n/src/test/java/org/superbiz/deltaspike/i18n/MessageHelperTest.java
+++ b/examples/deltaspike-i18n/src/test/java/org/superbiz/deltaspike/i18n/MessageHelperTest.java
@@ -1,56 +1,56 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.i18n;
-
-import org.apache.deltaspike.core.impl.config.DefaultConfigSourceProvider;
-import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
-import org.apache.ziplock.JarLocation;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.inject.Inject;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(Arquillian.class)
-public class MessageHelperTest {
-
-    @Inject
-    private MessageHelper msg;
-
-    @Deployment
-    public static WebArchive jar() {
-        return ShrinkWrap.create(WebArchive.class)
-                .addClasses(MessageHelper.class)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
-                .addAsLibraries(JarLocation.jarLocation(ConfigSourceProvider.class))
-                .addAsLibraries(JarLocation.jarLocation(DefaultConfigSourceProvider.class));
-    }
-
-    @Test
-    public void check() {
-        assertNotNull(msg);
-        assertEquals("OpenEJB and DeltaSpike are cool products!", msg.openejbAndDeltaspike());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.i18n;
+
+import org.apache.deltaspike.core.impl.config.DefaultConfigSourceProvider;
+import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
+import org.apache.ziplock.JarLocation;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(Arquillian.class)
+public class MessageHelperTest {
+
+    @Inject
+    private MessageHelper msg;
+
+    @Deployment
+    public static WebArchive jar() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addClasses(MessageHelper.class)
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+                .addAsLibraries(JarLocation.jarLocation(ConfigSourceProvider.class))
+                .addAsLibraries(JarLocation.jarLocation(DefaultConfigSourceProvider.class));
+    }
+
+    @Test
+    public void check() {
+        assertNotNull(msg);
+        assertEquals("OpenEJB and DeltaSpike are cool products!", msg.openejbAndDeltaspike());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-dao-implementation/src/main/java/org/superbiz/dynamic/User.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-dao-implementation/src/main/java/org/superbiz/dynamic/User.java b/examples/dynamic-dao-implementation/src/main/java/org/superbiz/dynamic/User.java
index 4d9de82..0e397b1 100644
--- a/examples/dynamic-dao-implementation/src/main/java/org/superbiz/dynamic/User.java
+++ b/examples/dynamic-dao-implementation/src/main/java/org/superbiz/dynamic/User.java
@@ -1,61 +1,61 @@
-/*
- * 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.superbiz.dynamic;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-
-@Entity
-@NamedQueries({
-        @NamedQuery(name = "dynamic-ejb-impl-test.query", query = "SELECT u FROM User AS u WHERE u.name LIKE :name"),
-        @NamedQuery(name = "dynamic-ejb-impl-test.all", query = "SELECT u FROM User AS u")
-})
-public class User {
-
-    @Id
-    @GeneratedValue
-    private long id;
-    private String name;
-    private int age;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-}
+/*
+ * 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.superbiz.dynamic;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+
+@Entity
+@NamedQueries({
+        @NamedQuery(name = "dynamic-ejb-impl-test.query", query = "SELECT u FROM User AS u WHERE u.name LIKE :name"),
+        @NamedQuery(name = "dynamic-ejb-impl-test.all", query = "SELECT u FROM User AS u")
+})
+public class User {
+
+    @Id
+    @GeneratedValue
+    private long id;
+    private String name;
+    private int age;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/BoostrapUtility.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/BoostrapUtility.java b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/BoostrapUtility.java
index d74b1e7..458c919 100755
--- a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/BoostrapUtility.java
+++ b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/BoostrapUtility.java
@@ -1,51 +1,51 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamicdatasourcerouting;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-/**
- * OpenJPA create the table at the first query.
- * To avoid to have to create the table manunally this singleton will do it for us.
- */
-@Startup
-@Singleton
-public class BoostrapUtility {
-
-    @PersistenceContext(unitName = "db1")
-    private EntityManager em1;
-
-    @PersistenceContext(unitName = "db2")
-    private EntityManager em2;
-
-    @PersistenceContext(unitName = "db3")
-    private EntityManager em3;
-
-    @PostConstruct
-    @TransactionAttribute(TransactionAttributeType.SUPPORTS)
-    public void initDatabase() {
-        em1.find(Person.class, 0);
-        em2.find(Person.class, 0);
-        em3.find(Person.class, 0);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamicdatasourcerouting;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * OpenJPA create the table at the first query.
+ * To avoid to have to create the table manunally this singleton will do it for us.
+ */
+@Startup
+@Singleton
+public class BoostrapUtility {
+
+    @PersistenceContext(unitName = "db1")
+    private EntityManager em1;
+
+    @PersistenceContext(unitName = "db2")
+    private EntityManager em2;
+
+    @PersistenceContext(unitName = "db3")
+    private EntityManager em3;
+
+    @PostConstruct
+    @TransactionAttribute(TransactionAttributeType.SUPPORTS)
+    public void initDatabase() {
+        em1.find(Person.class, 0);
+        em2.find(Person.class, 0);
+        em3.find(Person.class, 0);
+    }
+}


[32/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ContainerManagedEntity.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ContainerManagedEntity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ContainerManagedEntity.java
index 3e348ce..fb70a95 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ContainerManagedEntity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ContainerManagedEntity.java
@@ -1,318 +1,318 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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;
-
-/**
- * <p/>
- * Java class for ContainerManagedEntity complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ContainerManagedEntity">
- *   &lt;complexContent>
- *     &lt;extension base="{ejb.xmi}Entity">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="persistentAttributes" type="{ejb.xmi}CMPAttribute"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="keyAttributes" type="{ejb.xmi}CMPAttribute"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="queries" type="{ejb.xmi}Query"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="CMPAttribute" type="{ejb.xmi}CMPAttribute"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="primKeyField" type="{ejb.xmi}CMPAttribute"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="CMPAttribute" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="abstractSchemaName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="keyAttributes" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="primKeyField" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ContainerManagedEntity", propOrder = {"persistentAttributes",
-    "keyAttributes", "queries", "cmpAttributes", "primKeyFields"})
-public class ContainerManagedEntity extends Entity {
-
-    protected List<CMPAttribute> persistentAttributes;
-    protected List<CMPAttribute> keyAttributes;
-    protected List<Query> queries;
-    @XmlElement(name = "CMPAttribute")
-    protected List<CMPAttribute> cmpAttributes;
-    @XmlElement(name = "primKeyField")
-    protected List<CMPAttribute> primKeyFields;
-    @XmlAttribute(name = "CMPAttribute")
-    protected String cmpAttribute;
-    @XmlAttribute
-    protected String abstractSchemaName;
-    @XmlAttribute(name = "keyAttributes")
-    protected String keyAttributesString;
-    @XmlAttribute
-    protected String primKeyField;
-    @XmlAttribute(name = "version")
-    protected String entityBeanVersion;
-
-    /**
-     * Gets the value of the persistentAttributes 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 persistentAttributes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getPersistentAttributes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CMPAttribute }
-     */
-    public List<CMPAttribute> getPersistentAttributes() {
-        if (persistentAttributes == null) {
-            persistentAttributes = new ArrayList<CMPAttribute>();
-        }
-        return this.persistentAttributes;
-    }
-
-    /**
-     * Gets the value of the keyAttributes 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 keyAttributes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getKeyAttributes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CMPAttribute }
-     */
-    public List<CMPAttribute> getKeyAttributes() {
-        if (keyAttributes == null) {
-            keyAttributes = new ArrayList<CMPAttribute>();
-        }
-        return this.keyAttributes;
-    }
-
-    /**
-     * Gets the value of the queries 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 queries property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getQueries().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Query }
-     */
-    public List<Query> getQueries() {
-        if (queries == null) {
-            queries = new ArrayList<Query>();
-        }
-        return this.queries;
-    }
-
-    /**
-     * Gets the value of the cmpAttributes 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 cmpAttributes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getCMPAttributes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CMPAttribute }
-     */
-    public List<CMPAttribute> getCMPAttributes() {
-        if (cmpAttributes == null) {
-            cmpAttributes = new ArrayList<CMPAttribute>();
-        }
-        return this.cmpAttributes;
-    }
-
-    /**
-     * Gets the value of the primKeyFields 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 primKeyFields property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getPrimKeyFields().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CMPAttribute }
-     */
-    public List<CMPAttribute> getPrimKeyFields() {
-        if (primKeyFields == null) {
-            primKeyFields = new ArrayList<CMPAttribute>();
-        }
-        return this.primKeyFields;
-    }
-
-    /**
-     * Gets the value of the cmpAttribute property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getCMPAttribute() {
-        return cmpAttribute;
-    }
-
-    /**
-     * Sets the value of the cmpAttribute property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setCMPAttribute(final String value) {
-        this.cmpAttribute = value;
-    }
-
-    /**
-     * Gets the value of the abstractSchemaName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getAbstractSchemaName() {
-        return abstractSchemaName;
-    }
-
-    /**
-     * Sets the value of the abstractSchemaName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setAbstractSchemaName(final String value) {
-        this.abstractSchemaName = value;
-    }
-
-    /**
-     * Gets the value of the keyAttributesString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getKeyAttributesString() {
-        return keyAttributesString;
-    }
-
-    /**
-     * Sets the value of the keyAttributesString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setKeyAttributesString(final String value) {
-        this.keyAttributesString = value;
-    }
-
-    /**
-     * Gets the value of the primKeyField property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getPrimKeyField() {
-        return primKeyField;
-    }
-
-    /**
-     * Sets the value of the primKeyField property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setPrimKeyField(final String value) {
-        this.primKeyField = value;
-    }
-
-    /**
-     * Gets the value of the entityBeanVersion property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEntityBeanVersion() {
-        return entityBeanVersion;
-    }
-
-    /**
-     * Sets the value of the entityBeanVersion property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEntityBeanVersion(final String value) {
-        this.entityBeanVersion = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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;
+
+/**
+ * <p/>
+ * Java class for ContainerManagedEntity complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ContainerManagedEntity">
+ *   &lt;complexContent>
+ *     &lt;extension base="{ejb.xmi}Entity">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="persistentAttributes" type="{ejb.xmi}CMPAttribute"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="keyAttributes" type="{ejb.xmi}CMPAttribute"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="queries" type="{ejb.xmi}Query"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="CMPAttribute" type="{ejb.xmi}CMPAttribute"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="primKeyField" type="{ejb.xmi}CMPAttribute"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="CMPAttribute" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="abstractSchemaName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="keyAttributes" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="primKeyField" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ContainerManagedEntity", propOrder = {"persistentAttributes",
+    "keyAttributes", "queries", "cmpAttributes", "primKeyFields"})
+public class ContainerManagedEntity extends Entity {
+
+    protected List<CMPAttribute> persistentAttributes;
+    protected List<CMPAttribute> keyAttributes;
+    protected List<Query> queries;
+    @XmlElement(name = "CMPAttribute")
+    protected List<CMPAttribute> cmpAttributes;
+    @XmlElement(name = "primKeyField")
+    protected List<CMPAttribute> primKeyFields;
+    @XmlAttribute(name = "CMPAttribute")
+    protected String cmpAttribute;
+    @XmlAttribute
+    protected String abstractSchemaName;
+    @XmlAttribute(name = "keyAttributes")
+    protected String keyAttributesString;
+    @XmlAttribute
+    protected String primKeyField;
+    @XmlAttribute(name = "version")
+    protected String entityBeanVersion;
+
+    /**
+     * Gets the value of the persistentAttributes 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 persistentAttributes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getPersistentAttributes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CMPAttribute }
+     */
+    public List<CMPAttribute> getPersistentAttributes() {
+        if (persistentAttributes == null) {
+            persistentAttributes = new ArrayList<CMPAttribute>();
+        }
+        return this.persistentAttributes;
+    }
+
+    /**
+     * Gets the value of the keyAttributes 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 keyAttributes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getKeyAttributes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CMPAttribute }
+     */
+    public List<CMPAttribute> getKeyAttributes() {
+        if (keyAttributes == null) {
+            keyAttributes = new ArrayList<CMPAttribute>();
+        }
+        return this.keyAttributes;
+    }
+
+    /**
+     * Gets the value of the queries 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 queries property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getQueries().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Query }
+     */
+    public List<Query> getQueries() {
+        if (queries == null) {
+            queries = new ArrayList<Query>();
+        }
+        return this.queries;
+    }
+
+    /**
+     * Gets the value of the cmpAttributes 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 cmpAttributes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getCMPAttributes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CMPAttribute }
+     */
+    public List<CMPAttribute> getCMPAttributes() {
+        if (cmpAttributes == null) {
+            cmpAttributes = new ArrayList<CMPAttribute>();
+        }
+        return this.cmpAttributes;
+    }
+
+    /**
+     * Gets the value of the primKeyFields 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 primKeyFields property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getPrimKeyFields().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CMPAttribute }
+     */
+    public List<CMPAttribute> getPrimKeyFields() {
+        if (primKeyFields == null) {
+            primKeyFields = new ArrayList<CMPAttribute>();
+        }
+        return this.primKeyFields;
+    }
+
+    /**
+     * Gets the value of the cmpAttribute property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getCMPAttribute() {
+        return cmpAttribute;
+    }
+
+    /**
+     * Sets the value of the cmpAttribute property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setCMPAttribute(final String value) {
+        this.cmpAttribute = value;
+    }
+
+    /**
+     * Gets the value of the abstractSchemaName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getAbstractSchemaName() {
+        return abstractSchemaName;
+    }
+
+    /**
+     * Sets the value of the abstractSchemaName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setAbstractSchemaName(final String value) {
+        this.abstractSchemaName = value;
+    }
+
+    /**
+     * Gets the value of the keyAttributesString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getKeyAttributesString() {
+        return keyAttributesString;
+    }
+
+    /**
+     * Sets the value of the keyAttributesString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setKeyAttributesString(final String value) {
+        this.keyAttributesString = value;
+    }
+
+    /**
+     * Gets the value of the primKeyField property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getPrimKeyField() {
+        return primKeyField;
+    }
+
+    /**
+     * Sets the value of the primKeyField property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setPrimKeyField(final String value) {
+        this.primKeyField = value;
+    }
+
+    /**
+     * Gets the value of the entityBeanVersion property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEntityBeanVersion() {
+        return entityBeanVersion;
+    }
+
+    /**
+     * Sets the value of the entityBeanVersion property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEntityBeanVersion(final String value) {
+        this.entityBeanVersion = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/DestinationEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/DestinationEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/DestinationEnum.java
index 711067a..3d21f5f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/DestinationEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/DestinationEnum.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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for DestinationType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="DestinationType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Queue"/>
- *     &lt;enumeration value="Topic"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum DestinationEnum {
-
-    @XmlEnumValue("Queue")
-    QUEUE("Queue"), @XmlEnumValue("Topic")
-    TOPIC("Topic");
-    private final String value;
-
-    DestinationEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static DestinationEnum fromValue(final String v) {
-        for (final DestinationEnum c : DestinationEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for DestinationType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="DestinationType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Queue"/>
+ *     &lt;enumeration value="Topic"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum DestinationEnum {
+
+    @XmlEnumValue("Queue")
+    QUEUE("Queue"), @XmlEnumValue("Topic")
+    TOPIC("Topic");
+    private final String value;
+
+    DestinationEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static DestinationEnum fromValue(final String v) {
+        for (final DestinationEnum c : DestinationEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBJar.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBJar.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBJar.java
index 77c049d..a293276 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBJar.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBJar.java
@@ -1,201 +1,201 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.common.CompatibilityDescriptionGroup;
-
-/**
- * The root element of the EJB deployment descriptor. It contains an optional
- * description of the ejb-jar file; optional display name; optional small icon
- * file name; optional large icon file name; mandatory structural information
- * about all included enterprise beans; a descriptor for container managed
- * relationships, if any; an optional application-assembly descriptor; and an
- * optional name of an ejb-client-jar file for the ejb-jar.
- * <p/>
- * <p/>
- * <p/>
- * Java class for EJBJar complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EJBJar">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="assemblyDescriptor" type="{ejb.xmi}AssemblyDescriptor"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="enterpriseBeans" type="{ejb.xmi}EnterpriseBean"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="relationshipList" type="{ejb.xmi}Relationships"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="ejbClientJar" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EJBJar", propOrder = {"assemblyDescriptors",
-    "enterpriseBeans", "relationshipList"})
-public class EJBJar extends CompatibilityDescriptionGroup {
-
-    @XmlElement(name = "assemblyDescriptor")
-    protected List<AssemblyDescriptor> assemblyDescriptors;
-    protected List<EnterpriseBean> enterpriseBeans;
-    protected List<Relationships> relationshipList;
-    @XmlAttribute
-    protected String ejbClientJar;
-    @XmlAttribute(name = "version")
-    protected String ejbSpecsVersion;
-
-    /**
-     * Gets the value of the assemblyDescriptors 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 assemblyDescriptors property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getAssemblyDescriptors().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AssemblyDescriptor }
-     */
-    public List<AssemblyDescriptor> getAssemblyDescriptors() {
-        if (assemblyDescriptors == null) {
-            assemblyDescriptors = new ArrayList<AssemblyDescriptor>();
-        }
-        return this.assemblyDescriptors;
-    }
-
-    /**
-     * Gets the value of the enterpriseBeans 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 enterpriseBeans property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEnterpriseBeans().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EnterpriseBean }
-     */
-    public List<EnterpriseBean> getEnterpriseBeans() {
-        if (enterpriseBeans == null) {
-            enterpriseBeans = new ArrayList<EnterpriseBean>();
-        }
-        return this.enterpriseBeans;
-    }
-
-    /**
-     * Gets the value of the relationshipList 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 relationshipList property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getRelationshipList().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Relationships }
-     */
-    public List<Relationships> getRelationshipList() {
-        if (relationshipList == null) {
-            relationshipList = new ArrayList<Relationships>();
-        }
-        return this.relationshipList;
-    }
-
-    /**
-     * Gets the value of the ejbClientJar property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEjbClientJar() {
-        return ejbClientJar;
-    }
-
-    /**
-     * Sets the value of the ejbClientJar property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEjbClientJar(final String value) {
-        this.ejbClientJar = value;
-    }
-
-    /**
-     * Gets the value of the ejbSpecsVersion property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEjbSpecsVersion() {
-        return ejbSpecsVersion;
-    }
-
-    /**
-     * Sets the value of the ejbSpecsVersion property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEjbSpecsVersion(final String value) {
-        this.ejbSpecsVersion = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.common.CompatibilityDescriptionGroup;
+
+/**
+ * The root element of the EJB deployment descriptor. It contains an optional
+ * description of the ejb-jar file; optional display name; optional small icon
+ * file name; optional large icon file name; mandatory structural information
+ * about all included enterprise beans; a descriptor for container managed
+ * relationships, if any; an optional application-assembly descriptor; and an
+ * optional name of an ejb-client-jar file for the ejb-jar.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for EJBJar complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EJBJar">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="assemblyDescriptor" type="{ejb.xmi}AssemblyDescriptor"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="enterpriseBeans" type="{ejb.xmi}EnterpriseBean"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="relationshipList" type="{ejb.xmi}Relationships"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="ejbClientJar" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EJBJar", propOrder = {"assemblyDescriptors",
+    "enterpriseBeans", "relationshipList"})
+public class EJBJar extends CompatibilityDescriptionGroup {
+
+    @XmlElement(name = "assemblyDescriptor")
+    protected List<AssemblyDescriptor> assemblyDescriptors;
+    protected List<EnterpriseBean> enterpriseBeans;
+    protected List<Relationships> relationshipList;
+    @XmlAttribute
+    protected String ejbClientJar;
+    @XmlAttribute(name = "version")
+    protected String ejbSpecsVersion;
+
+    /**
+     * Gets the value of the assemblyDescriptors 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 assemblyDescriptors property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getAssemblyDescriptors().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AssemblyDescriptor }
+     */
+    public List<AssemblyDescriptor> getAssemblyDescriptors() {
+        if (assemblyDescriptors == null) {
+            assemblyDescriptors = new ArrayList<AssemblyDescriptor>();
+        }
+        return this.assemblyDescriptors;
+    }
+
+    /**
+     * Gets the value of the enterpriseBeans 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 enterpriseBeans property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEnterpriseBeans().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EnterpriseBean }
+     */
+    public List<EnterpriseBean> getEnterpriseBeans() {
+        if (enterpriseBeans == null) {
+            enterpriseBeans = new ArrayList<EnterpriseBean>();
+        }
+        return this.enterpriseBeans;
+    }
+
+    /**
+     * Gets the value of the relationshipList 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 relationshipList property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getRelationshipList().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Relationships }
+     */
+    public List<Relationships> getRelationshipList() {
+        if (relationshipList == null) {
+            relationshipList = new ArrayList<Relationships>();
+        }
+        return this.relationshipList;
+    }
+
+    /**
+     * Gets the value of the ejbClientJar property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEjbClientJar() {
+        return ejbClientJar;
+    }
+
+    /**
+     * Sets the value of the ejbClientJar property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEjbClientJar(final String value) {
+        this.ejbClientJar = value;
+    }
+
+    /**
+     * Gets the value of the ejbSpecsVersion property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEjbSpecsVersion() {
+        return ejbSpecsVersion;
+    }
+
+    /**
+     * Sets the value of the ejbSpecsVersion property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEjbSpecsVersion(final String value) {
+        this.ejbSpecsVersion = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java
index 004b202..598cb07 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java
@@ -1,242 +1,242 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD,
- * EJBFINDERMETHOD, EJBREMOTEMETHOD.
- * <p/>
- * <p/>
- * <p/>
- * Java class for EJBMethodCategory complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EJBMethodCategory">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EJBMethodCategory", propOrder = {"extensions"})
-public class EJBMethodCategory {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD,
+ * EJBFINDERMETHOD, EJBREMOTEMETHOD.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for EJBMethodCategory complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EJBMethodCategory">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EJBMethodCategory", propOrder = {"extensions"})
+public class EJBMethodCategory {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java
index ba44259..f4a033d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java
@@ -1,364 +1,364 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @invariant The name of the relationship, if specified, is unique within the
- * ejb-jar file. @invariant self.relationshipRoles.size == 2
- * @invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name
- * @migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under
- * ejbext::EJBJarExtension
- * @migration EJB1.1 added optional attribute, description:String
- * @migration EJB1.1 added optional attribute, name:String (May have been
- * inherited from RefBaseObject previously)
- * <p/>
- * <p/>
- * <p/>
- * Java class for EJBRelation complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content
- * contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EJBRelation">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="relationshipRoles" type="{ejb.xmi}EJBRelationshipRole"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * @since J2EE1.3 The ejb-relation element describes a relationship between two
- * entity beans with container managed persistence. An ejb-relation
- * element contains a description; an optional ejb-relation-name element;
- * and exactly two relationship role declarations, defined by the
- * ejb-relationship-roles. The name of the relationship, if specified, is
- * unique within the ejb-jar file.
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EJBRelation", propOrder = {"relationshipRoles",
-    "descriptions", "extensions"})
-public class EJBRelation {
-
-    protected List<EJBRelationshipRole> relationshipRoles;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the relationshipRoles 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 relationshipRoles property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getRelationshipRoles().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EJBRelationshipRole }
-     */
-    public List<EJBRelationshipRole> getRelationshipRoles() {
-        if (relationshipRoles == null) {
-            relationshipRoles = new ArrayList<EJBRelationshipRole>();
-        }
-        return this.relationshipRoles;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = 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 id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @invariant The name of the relationship, if specified, is unique within the
+ * ejb-jar file. @invariant self.relationshipRoles.size == 2
+ * @invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name
+ * @migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under
+ * ejbext::EJBJarExtension
+ * @migration EJB1.1 added optional attribute, description:String
+ * @migration EJB1.1 added optional attribute, name:String (May have been
+ * inherited from RefBaseObject previously)
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for EJBRelation complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content
+ * contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EJBRelation">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="relationshipRoles" type="{ejb.xmi}EJBRelationshipRole"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * @since J2EE1.3 The ejb-relation element describes a relationship between two
+ * entity beans with container managed persistence. An ejb-relation
+ * element contains a description; an optional ejb-relation-name element;
+ * and exactly two relationship role declarations, defined by the
+ * ejb-relationship-roles. The name of the relationship, if specified, is
+ * unique within the ejb-jar file.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EJBRelation", propOrder = {"relationshipRoles",
+    "descriptions", "extensions"})
+public class EJBRelation {
+
+    protected List<EJBRelationshipRole> relationshipRoles;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the relationshipRoles 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 relationshipRoles property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getRelationshipRoles().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EJBRelationshipRole }
+     */
+    public List<EJBRelationshipRole> getRelationshipRoles() {
+        if (relationshipRoles == null) {
+            relationshipRoles = new ArrayList<EJBRelationshipRole>();
+        }
+        return this.relationshipRoles;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = 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 id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}


[22/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java
index 138ed8c..13c3f38 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java
@@ -1,317 +1,317 @@
-/**
- * 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.was.v6.webservice.clientbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.wsclient.ServiceRef;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for ServiceRefBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ServiceRefBinding">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="bindingServiceRef" type="{webservice_client.xmi}ServiceRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="bindingServiceRef" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ServiceRefBinding", propOrder = {"bindingServiceRefs",
-    "extensions"})
-public class ServiceRefBinding {
-
-    @XmlElement(name = "bindingServiceRef")
-    protected List<ServiceRef> bindingServiceRefs;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String bindingServiceRef;
-    @XmlAttribute
-    protected String jndiName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the bindingServiceRefs 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 bindingServiceRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getBindingServiceRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceRef }
-     */
-    public List<ServiceRef> getBindingServiceRefs() {
-        if (bindingServiceRefs == null) {
-            bindingServiceRefs = new ArrayList<ServiceRef>();
-        }
-        return this.bindingServiceRefs;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the bindingServiceRef property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getBindingServiceRef() {
-        return bindingServiceRef;
-    }
-
-    /**
-     * Sets the value of the bindingServiceRef property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setBindingServiceRef(final String value) {
-        this.bindingServiceRef = value;
-    }
-
-    /**
-     * Gets the value of the jndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJndiName() {
-        return jndiName;
-    }
-
-    /**
-     * Sets the value of the jndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJndiName(final String value) {
-        this.jndiName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.webservice.clientbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.wsclient.ServiceRef;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for ServiceRefBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ServiceRefBinding">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="bindingServiceRef" type="{webservice_client.xmi}ServiceRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="bindingServiceRef" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServiceRefBinding", propOrder = {"bindingServiceRefs",
+    "extensions"})
+public class ServiceRefBinding {
+
+    @XmlElement(name = "bindingServiceRef")
+    protected List<ServiceRef> bindingServiceRefs;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String bindingServiceRef;
+    @XmlAttribute
+    protected String jndiName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the bindingServiceRefs 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 bindingServiceRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getBindingServiceRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceRef }
+     */
+    public List<ServiceRef> getBindingServiceRefs() {
+        if (bindingServiceRefs == null) {
+            bindingServiceRefs = new ArrayList<ServiceRef>();
+        }
+        return this.bindingServiceRefs;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the bindingServiceRef property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getBindingServiceRef() {
+        return bindingServiceRef;
+    }
+
+    /**
+     * Sets the value of the bindingServiceRef property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setBindingServiceRef(final String value) {
+        this.bindingServiceRef = value;
+    }
+
+    /**
+     * Gets the value of the jndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJndiName() {
+        return jndiName;
+    }
+
+    /**
+     * Sets the value of the jndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJndiName(final String value) {
+        this.jndiName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/package-info.java
index 65eba26..fbce8cc 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "webservice_clientbnd.xmi") package org.apache.openejb.jee.was.v6.webservice.clientbnd;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "webservice_clientbnd.xmi") package org.apache.openejb.jee.was.v6.webservice.clientbnd;
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java
index d62be7b..3b7c05b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java
@@ -1,296 +1,296 @@
-/**
- * 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.was.v6.wsclient;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 deprecated
- * <p/>
- * <p/>
- * Java class for ComponentScopedRefs complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ComponentScopedRefs">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="serviceRefs" type="{webservice_client.xmi}ServiceRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="componentName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ComponentScopedRefs", propOrder = {"serviceRefs",
-    "extensions"})
-public class ComponentScopedRefs {
-
-    protected List<ServiceRef> serviceRefs;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String componentName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the serviceRefs 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 serviceRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getServiceRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceRef }
-     */
-    public List<ServiceRef> getServiceRefs() {
-        if (serviceRefs == null) {
-            serviceRefs = new ArrayList<ServiceRef>();
-        }
-        return this.serviceRefs;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the componentName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getComponentName() {
-        return componentName;
-    }
-
-    /**
-     * Sets the value of the componentName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setComponentName(final String value) {
-        this.componentName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.wsclient;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 deprecated
+ * <p/>
+ * <p/>
+ * Java class for ComponentScopedRefs complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ComponentScopedRefs">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="serviceRefs" type="{webservice_client.xmi}ServiceRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="componentName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ComponentScopedRefs", propOrder = {"serviceRefs",
+    "extensions"})
+public class ComponentScopedRefs {
+
+    protected List<ServiceRef> serviceRefs;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String componentName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the serviceRefs 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 serviceRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getServiceRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceRef }
+     */
+    public List<ServiceRef> getServiceRefs() {
+        if (serviceRefs == null) {
+            serviceRefs = new ArrayList<ServiceRef>();
+        }
+        return this.serviceRefs;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the componentName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getComponentName() {
+        return componentName;
+    }
+
+    /**
+     * Sets the value of the componentName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setComponentName(final String value) {
+        this.componentName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/Handler.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/Handler.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/Handler.java
index 85859df..19ef1e9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/Handler.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/Handler.java
@@ -1,266 +1,266 @@
-/**
- * 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.was.v6.wsclient;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.common.CompatibilityDescriptionGroup;
-import org.apache.openejb.jee.was.v6.common.ParamValue;
-import org.apache.openejb.jee.was.v6.common.QName;
-import org.apache.openejb.jee.was.v6.java.JavaClass;
-
-/**
- * Declares the handler for a port-component. Handlers can access the init-param
- * name/value pairs using the HandlerInfo interface. If port-name is not
- * specified, the handler is assumed to be associated with all ports of the
- * service.
- * <p/>
- * Used in: service-ref
- * <p/>
- * <p/>
- * Java class for Handler complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Handler">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="soapRoles" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="portNames" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="handlerClass" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="initParams" type="{common.xmi}ParamValue"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="soapHeaders" type="{common.xmi}QName"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="handlerClass" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="handlerName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Handler", propOrder = {"soapRoles", "portNames",
-    "handlerClasses", "initParams", "soapHeaders"})
-public class Handler extends CompatibilityDescriptionGroup {
-
-    @XmlElement(nillable = true)
-    protected List<String> soapRoles;
-    @XmlElement(nillable = true)
-    protected List<String> portNames;
-    @XmlElement(name = "handlerClass")
-    protected List<JavaClass> handlerClasses;
-    protected List<ParamValue> initParams;
-    protected List<QName> soapHeaders;
-    @XmlAttribute(name = "handlerClass")
-    protected String handlerClassString;
-    @XmlAttribute
-    protected String handlerName;
-
-    /**
-     * Gets the value of the soapRoles 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 soapRoles property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getSoapRoles().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getSoapRoles() {
-        if (soapRoles == null) {
-            soapRoles = new ArrayList<String>();
-        }
-        return this.soapRoles;
-    }
-
-    /**
-     * Gets the value of the portNames 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 portNames property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getPortNames().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getPortNames() {
-        if (portNames == null) {
-            portNames = new ArrayList<String>();
-        }
-        return this.portNames;
-    }
-
-    /**
-     * Gets the value of the handlerClasses 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 handlerClasses property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getHandlerClasses().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getHandlerClasses() {
-        if (handlerClasses == null) {
-            handlerClasses = new ArrayList<JavaClass>();
-        }
-        return this.handlerClasses;
-    }
-
-    /**
-     * Gets the value of the initParams 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 initParams property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getInitParams().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ParamValue }
-     */
-    public List<ParamValue> getInitParams() {
-        if (initParams == null) {
-            initParams = new ArrayList<ParamValue>();
-        }
-        return this.initParams;
-    }
-
-    /**
-     * Gets the value of the soapHeaders 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 soapHeaders property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getSoapHeaders().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link QName }
-     */
-    public List<QName> getSoapHeaders() {
-        if (soapHeaders == null) {
-            soapHeaders = new ArrayList<QName>();
-        }
-        return this.soapHeaders;
-    }
-
-    /**
-     * Gets the value of the handlerClassString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHandlerClassString() {
-        return handlerClassString;
-    }
-
-    /**
-     * Sets the value of the handlerClassString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHandlerClassString(final String value) {
-        this.handlerClassString = value;
-    }
-
-    /**
-     * Gets the value of the handlerName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHandlerName() {
-        return handlerName;
-    }
-
-    /**
-     * Sets the value of the handlerName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHandlerName(final String value) {
-        this.handlerName = 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.was.v6.wsclient;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.common.CompatibilityDescriptionGroup;
+import org.apache.openejb.jee.was.v6.common.ParamValue;
+import org.apache.openejb.jee.was.v6.common.QName;
+import org.apache.openejb.jee.was.v6.java.JavaClass;
+
+/**
+ * Declares the handler for a port-component. Handlers can access the init-param
+ * name/value pairs using the HandlerInfo interface. If port-name is not
+ * specified, the handler is assumed to be associated with all ports of the
+ * service.
+ * <p/>
+ * Used in: service-ref
+ * <p/>
+ * <p/>
+ * Java class for Handler complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Handler">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="soapRoles" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="portNames" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="handlerClass" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="initParams" type="{common.xmi}ParamValue"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="soapHeaders" type="{common.xmi}QName"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="handlerClass" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="handlerName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Handler", propOrder = {"soapRoles", "portNames",
+    "handlerClasses", "initParams", "soapHeaders"})
+public class Handler extends CompatibilityDescriptionGroup {
+
+    @XmlElement(nillable = true)
+    protected List<String> soapRoles;
+    @XmlElement(nillable = true)
+    protected List<String> portNames;
+    @XmlElement(name = "handlerClass")
+    protected List<JavaClass> handlerClasses;
+    protected List<ParamValue> initParams;
+    protected List<QName> soapHeaders;
+    @XmlAttribute(name = "handlerClass")
+    protected String handlerClassString;
+    @XmlAttribute
+    protected String handlerName;
+
+    /**
+     * Gets the value of the soapRoles 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 soapRoles property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getSoapRoles().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getSoapRoles() {
+        if (soapRoles == null) {
+            soapRoles = new ArrayList<String>();
+        }
+        return this.soapRoles;
+    }
+
+    /**
+     * Gets the value of the portNames 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 portNames property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getPortNames().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getPortNames() {
+        if (portNames == null) {
+            portNames = new ArrayList<String>();
+        }
+        return this.portNames;
+    }
+
+    /**
+     * Gets the value of the handlerClasses 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 handlerClasses property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getHandlerClasses().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getHandlerClasses() {
+        if (handlerClasses == null) {
+            handlerClasses = new ArrayList<JavaClass>();
+        }
+        return this.handlerClasses;
+    }
+
+    /**
+     * Gets the value of the initParams 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 initParams property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getInitParams().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ParamValue }
+     */
+    public List<ParamValue> getInitParams() {
+        if (initParams == null) {
+            initParams = new ArrayList<ParamValue>();
+        }
+        return this.initParams;
+    }
+
+    /**
+     * Gets the value of the soapHeaders 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 soapHeaders property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getSoapHeaders().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link QName }
+     */
+    public List<QName> getSoapHeaders() {
+        if (soapHeaders == null) {
+            soapHeaders = new ArrayList<QName>();
+        }
+        return this.soapHeaders;
+    }
+
+    /**
+     * Gets the value of the handlerClassString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHandlerClassString() {
+        return handlerClassString;
+    }
+
+    /**
+     * Sets the value of the handlerClassString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHandlerClassString(final String value) {
+        this.handlerClassString = value;
+    }
+
+    /**
+     * Gets the value of the handlerName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHandlerName() {
+        return handlerName;
+    }
+
+    /**
+     * Sets the value of the handlerName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHandlerName(final String value) {
+        this.handlerName = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java
index c535033..e64bdaa 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java
@@ -1,145 +1,145 @@
-/**
- * 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.was.v6.wsclient;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the org.apache.openejb.jee.was.v6.wsclient
- * package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _WebServicesClient_QNAME = new QName(
-        "webservice_client.xmi", "WebServicesClient");
-    private final static QName _ComponentScopedRefs_QNAME = new QName(
-        "webservice_client.xmi", "ComponentScopedRefs");
-    private final static QName _Handler_QNAME = new QName(
-        "webservice_client.xmi", "Handler");
-    private final static QName _PortComponentRef_QNAME = new QName(
-        "webservice_client.xmi", "PortComponentRef");
-    private final static QName _ServiceRef_QNAME = new QName(
-        "webservice_client.xmi", "ServiceRef");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package:
-     * org.apache.openejb.jee.was.v6.wsclient
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link PortComponentRef }
-     */
-    public PortComponentRef createPortComponentRef() {
-        return new PortComponentRef();
-    }
-
-    /**
-     * Create an instance of {@link ServiceRef }
-     */
-    public ServiceRef createServiceRef() {
-        return new ServiceRef();
-    }
-
-    /**
-     * Create an instance of {@link ComponentScopedRefs }
-     */
-    public ComponentScopedRefs createComponentScopedRefs() {
-        return new ComponentScopedRefs();
-    }
-
-    /**
-     * Create an instance of {@link WebServicesClient }
-     */
-    public WebServicesClient createWebServicesClient() {
-        return new WebServicesClient();
-    }
-
-    /**
-     * Create an instance of {@link Handler }
-     */
-    public Handler createHandler() {
-        return new Handler();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link WebServicesClient }{@code >}
-     */
-    @XmlElementDecl(namespace = "webservice_client.xmi", name = "WebServicesClient")
-    public JAXBElement<WebServicesClient> createWebServicesClient(
-        final WebServicesClient value) {
-        return new JAXBElement<WebServicesClient>(_WebServicesClient_QNAME,
-            WebServicesClient.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link ComponentScopedRefs }{@code >}
-     */
-    @XmlElementDecl(namespace = "webservice_client.xmi", name = "ComponentScopedRefs")
-    public JAXBElement<ComponentScopedRefs> createComponentScopedRefs(
-        final ComponentScopedRefs value) {
-        return new JAXBElement<ComponentScopedRefs>(_ComponentScopedRefs_QNAME,
-            ComponentScopedRefs.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Handler }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "webservice_client.xmi", name = "Handler")
-    public JAXBElement<Handler> createHandler(final Handler value) {
-        return new JAXBElement<Handler>(_Handler_QNAME, Handler.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link PortComponentRef }{@code >}
-     */
-    @XmlElementDecl(namespace = "webservice_client.xmi", name = "PortComponentRef")
-    public JAXBElement<PortComponentRef> createPortComponentRef(
-        final PortComponentRef value) {
-        return new JAXBElement<PortComponentRef>(_PortComponentRef_QNAME,
-            PortComponentRef.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceRef }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "webservice_client.xmi", name = "ServiceRef")
-    public JAXBElement<ServiceRef> createServiceRef(final ServiceRef value) {
-        return new JAXBElement<ServiceRef>(_ServiceRef_QNAME, ServiceRef.class,
-            null, 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.was.v6.wsclient;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the org.apache.openejb.jee.was.v6.wsclient
+ * package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _WebServicesClient_QNAME = new QName(
+        "webservice_client.xmi", "WebServicesClient");
+    private final static QName _ComponentScopedRefs_QNAME = new QName(
+        "webservice_client.xmi", "ComponentScopedRefs");
+    private final static QName _Handler_QNAME = new QName(
+        "webservice_client.xmi", "Handler");
+    private final static QName _PortComponentRef_QNAME = new QName(
+        "webservice_client.xmi", "PortComponentRef");
+    private final static QName _ServiceRef_QNAME = new QName(
+        "webservice_client.xmi", "ServiceRef");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package:
+     * org.apache.openejb.jee.was.v6.wsclient
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link PortComponentRef }
+     */
+    public PortComponentRef createPortComponentRef() {
+        return new PortComponentRef();
+    }
+
+    /**
+     * Create an instance of {@link ServiceRef }
+     */
+    public ServiceRef createServiceRef() {
+        return new ServiceRef();
+    }
+
+    /**
+     * Create an instance of {@link ComponentScopedRefs }
+     */
+    public ComponentScopedRefs createComponentScopedRefs() {
+        return new ComponentScopedRefs();
+    }
+
+    /**
+     * Create an instance of {@link WebServicesClient }
+     */
+    public WebServicesClient createWebServicesClient() {
+        return new WebServicesClient();
+    }
+
+    /**
+     * Create an instance of {@link Handler }
+     */
+    public Handler createHandler() {
+        return new Handler();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link WebServicesClient }{@code >}
+     */
+    @XmlElementDecl(namespace = "webservice_client.xmi", name = "WebServicesClient")
+    public JAXBElement<WebServicesClient> createWebServicesClient(
+        final WebServicesClient value) {
+        return new JAXBElement<WebServicesClient>(_WebServicesClient_QNAME,
+            WebServicesClient.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link ComponentScopedRefs }{@code >}
+     */
+    @XmlElementDecl(namespace = "webservice_client.xmi", name = "ComponentScopedRefs")
+    public JAXBElement<ComponentScopedRefs> createComponentScopedRefs(
+        final ComponentScopedRefs value) {
+        return new JAXBElement<ComponentScopedRefs>(_ComponentScopedRefs_QNAME,
+            ComponentScopedRefs.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Handler }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "webservice_client.xmi", name = "Handler")
+    public JAXBElement<Handler> createHandler(final Handler value) {
+        return new JAXBElement<Handler>(_Handler_QNAME, Handler.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link PortComponentRef }{@code >}
+     */
+    @XmlElementDecl(namespace = "webservice_client.xmi", name = "PortComponentRef")
+    public JAXBElement<PortComponentRef> createPortComponentRef(
+        final PortComponentRef value) {
+        return new JAXBElement<PortComponentRef>(_PortComponentRef_QNAME,
+            PortComponentRef.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceRef }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "webservice_client.xmi", name = "ServiceRef")
+    public JAXBElement<ServiceRef> createServiceRef(final ServiceRef value) {
+        return new JAXBElement<ServiceRef>(_ServiceRef_QNAME, ServiceRef.class,
+            null, value);
+    }
+
+}


[14/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java
----------------------------------------------------------------------
diff --git a/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java b/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java
index 06e6ff7..1b0b811 100644
--- a/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java
+++ b/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java
@@ -1,35 +1,35 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.events;
-
-import javax.ejb.Schedule;
-import javax.ejb.Singleton;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-import java.util.Date;
-
-@Singleton
-public class Notifier {
-
-    @Inject
-    private Event<Date> dateEvent;
-
-    @Schedule(second = "*", minute = "*", hour = "*")
-    public void sendHour() {
-        dateEvent.fire(new Date());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.events;
+
+import javax.ejb.Schedule;
+import javax.ejb.Singleton;
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
+import java.util.Date;
+
+@Singleton
+public class Notifier {
+
+    @Inject
+    private Event<Date> dateEvent;
+
+    @Schedule(second = "*", minute = "*", hour = "*")
+    public void sendHour() {
+        dateEvent.fire(new Date());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java b/examples/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java
index ab0701f..1e8fc18 100644
--- a/examples/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java
+++ b/examples/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java
@@ -1,73 +1,73 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.events;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.inject.Inject;
-import javax.naming.NamingException;
-
-import static org.junit.Assert.assertTrue;
-
-public class EventTest {
-
-    private static EJBContainer container;
-    private static String initialLogProperty;
-
-    @Inject
-    private Observer observer;
-
-    @BeforeClass
-    public static void start() throws NamingException {
-        initialLogProperty = System.getProperty("openejb.logger.external");
-        System.setProperty("openejb.logger.external", "true");
-        container = EJBContainer.createEJBContainer();
-    }
-
-    @AfterClass
-    public static void shutdown() {
-        if (container != null) {
-            container.close();
-        }
-        if (initialLogProperty != null) {
-            System.setProperty("openejb.logger.external", initialLogProperty);
-        } else {
-            System.getProperties().remove("openejb.logger.external");
-        }
-    }
-
-    @Before
-    public void inject() throws NamingException {
-        container.getContext().bind("inject", this);
-    }
-
-    @After
-    public void reset() throws NamingException {
-        container.getContext().unbind("inject");
-    }
-
-    @Test
-    public void observe() throws InterruptedException {
-        Thread.sleep(4000);
-        assertTrue(observer.getDates().size() > 3); // in 4s normally at least 3 events were received
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.events;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.inject.Inject;
+import javax.naming.NamingException;
+
+import static org.junit.Assert.assertTrue;
+
+public class EventTest {
+
+    private static EJBContainer container;
+    private static String initialLogProperty;
+
+    @Inject
+    private Observer observer;
+
+    @BeforeClass
+    public static void start() throws NamingException {
+        initialLogProperty = System.getProperty("openejb.logger.external");
+        System.setProperty("openejb.logger.external", "true");
+        container = EJBContainer.createEJBContainer();
+    }
+
+    @AfterClass
+    public static void shutdown() {
+        if (container != null) {
+            container.close();
+        }
+        if (initialLogProperty != null) {
+            System.setProperty("openejb.logger.external", initialLogProperty);
+        } else {
+            System.getProperties().remove("openejb.logger.external");
+        }
+    }
+
+    @Before
+    public void inject() throws NamingException {
+        container.getContext().bind("inject", this);
+    }
+
+    @After
+    public void reset() throws NamingException {
+        container.getContext().unbind("inject");
+    }
+
+    @Test
+    public void observe() throws InterruptedException {
+        Thread.sleep(4000);
+        assertTrue(observer.getDates().size() > 3); // in 4s normally at least 3 events were received
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-events/src/test/java/org/superbiz/cdi/events/Observer.java
----------------------------------------------------------------------
diff --git a/examples/cdi-events/src/test/java/org/superbiz/cdi/events/Observer.java b/examples/cdi-events/src/test/java/org/superbiz/cdi/events/Observer.java
index f08ff55..05697a5 100644
--- a/examples/cdi-events/src/test/java/org/superbiz/cdi/events/Observer.java
+++ b/examples/cdi-events/src/test/java/org/superbiz/cdi/events/Observer.java
@@ -1,43 +1,43 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.events;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.enterprise.event.Observes;
-import javax.inject.Singleton;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Singleton
-public class Observer {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Observer.class);
-
-    private List<Date> dates = new ArrayList<Date>();
-
-    public void saveDate(@Observes Date date) {
-        dates.add(date);
-        LOGGER.info("received date '{}'", date);
-    }
-
-    public List<Date> getDates() {
-        return dates;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.events;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Singleton;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Singleton
+public class Observer {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Observer.class);
+
+    private List<Date> dates = new ArrayList<Date>();
+
+    public void saveDate(@Observes Date date) {
+        dates.add(date);
+        LOGGER.info("received date '{}'", date);
+    }
+
+    public List<Date> getDates() {
+        return dates;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/AccessDeniedException.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/AccessDeniedException.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/AccessDeniedException.java
index 65ed85c..18dc935 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/AccessDeniedException.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/AccessDeniedException.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi;
-
-import javax.ejb.ApplicationException;
-
-/**
- * @version $Revision$ $Date$
- */
-@ApplicationException
-public class AccessDeniedException extends RuntimeException {
-
-    private static final long serialVersionUID = 1L;
-
-    public AccessDeniedException(String s) {
-        super(s);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi;
+
+import javax.ejb.ApplicationException;
+
+/**
+ * @version $Revision$ $Date$
+ */
+@ApplicationException
+public class AccessDeniedException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    public AccessDeniedException(String s) {
+        super(s);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOldStyleInterceptorBinding.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOldStyleInterceptorBinding.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOldStyleInterceptorBinding.java
index f128ed8..b252a9e 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOldStyleInterceptorBinding.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOldStyleInterceptorBinding.java
@@ -1,53 +1,53 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.beans;
-
-import org.superbiz.cdi.bookshow.interceptorbinding.Log;
-import org.superbiz.cdi.bookshow.interceptors.BookForAShowLoggingInterceptor;
-
-import javax.ejb.Stateful;
-import javax.interceptor.Interceptors;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * CDI supports binding an interceptor using @Interceptors
- * Not recommended though. Has its disadvantages
- * Cannot be disabled easily
- * Order dependent on how it is listed in class
- * Instead, create interceptor bindings using @InterceptorBinding and bind them
- * See {@link Log}, {@link BookForAShowOneInterceptorApplied}, {@link BookForAShowLoggingInterceptor}
- */
-@Interceptors(BookForAShowLoggingInterceptor.class)
-@Stateful
-public class BookForAShowOldStyleInterceptorBinding implements Serializable {
-
-    private static final long serialVersionUID = 6350400892234496909L;
-
-    public List<String> getMoviesList() {
-        List<String> moviesAvailable = new ArrayList<String>();
-        moviesAvailable.add("KungFu Panda 2");
-        moviesAvailable.add("Kings speech");
-        return moviesAvailable;
-    }
-
-    public Integer getDiscountedPrice(int ticketPrice) {
-        return ticketPrice - 50;
-    }
-    // assume more methods are present
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.beans;
+
+import org.superbiz.cdi.bookshow.interceptorbinding.Log;
+import org.superbiz.cdi.bookshow.interceptors.BookForAShowLoggingInterceptor;
+
+import javax.ejb.Stateful;
+import javax.interceptor.Interceptors;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * CDI supports binding an interceptor using @Interceptors
+ * Not recommended though. Has its disadvantages
+ * Cannot be disabled easily
+ * Order dependent on how it is listed in class
+ * Instead, create interceptor bindings using @InterceptorBinding and bind them
+ * See {@link Log}, {@link BookForAShowOneInterceptorApplied}, {@link BookForAShowLoggingInterceptor}
+ */
+@Interceptors(BookForAShowLoggingInterceptor.class)
+@Stateful
+public class BookForAShowOldStyleInterceptorBinding implements Serializable {
+
+    private static final long serialVersionUID = 6350400892234496909L;
+
+    public List<String> getMoviesList() {
+        List<String> moviesAvailable = new ArrayList<String>();
+        moviesAvailable.add("KungFu Panda 2");
+        moviesAvailable.add("Kings speech");
+        return moviesAvailable;
+    }
+
+    public Integer getDiscountedPrice(int ticketPrice) {
+        return ticketPrice - 50;
+    }
+    // assume more methods are present
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOneInterceptorApplied.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOneInterceptorApplied.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOneInterceptorApplied.java
index 6b94b79..96fec27 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOneInterceptorApplied.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowOneInterceptorApplied.java
@@ -1,43 +1,43 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.beans;
-
-import org.superbiz.cdi.bookshow.interceptorbinding.Log;
-
-import javax.ejb.Stateful;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-@Log
-@Stateful
-public class BookForAShowOneInterceptorApplied implements Serializable {
-
-    private static final long serialVersionUID = 6350400892234496909L;
-
-    public List<String> getMoviesList() {
-        List<String> moviesAvailable = new ArrayList<String>();
-        moviesAvailable.add("12 Angry Men");
-        moviesAvailable.add("Kings speech");
-        return moviesAvailable;
-    }
-
-    public Integer getDiscountedPrice(int ticketPrice) {
-        return ticketPrice - 50;
-    }
-    // assume more methods are present
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.beans;
+
+import org.superbiz.cdi.bookshow.interceptorbinding.Log;
+
+import javax.ejb.Stateful;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Log
+@Stateful
+public class BookForAShowOneInterceptorApplied implements Serializable {
+
+    private static final long serialVersionUID = 6350400892234496909L;
+
+    public List<String> getMoviesList() {
+        List<String> moviesAvailable = new ArrayList<String>();
+        moviesAvailable.add("12 Angry Men");
+        moviesAvailable.add("Kings speech");
+        return moviesAvailable;
+    }
+
+    public Integer getDiscountedPrice(int ticketPrice) {
+        return ticketPrice - 50;
+    }
+    // assume more methods are present
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowTwoInterceptorsApplied.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowTwoInterceptorsApplied.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowTwoInterceptorsApplied.java
index bc088f2..8c639c2 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowTwoInterceptorsApplied.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookForAShowTwoInterceptorsApplied.java
@@ -1,45 +1,45 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.beans;
-
-import org.superbiz.cdi.bookshow.interceptorbinding.Log;
-import org.superbiz.cdi.bookshow.interceptorbinding.TimeRestricted;
-
-import javax.ejb.Stateful;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-@Log
-@Stateful
-public class BookForAShowTwoInterceptorsApplied implements Serializable {
-
-    private static final long serialVersionUID = 6350400892234496909L;
-
-    public List<String> getMoviesList() {
-        List<String> moviesAvailable = new ArrayList<String>();
-        moviesAvailable.add("12 Angry Men");
-        moviesAvailable.add("Kings speech");
-        return moviesAvailable;
-    }
-
-    @TimeRestricted
-    public Integer getDiscountedPrice(int ticketPrice) {
-        return ticketPrice - 50;
-    }
-    // assume more methods are present
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.beans;
+
+import org.superbiz.cdi.bookshow.interceptorbinding.Log;
+import org.superbiz.cdi.bookshow.interceptorbinding.TimeRestricted;
+
+import javax.ejb.Stateful;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Log
+@Stateful
+public class BookForAShowTwoInterceptorsApplied implements Serializable {
+
+    private static final long serialVersionUID = 6350400892234496909L;
+
+    public List<String> getMoviesList() {
+        List<String> moviesAvailable = new ArrayList<String>();
+        moviesAvailable.add("12 Angry Men");
+        moviesAvailable.add("Kings speech");
+        return moviesAvailable;
+    }
+
+    @TimeRestricted
+    public Integer getDiscountedPrice(int ticketPrice) {
+        return ticketPrice - 50;
+    }
+    // assume more methods are present
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookShowInterceptorBindingInheritanceExplored.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookShowInterceptorBindingInheritanceExplored.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookShowInterceptorBindingInheritanceExplored.java
index 323526f..4a4aa96 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookShowInterceptorBindingInheritanceExplored.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/beans/BookShowInterceptorBindingInheritanceExplored.java
@@ -1,43 +1,43 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.beans;
-
-import org.superbiz.cdi.bookshow.interceptorbinding.TimeRestrictAndLog;
-
-import javax.ejb.Stateful;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-@Stateful
-public class BookShowInterceptorBindingInheritanceExplored implements Serializable {
-
-    private static final long serialVersionUID = 6350400892234496909L;
-
-    public List<String> getMoviesList() {
-        List<String> moviesAvailable = new ArrayList<String>();
-        moviesAvailable.add("12 Angry Men");
-        moviesAvailable.add("Kings speech");
-        return moviesAvailable;
-    }
-
-    @TimeRestrictAndLog
-    public Integer getDiscountedPrice(int ticketPrice) {
-        return ticketPrice - 50;
-    }
-    // assume more methods are present
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.beans;
+
+import org.superbiz.cdi.bookshow.interceptorbinding.TimeRestrictAndLog;
+
+import javax.ejb.Stateful;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Stateful
+public class BookShowInterceptorBindingInheritanceExplored implements Serializable {
+
+    private static final long serialVersionUID = 6350400892234496909L;
+
+    public List<String> getMoviesList() {
+        List<String> moviesAvailable = new ArrayList<String>();
+        moviesAvailable.add("12 Angry Men");
+        moviesAvailable.add("Kings speech");
+        return moviesAvailable;
+    }
+
+    @TimeRestrictAndLog
+    public Integer getDiscountedPrice(int ticketPrice) {
+        return ticketPrice - 50;
+    }
+    // assume more methods are present
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java
index cdaf8d7..9096511 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.interceptorbinding;
-
-import javax.interceptor.InterceptorBinding;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@InterceptorBinding
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-public @interface Log {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.interceptorbinding;
+
+import javax.interceptor.InterceptorBinding;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@InterceptorBinding
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+public @interface Log {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestrictAndLog.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestrictAndLog.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestrictAndLog.java
index f3315da..9aa4a1f 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestrictAndLog.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestrictAndLog.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.interceptorbinding;
-
-import javax.interceptor.InterceptorBinding;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * This InterceptorBinding inherits from @Log and @TimeRestricted Interceptor-Bindings.
- */
-@Inherited
-@InterceptorBinding
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-@Log
-@TimeRestricted
-public @interface TimeRestrictAndLog {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.interceptorbinding;
+
+import javax.interceptor.InterceptorBinding;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * This InterceptorBinding inherits from @Log and @TimeRestricted Interceptor-Bindings.
+ */
+@Inherited
+@InterceptorBinding
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+@Log
+@TimeRestricted
+public @interface TimeRestrictAndLog {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestricted.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestricted.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestricted.java
index d83bb73..db619e9 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestricted.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/TimeRestricted.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.interceptorbinding;
-
-import javax.interceptor.InterceptorBinding;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@InterceptorBinding
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-public @interface TimeRestricted {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.interceptorbinding;
+
+import javax.interceptor.InterceptorBinding;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@InterceptorBinding
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+public @interface TimeRestricted {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowLoggingInterceptor.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowLoggingInterceptor.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowLoggingInterceptor.java
index cc2cce3..38d4c35 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowLoggingInterceptor.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowLoggingInterceptor.java
@@ -1,73 +1,73 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- * <p/>
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-/**
- * 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.superbiz.cdi.bookshow.interceptors;
-
-import org.superbiz.cdi.bookshow.interceptorbinding.Log;
-import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-import java.io.Serializable;
-import java.util.logging.Logger;
-
-@Interceptor
-@Log
-public class BookForAShowLoggingInterceptor implements Serializable {
-
-    private static final long serialVersionUID = 8139854519874743530L;
-    private Logger logger = Logger.getLogger("BookForAShowApplicationLogger");
-
-    @AroundInvoke
-    public Object logMethodEntry(InvocationContext ctx) throws Exception {
-        logger.info("Before entering method:" + ctx.getMethod().getName());
-        InterceptionOrderTracker.getMethodsInterceptedList().add(ctx.getMethod().getName());
-        InterceptionOrderTracker.getInterceptedByList().add(this.getClass().getSimpleName());
-        return ctx.proceed();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ * <p/>
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+/**
+ * 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.superbiz.cdi.bookshow.interceptors;
+
+import org.superbiz.cdi.bookshow.interceptorbinding.Log;
+import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+import java.io.Serializable;
+import java.util.logging.Logger;
+
+@Interceptor
+@Log
+public class BookForAShowLoggingInterceptor implements Serializable {
+
+    private static final long serialVersionUID = 8139854519874743530L;
+    private Logger logger = Logger.getLogger("BookForAShowApplicationLogger");
+
+    @AroundInvoke
+    public Object logMethodEntry(InvocationContext ctx) throws Exception {
+        logger.info("Before entering method:" + ctx.getMethod().getName());
+        InterceptionOrderTracker.getMethodsInterceptedList().add(ctx.getMethod().getName());
+        InterceptionOrderTracker.getInterceptedByList().add(this.getClass().getSimpleName());
+        return ctx.proceed();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/TimeBasedRestrictingInterceptor.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/TimeBasedRestrictingInterceptor.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/TimeBasedRestrictingInterceptor.java
index 07695bb..bbc7188 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/TimeBasedRestrictingInterceptor.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/interceptors/TimeBasedRestrictingInterceptor.java
@@ -1,51 +1,51 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.interceptors;
-
-import org.superbiz.cdi.AccessDeniedException;
-import org.superbiz.cdi.bookshow.interceptorbinding.TimeRestricted;
-import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-import java.io.Serializable;
-
-@Interceptor
-@TimeRestricted
-public class TimeBasedRestrictingInterceptor implements Serializable {
-
-    private static final long serialVersionUID = 8139854519874743530L;
-
-    @AroundInvoke
-    public Object restrictAccessBasedOnTime(InvocationContext ctx) throws Exception {
-        InterceptionOrderTracker.getMethodsInterceptedList().add(ctx.getMethod().getName());
-        InterceptionOrderTracker.getInterceptedByList().add(this.getClass().getSimpleName());
-        if (!isWorkingHours()) {
-            throw new AccessDeniedException("You are not allowed to access the method at this time");
-        }
-        return ctx.proceed();
-    }
-
-    private boolean isWorkingHours() {
-        /*
-         * int hourOfDay = Calendar.getInstance().get(Calendar.HOUR_OF_DAY); if (hourOfDay >= 9 && hourOfDay <= 21) {
-         * return true; } else { return false; }
-         */
-        return true; // Let's assume
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.interceptors;
+
+import org.superbiz.cdi.AccessDeniedException;
+import org.superbiz.cdi.bookshow.interceptorbinding.TimeRestricted;
+import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+import java.io.Serializable;
+
+@Interceptor
+@TimeRestricted
+public class TimeBasedRestrictingInterceptor implements Serializable {
+
+    private static final long serialVersionUID = 8139854519874743530L;
+
+    @AroundInvoke
+    public Object restrictAccessBasedOnTime(InvocationContext ctx) throws Exception {
+        InterceptionOrderTracker.getMethodsInterceptedList().add(ctx.getMethod().getName());
+        InterceptionOrderTracker.getInterceptedByList().add(this.getClass().getSimpleName());
+        if (!isWorkingHours()) {
+            throw new AccessDeniedException("You are not allowed to access the method at this time");
+        }
+        return ctx.proceed();
+    }
+
+    private boolean isWorkingHours() {
+        /*
+         * int hourOfDay = Calendar.getInstance().get(Calendar.HOUR_OF_DAY); if (hourOfDay >= 9 && hourOfDay <= 21) {
+         * return true; } else { return false; }
+         */
+        return true; // Let's assume
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/tracker/InterceptionOrderTracker.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/tracker/InterceptionOrderTracker.java b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/tracker/InterceptionOrderTracker.java
index 834c215..88ed092 100644
--- a/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/tracker/InterceptionOrderTracker.java
+++ b/examples/cdi-interceptors/src/main/java/org/superbiz/cdi/bookshow/tracker/InterceptionOrderTracker.java
@@ -1,49 +1,49 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.tracker;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A helper class for the test.
- * Keeps track of methods intercepted during one testXXX run
- * Keeps track of interceptors applied during one textXXX run
- */
-public class InterceptionOrderTracker {
-
-    /*
-     * Contains method names that were intercepted by the interceptors
-     */
-    private static List<String> methodsInterceptedList = new ArrayList<String>();
-    /*
-     * Contains the name of the interceptor class that intercepted a method
-     */
-    private static List<String> interceptedByList = new ArrayList<String>();
-
-    public static List<String> getInterceptedByList() {
-        return interceptedByList;
-    }
-
-    public static void setInterceptedByList(List<String> interceptedByList) {
-        InterceptionOrderTracker.interceptedByList = interceptedByList;
-    }
-
-    public static List<String> getMethodsInterceptedList() {
-        return methodsInterceptedList;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.tracker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A helper class for the test.
+ * Keeps track of methods intercepted during one testXXX run
+ * Keeps track of interceptors applied during one textXXX run
+ */
+public class InterceptionOrderTracker {
+
+    /*
+     * Contains method names that were intercepted by the interceptors
+     */
+    private static List<String> methodsInterceptedList = new ArrayList<String>();
+    /*
+     * Contains the name of the interceptor class that intercepted a method
+     */
+    private static List<String> interceptedByList = new ArrayList<String>();
+
+    public static List<String> getInterceptedByList() {
+        return interceptedByList;
+    }
+
+    public static void setInterceptedByList(List<String> interceptedByList) {
+        InterceptionOrderTracker.interceptedByList = interceptedByList;
+    }
+
+    public static List<String> getMethodsInterceptedList() {
+        return methodsInterceptedList;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOldStyleInterceptorBindingTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOldStyleInterceptorBindingTest.java b/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOldStyleInterceptorBindingTest.java
index c86fa40..40bb003 100644
--- a/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOldStyleInterceptorBindingTest.java
+++ b/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOldStyleInterceptorBindingTest.java
@@ -1,58 +1,58 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.interceptors;
-
-import junit.framework.TestCase;
-import org.superbiz.cdi.bookshow.beans.BookForAShowOldStyleInterceptorBinding;
-import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-
-public class BookForAShowOldStyleInterceptorBindingTest extends TestCase {
-
-    @EJB
-    private BookForAShowOldStyleInterceptorBinding bookForAShowBean;
-    EJBContainer ejbContainer;
-
-    /**
-     * Bootstrap the Embedded EJB Container
-     *
-     * @throws Exception
-     */
-    protected void setUp() throws Exception {
-        ejbContainer = EJBContainer.createEJBContainer();
-        ejbContainer.getContext().bind("inject", this);
-    }
-
-    /**
-     * Test basic interception
-     */
-    public void testMethodShouldBeIntercepted() {
-        // action
-        bookForAShowBean.getMoviesList();
-        // verify
-        assertTrue(InterceptionOrderTracker.getMethodsInterceptedList().contains("getMoviesList"));
-    }
-
-    protected void tearDown() {
-        // clear the lists after each test
-        InterceptionOrderTracker.getInterceptedByList().clear();
-        InterceptionOrderTracker.getMethodsInterceptedList().clear();
-        ejbContainer.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.interceptors;
+
+import junit.framework.TestCase;
+import org.superbiz.cdi.bookshow.beans.BookForAShowOldStyleInterceptorBinding;
+import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+
+public class BookForAShowOldStyleInterceptorBindingTest extends TestCase {
+
+    @EJB
+    private BookForAShowOldStyleInterceptorBinding bookForAShowBean;
+    EJBContainer ejbContainer;
+
+    /**
+     * Bootstrap the Embedded EJB Container
+     *
+     * @throws Exception
+     */
+    protected void setUp() throws Exception {
+        ejbContainer = EJBContainer.createEJBContainer();
+        ejbContainer.getContext().bind("inject", this);
+    }
+
+    /**
+     * Test basic interception
+     */
+    public void testMethodShouldBeIntercepted() {
+        // action
+        bookForAShowBean.getMoviesList();
+        // verify
+        assertTrue(InterceptionOrderTracker.getMethodsInterceptedList().contains("getMoviesList"));
+    }
+
+    protected void tearDown() {
+        // clear the lists after each test
+        InterceptionOrderTracker.getInterceptedByList().clear();
+        InterceptionOrderTracker.getMethodsInterceptedList().clear();
+        ejbContainer.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOneInterceptorAppliedTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOneInterceptorAppliedTest.java b/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOneInterceptorAppliedTest.java
index db40612..4b1f0f3 100644
--- a/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOneInterceptorAppliedTest.java
+++ b/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowOneInterceptorAppliedTest.java
@@ -1,58 +1,58 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.interceptors;
-
-import junit.framework.TestCase;
-import org.superbiz.cdi.bookshow.beans.BookForAShowOneInterceptorApplied;
-import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-
-public class BookForAShowOneInterceptorAppliedTest extends TestCase {
-
-    @EJB
-    private BookForAShowOneInterceptorApplied bookForAShowBean;
-    EJBContainer ejbContainer;
-
-    /**
-     * Bootstrap the Embedded EJB Container
-     *
-     * @throws Exception
-     */
-    protected void setUp() throws Exception {
-        ejbContainer = EJBContainer.createEJBContainer();
-        ejbContainer.getContext().bind("inject", this);
-    }
-
-    /**
-     * Test basic interception
-     */
-    public void testMethodShouldBeIntercepted() {
-        // action
-        bookForAShowBean.getMoviesList();
-        // verify
-        assertTrue(InterceptionOrderTracker.getMethodsInterceptedList().contains("getMoviesList"));
-    }
-
-    protected void tearDown() {
-        // clear the list after each test
-        InterceptionOrderTracker.getInterceptedByList().clear();
-        InterceptionOrderTracker.getMethodsInterceptedList().clear();
-        ejbContainer.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.interceptors;
+
+import junit.framework.TestCase;
+import org.superbiz.cdi.bookshow.beans.BookForAShowOneInterceptorApplied;
+import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+
+public class BookForAShowOneInterceptorAppliedTest extends TestCase {
+
+    @EJB
+    private BookForAShowOneInterceptorApplied bookForAShowBean;
+    EJBContainer ejbContainer;
+
+    /**
+     * Bootstrap the Embedded EJB Container
+     *
+     * @throws Exception
+     */
+    protected void setUp() throws Exception {
+        ejbContainer = EJBContainer.createEJBContainer();
+        ejbContainer.getContext().bind("inject", this);
+    }
+
+    /**
+     * Test basic interception
+     */
+    public void testMethodShouldBeIntercepted() {
+        // action
+        bookForAShowBean.getMoviesList();
+        // verify
+        assertTrue(InterceptionOrderTracker.getMethodsInterceptedList().contains("getMoviesList"));
+    }
+
+    protected void tearDown() {
+        // clear the list after each test
+        InterceptionOrderTracker.getInterceptedByList().clear();
+        InterceptionOrderTracker.getMethodsInterceptedList().clear();
+        ejbContainer.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowTwoInterceptorsAppiledTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowTwoInterceptorsAppiledTest.java b/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowTwoInterceptorsAppiledTest.java
index 0c0093d..2bd0d24 100644
--- a/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowTwoInterceptorsAppiledTest.java
+++ b/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookForAShowTwoInterceptorsAppiledTest.java
@@ -1,70 +1,70 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.interceptors;
-
-import junit.framework.TestCase;
-import org.superbiz.cdi.bookshow.beans.BookForAShowTwoInterceptorsApplied;
-import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-import java.util.List;
-
-public class BookForAShowTwoInterceptorsAppiledTest extends TestCase {
-
-    @EJB
-    private BookForAShowTwoInterceptorsApplied bookForAShowBean;
-    EJBContainer ejbContainer;
-
-    /**
-     * Bootstrap the Embedded EJB Container
-     *
-     * @throws Exception
-     */
-    protected void setUp() throws Exception {
-        ejbContainer = EJBContainer.createEJBContainer();
-        ejbContainer.getContext().bind("inject", this);
-    }
-
-    /**
-     * Interceptors should be applied in order as defined in beans.xml
-     */
-    public void testInterceptorsShouldBeAppliedInOrder() {
-        // action
-        bookForAShowBean.getDiscountedPrice(100);
-        // verify
-        List<String> interceptedByList = InterceptionOrderTracker.getInterceptedByList();
-        int indexOfLogger = interceptedByList.indexOf("BookForAShowLoggingInterceptor");
-        int indexOfTimeBasedRestrictor = interceptedByList.indexOf("TimeBasedRestrictingInterceptor");
-        assertTrue(indexOfLogger < indexOfTimeBasedRestrictor);
-    }
-
-    public void testTwoInterceptorsWereInvoked() {
-        // action
-        bookForAShowBean.getDiscountedPrice(100);
-        // verify
-        List<String> interceptedByList = InterceptionOrderTracker.getInterceptedByList();
-        assertTrue(interceptedByList.contains("BookForAShowLoggingInterceptor") && interceptedByList.contains("TimeBasedRestrictingInterceptor"));
-    }
-
-    protected void tearDown() {
-        // clear the lists after each test
-        InterceptionOrderTracker.getInterceptedByList().clear();
-        InterceptionOrderTracker.getMethodsInterceptedList().clear();
-        ejbContainer.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.interceptors;
+
+import junit.framework.TestCase;
+import org.superbiz.cdi.bookshow.beans.BookForAShowTwoInterceptorsApplied;
+import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+import java.util.List;
+
+public class BookForAShowTwoInterceptorsAppiledTest extends TestCase {
+
+    @EJB
+    private BookForAShowTwoInterceptorsApplied bookForAShowBean;
+    EJBContainer ejbContainer;
+
+    /**
+     * Bootstrap the Embedded EJB Container
+     *
+     * @throws Exception
+     */
+    protected void setUp() throws Exception {
+        ejbContainer = EJBContainer.createEJBContainer();
+        ejbContainer.getContext().bind("inject", this);
+    }
+
+    /**
+     * Interceptors should be applied in order as defined in beans.xml
+     */
+    public void testInterceptorsShouldBeAppliedInOrder() {
+        // action
+        bookForAShowBean.getDiscountedPrice(100);
+        // verify
+        List<String> interceptedByList = InterceptionOrderTracker.getInterceptedByList();
+        int indexOfLogger = interceptedByList.indexOf("BookForAShowLoggingInterceptor");
+        int indexOfTimeBasedRestrictor = interceptedByList.indexOf("TimeBasedRestrictingInterceptor");
+        assertTrue(indexOfLogger < indexOfTimeBasedRestrictor);
+    }
+
+    public void testTwoInterceptorsWereInvoked() {
+        // action
+        bookForAShowBean.getDiscountedPrice(100);
+        // verify
+        List<String> interceptedByList = InterceptionOrderTracker.getInterceptedByList();
+        assertTrue(interceptedByList.contains("BookForAShowLoggingInterceptor") && interceptedByList.contains("TimeBasedRestrictingInterceptor"));
+    }
+
+    protected void tearDown() {
+        // clear the lists after each test
+        InterceptionOrderTracker.getInterceptedByList().clear();
+        InterceptionOrderTracker.getMethodsInterceptedList().clear();
+        ejbContainer.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowInterceptorBindingInheritanceTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowInterceptorBindingInheritanceTest.java b/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowInterceptorBindingInheritanceTest.java
index 95b854a..258e1b5 100644
--- a/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowInterceptorBindingInheritanceTest.java
+++ b/examples/cdi-interceptors/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowInterceptorBindingInheritanceTest.java
@@ -1,58 +1,58 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.bookshow.interceptors;
-
-import junit.framework.TestCase;
-import org.superbiz.cdi.bookshow.beans.BookShowInterceptorBindingInheritanceExplored;
-import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-import java.util.List;
-
-public class BookShowInterceptorBindingInheritanceTest extends TestCase {
-
-    @EJB
-    private BookShowInterceptorBindingInheritanceExplored bookForAShowBean;
-    EJBContainer ejbContainer;
-
-    /**
-     * Bootstrap the Embedded EJB Container
-     *
-     * @throws Exception
-     */
-    protected void setUp() throws Exception {
-        ejbContainer = EJBContainer.createEJBContainer();
-        ejbContainer.getContext().bind("inject", this);
-    }
-
-    public void testInterceptorBindingCanInheritFromAnotherBinding() {
-        // action
-        bookForAShowBean.getDiscountedPrice(100);
-        // verify both interceptors were invoked
-        List<String> interceptedByList = InterceptionOrderTracker.getInterceptedByList();
-        System.out.println("Intercepted by:" + interceptedByList);
-        assertTrue(interceptedByList.contains("BookForAShowLoggingInterceptor") && interceptedByList.contains("TimeBasedRestrictingInterceptor"));
-    }
-
-    protected void tearDown() {
-        // clear the list after each test
-        InterceptionOrderTracker.getInterceptedByList().clear();
-        InterceptionOrderTracker.getMethodsInterceptedList().clear();
-        ejbContainer.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.bookshow.interceptors;
+
+import junit.framework.TestCase;
+import org.superbiz.cdi.bookshow.beans.BookShowInterceptorBindingInheritanceExplored;
+import org.superbiz.cdi.bookshow.tracker.InterceptionOrderTracker;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+import java.util.List;
+
+public class BookShowInterceptorBindingInheritanceTest extends TestCase {
+
+    @EJB
+    private BookShowInterceptorBindingInheritanceExplored bookForAShowBean;
+    EJBContainer ejbContainer;
+
+    /**
+     * Bootstrap the Embedded EJB Container
+     *
+     * @throws Exception
+     */
+    protected void setUp() throws Exception {
+        ejbContainer = EJBContainer.createEJBContainer();
+        ejbContainer.getContext().bind("inject", this);
+    }
+
+    public void testInterceptorBindingCanInheritFromAnotherBinding() {
+        // action
+        bookForAShowBean.getDiscountedPrice(100);
+        // verify both interceptors were invoked
+        List<String> interceptedByList = InterceptionOrderTracker.getInterceptedByList();
+        System.out.println("Intercepted by:" + interceptedByList);
+        assertTrue(interceptedByList.contains("BookForAShowLoggingInterceptor") && interceptedByList.contains("TimeBasedRestrictingInterceptor"));
+    }
+
+    protected void tearDown() {
+        // clear the list after each test
+        InterceptionOrderTracker.getInterceptedByList().clear();
+        InterceptionOrderTracker.getMethodsInterceptedList().clear();
+        ejbContainer.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/ConsoleHandler.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/ConsoleHandler.java b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/ConsoleHandler.java
index d60ffe0..ab5b1ff 100644
--- a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/ConsoleHandler.java
+++ b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/ConsoleHandler.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.disposes;
-
-public class ConsoleHandler implements LogHandler {
-
-    private String name;
-
-    public ConsoleHandler(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void writeLog(String s) {
-        System.out.printf("##### Handler: %s, Writing to the console!\n", getName());
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.disposes;
+
+public class ConsoleHandler implements LogHandler {
+
+    private String name;
+
+    public ConsoleHandler(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void writeLog(String s) {
+        System.out.printf("##### Handler: %s, Writing to the console!\n", getName());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/DatabaseHandler.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/DatabaseHandler.java b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/DatabaseHandler.java
index 4b3a12c..01e8864 100644
--- a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/DatabaseHandler.java
+++ b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/DatabaseHandler.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.disposes;
-
-public class DatabaseHandler implements LogHandler {
-
-    private String name;
-
-    public DatabaseHandler(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void writeLog(String s) {
-        System.out.printf("##### Handler: %s, Writing to the database!\n", getName());
-        // Use connection to write log to database
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.disposes;
+
+public class DatabaseHandler implements LogHandler {
+
+    private String name;
+
+    public DatabaseHandler(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void writeLog(String s) {
+        System.out.printf("##### Handler: %s, Writing to the database!\n", getName());
+        // Use connection to write log to database
+    }
+
+}


[17/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java
----------------------------------------------------------------------
diff --git a/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java b/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java
index 3cd5f78..d5afb06 100644
--- a/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java
+++ b/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java
@@ -1,100 +1,100 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.composed;
-
-import junit.framework.TestCase;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatefulBean;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Configuration;
-import org.apache.openejb.testing.Module;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.transaction.UserTransaction;
-import java.util.List;
-import java.util.Properties;
-
-//START SNIPPET: code
-@RunWith(ApplicationComposer.class)
-public class MoviesTest extends TestCase {
-
-    @EJB
-    private Movies movies;
-
-    @Resource
-    private UserTransaction userTransaction;
-
-    @PersistenceContext
-    private EntityManager entityManager;
-
-    @Module
-    public PersistenceUnit persistence() {
-        PersistenceUnit unit = new PersistenceUnit("movie-unit");
-        unit.setJtaDataSource("movieDatabase");
-        unit.setNonJtaDataSource("movieDatabaseUnmanaged");
-        unit.getClazz().add(Movie.class.getName());
-        unit.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
-        return unit;
-    }
-
-    @Module
-    public EjbJar beans() {
-        EjbJar ejbJar = new EjbJar("movie-beans");
-        ejbJar.addEnterpriseBean(new StatefulBean(MoviesImpl.class));
-        return ejbJar;
-    }
-
-    @Configuration
-    public Properties config() throws Exception {
-        Properties p = new Properties();
-        p.put("movieDatabase", "new://Resource?type=DataSource");
-        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-        return p;
-    }
-
-    @Test
-    public void test() throws Exception {
-
-        userTransaction.begin();
-
-        try {
-            entityManager.persist(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-            entityManager.persist(new Movie("Joel Coen", "Fargo", 1996));
-            entityManager.persist(new Movie("Joel Coen", "The Big Lebowski", 1998));
-
-            List<Movie> list = movies.getMovies();
-            assertEquals("List.size()", 3, list.size());
-
-            for (Movie movie : list) {
-                movies.deleteMovie(movie);
-            }
-
-            assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
-
-        } finally {
-            userTransaction.commit();
-        }
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.composed;
+
+import junit.framework.TestCase;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatefulBean;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.UserTransaction;
+import java.util.List;
+import java.util.Properties;
+
+//START SNIPPET: code
+@RunWith(ApplicationComposer.class)
+public class MoviesTest extends TestCase {
+
+    @EJB
+    private Movies movies;
+
+    @Resource
+    private UserTransaction userTransaction;
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Module
+    public PersistenceUnit persistence() {
+        PersistenceUnit unit = new PersistenceUnit("movie-unit");
+        unit.setJtaDataSource("movieDatabase");
+        unit.setNonJtaDataSource("movieDatabaseUnmanaged");
+        unit.getClazz().add(Movie.class.getName());
+        unit.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
+        return unit;
+    }
+
+    @Module
+    public EjbJar beans() {
+        EjbJar ejbJar = new EjbJar("movie-beans");
+        ejbJar.addEnterpriseBean(new StatefulBean(MoviesImpl.class));
+        return ejbJar;
+    }
+
+    @Configuration
+    public Properties config() throws Exception {
+        Properties p = new Properties();
+        p.put("movieDatabase", "new://Resource?type=DataSource");
+        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+        return p;
+    }
+
+    @Test
+    public void test() throws Exception {
+
+        userTransaction.begin();
+
+        try {
+            entityManager.persist(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+            entityManager.persist(new Movie("Joel Coen", "Fargo", 1996));
+            entityManager.persist(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+            List<Movie> list = movies.getMovies();
+            assertEquals("List.size()", 3, list.size());
+
+            for (Movie movie : list) {
+                movies.deleteMovie(movie);
+            }
+
+            assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+
+        } finally {
+            userTransaction.commit();
+        }
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/Agenda.java
----------------------------------------------------------------------
diff --git a/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/Agenda.java b/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/Agenda.java
index 219395e..3beda2a 100644
--- a/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/Agenda.java
+++ b/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/Agenda.java
@@ -1,23 +1,23 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.example.jaxws;
-
-import java.util.Date;
-
-public interface Agenda {
-    boolean isBookable(Date d);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.example.jaxws;
+
+import java.util.Date;
+
+public interface Agenda {
+    boolean isBookable(Date d);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/LazyAgenda.java
----------------------------------------------------------------------
diff --git a/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/LazyAgenda.java b/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/LazyAgenda.java
index d989da5..c0f6b2e 100644
--- a/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/LazyAgenda.java
+++ b/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/LazyAgenda.java
@@ -1,26 +1,26 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.example.jaxws;
-
-import java.util.Date;
-
-public class LazyAgenda implements Agenda {
-    @Override
-    public boolean isBookable(final Date d) {
-        return d.after(new Date());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.example.jaxws;
+
+import java.util.Date;
+
+public class LazyAgenda implements Agenda {
+    @Override
+    public boolean isBookable(final Date d) {
+        return d.after(new Date());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlanner.java
----------------------------------------------------------------------
diff --git a/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlanner.java b/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlanner.java
index 005f4a7..a71404d 100644
--- a/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlanner.java
+++ b/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlanner.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.example.jaxws;
-
-import javax.jws.WebService;
-import java.util.Date;
-
-@WebService
-public interface MeetingPlanner {
-    boolean book(final Date date);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.example.jaxws;
+
+import javax.jws.WebService;
+import java.util.Date;
+
+@WebService
+public interface MeetingPlanner {
+    boolean book(final Date date);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlannerImpl.java
----------------------------------------------------------------------
diff --git a/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlannerImpl.java b/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlannerImpl.java
index 243c21b..fcc08bd 100644
--- a/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlannerImpl.java
+++ b/examples/applicationcomposer-jaxws-cdi/src/main/java/org/superbiz/example/jaxws/MeetingPlannerImpl.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.example.jaxws;
-
-import javax.inject.Inject;
-import javax.jws.WebService;
-import java.util.Date;
-
-@WebService
-public class MeetingPlannerImpl implements MeetingPlanner {
-    @Inject
-    private Agenda agenda;
-
-    @Override
-    public boolean book(final Date date) {
-        return agenda.isBookable(date);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.example.jaxws;
+
+import javax.inject.Inject;
+import javax.jws.WebService;
+import java.util.Date;
+
+@WebService
+public class MeetingPlannerImpl implements MeetingPlanner {
+    @Inject
+    private Agenda agenda;
+
+    @Override
+    public boolean book(final Date date) {
+        return agenda.isBookable(date);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationcomposer-jaxws-cdi/src/test/java/org/superbiz/example/jaxws/MeetingPlannerTest.java
----------------------------------------------------------------------
diff --git a/examples/applicationcomposer-jaxws-cdi/src/test/java/org/superbiz/example/jaxws/MeetingPlannerTest.java b/examples/applicationcomposer-jaxws-cdi/src/test/java/org/superbiz/example/jaxws/MeetingPlannerTest.java
index bc43041..e862038 100644
--- a/examples/applicationcomposer-jaxws-cdi/src/test/java/org/superbiz/example/jaxws/MeetingPlannerTest.java
+++ b/examples/applicationcomposer-jaxws-cdi/src/test/java/org/superbiz/example/jaxws/MeetingPlannerTest.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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.example.jaxws;
-
-import org.apache.openejb.jee.WebApp;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Classes;
-import org.apache.openejb.testing.Configuration;
-import org.apache.openejb.testing.EnableServices;
-import org.apache.openejb.testing.Module;
-import org.apache.openejb.testng.PropertiesBuilder;
-import org.apache.openejb.util.NetworkUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
-import java.util.Properties;
-
-import static org.junit.Assert.assertTrue;
-
-@EnableServices("jax-ws")
-@RunWith(ApplicationComposer.class)
-public class MeetingPlannerTest {
-    private static final int JAX_WS_PORT = NetworkUtil.getNextAvailablePort();
-
-    @Configuration
-    public Properties configuration() {
-        return new PropertiesBuilder().p("httpejbd.port", Integer.toString(JAX_WS_PORT)).build();
-    }
-
-    @Module
-    @Classes(cdi = true, value = {MeetingPlannerImpl.class, LazyAgenda.class})
-    public WebApp war() {
-        return new WebApp()
-                .contextRoot("/demo")
-                .addServlet("jaxws", MeetingPlannerImpl.class.getName(), "/meeting-planner");
-    }
-
-    @Test
-    public void book() throws MalformedURLException {
-        final Service service = Service.create(
-                new URL("http://127.0.0.1:" + JAX_WS_PORT + "/demo/meeting-planner?wsdl"),
-                new QName("http://jaxws.example.superbiz.org/", "MeetingPlannerImplService"));
-        final MeetingPlanner planner = service.getPort(MeetingPlanner.class);
-        assertTrue(planner.book(new Date(System.currentTimeMillis() + 1000000)));
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.example.jaxws;
+
+import org.apache.openejb.jee.WebApp;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Date;
+import java.util.Properties;
+
+import static org.junit.Assert.assertTrue;
+
+@EnableServices("jax-ws")
+@RunWith(ApplicationComposer.class)
+public class MeetingPlannerTest {
+    private static final int JAX_WS_PORT = NetworkUtil.getNextAvailablePort();
+
+    @Configuration
+    public Properties configuration() {
+        return new PropertiesBuilder().p("httpejbd.port", Integer.toString(JAX_WS_PORT)).build();
+    }
+
+    @Module
+    @Classes(cdi = true, value = {MeetingPlannerImpl.class, LazyAgenda.class})
+    public WebApp war() {
+        return new WebApp()
+                .contextRoot("/demo")
+                .addServlet("jaxws", MeetingPlannerImpl.class.getName(), "/meeting-planner");
+    }
+
+    @Test
+    public void book() throws MalformedURLException {
+        final Service service = Service.create(
+                new URL("http://127.0.0.1:" + JAX_WS_PORT + "/demo/meeting-planner?wsdl"),
+                new QName("http://jaxws.example.superbiz.org/", "MeetingPlannerImplService"));
+        final MeetingPlanner planner = service.getPort(MeetingPlanner.class);
+        assertTrue(planner.book(new Date(System.currentTimeMillis() + 1000000)));
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationexception/src/main/java/org/superbiz/appexception/BusinessException.java
----------------------------------------------------------------------
diff --git a/examples/applicationexception/src/main/java/org/superbiz/appexception/BusinessException.java b/examples/applicationexception/src/main/java/org/superbiz/appexception/BusinessException.java
index 14b68cb..fe61515 100755
--- a/examples/applicationexception/src/main/java/org/superbiz/appexception/BusinessException.java
+++ b/examples/applicationexception/src/main/java/org/superbiz/appexception/BusinessException.java
@@ -1,27 +1,27 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.appexception;
-
-import javax.ejb.ApplicationException;
-
-/**
- * @version $Rev$ $Date$
- */
-@ApplicationException(rollback = true)
-public abstract class BusinessException extends RuntimeException {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.appexception;
+
+import javax.ejb.ApplicationException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@ApplicationException(rollback = true)
+public abstract class BusinessException extends RuntimeException {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessException.java
----------------------------------------------------------------------
diff --git a/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessException.java b/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessException.java
index 4fd3c43..272f8c1 100755
--- a/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessException.java
+++ b/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessException.java
@@ -1,33 +1,33 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.appexception;
-
-import javax.ejb.Remote;
-
-/**
- * This is an EJB 3 remote business interface
- * A remote business interface must be annotated with the @Remote
- * annotation
- */
-//START SNIPPET: code
-@Remote
-public interface ThrowBusinessException {
-
-    public void throwValueRequiredException() throws BusinessException;
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.appexception;
+
+import javax.ejb.Remote;
+
+/**
+ * This is an EJB 3 remote business interface
+ * A remote business interface must be annotated with the @Remote
+ * annotation
+ */
+//START SNIPPET: code
+@Remote
+public interface ThrowBusinessException {
+
+    public void throwValueRequiredException() throws BusinessException;
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessExceptionImpl.java
----------------------------------------------------------------------
diff --git a/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessExceptionImpl.java b/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessExceptionImpl.java
index 02a6edd..f0613f0 100755
--- a/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessExceptionImpl.java
+++ b/examples/applicationexception/src/main/java/org/superbiz/appexception/ThrowBusinessExceptionImpl.java
@@ -1,30 +1,30 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.appexception;
-
-import javax.ejb.Stateless;
-
-//START SNIPPET: code
-@Stateless
-public class ThrowBusinessExceptionImpl implements ThrowBusinessException {
-
-    public void throwValueRequiredException() throws BusinessException {
-        throw new ValueRequiredException();
-    }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.appexception;
+
+import javax.ejb.Stateless;
+
+//START SNIPPET: code
+@Stateless
+public class ThrowBusinessExceptionImpl implements ThrowBusinessException {
+
+    public void throwValueRequiredException() throws BusinessException {
+        throw new ValueRequiredException();
+    }
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationexception/src/main/java/org/superbiz/appexception/ValueRequiredException.java
----------------------------------------------------------------------
diff --git a/examples/applicationexception/src/main/java/org/superbiz/appexception/ValueRequiredException.java b/examples/applicationexception/src/main/java/org/superbiz/appexception/ValueRequiredException.java
index 3f68ae2..bb7b82b 100755
--- a/examples/applicationexception/src/main/java/org/superbiz/appexception/ValueRequiredException.java
+++ b/examples/applicationexception/src/main/java/org/superbiz/appexception/ValueRequiredException.java
@@ -1,24 +1,24 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.appexception;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ValueRequiredException extends BusinessException {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.appexception;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ValueRequiredException extends BusinessException {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java
----------------------------------------------------------------------
diff --git a/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java b/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java
index df0c5d7..da9756b 100755
--- a/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java
+++ b/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java
@@ -1,61 +1,61 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.appexception;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-// TODO This test case does not actually show that the bean was not destroyed.  The effect of @ApplicationException is not demonstrated
-// Maybe have two methods that throw runtime exceptions and compare the behavior of both
-// TODO Remote the business interface and show only POJO usage
-public class ThrowBusinessExceptionImplTest {
-
-    //START SNIPPET: setup
-    private InitialContext initialContext;
-
-    @Before
-    public void setUp() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-
-        initialContext = new InitialContext(properties);
-    }
-    //END SNIPPET: setup	
-
-    /**
-     * Lookup the Counter bean via its remote home interface
-     *
-     * @throws Exception
-     */
-    //START SNIPPET: remote
-    @Test(expected = ValueRequiredException.class)
-    public void testCounterViaRemoteInterface() throws Exception {
-        Object object = initialContext.lookup("ThrowBusinessExceptionImplRemote");
-
-        Assert.assertNotNull(object);
-        Assert.assertTrue(object instanceof ThrowBusinessException);
-        ThrowBusinessException bean = (ThrowBusinessException) object;
-        bean.throwValueRequiredException();
-    }
-    //END SNIPPET: remote
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.appexception;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Properties;
+
+// TODO This test case does not actually show that the bean was not destroyed.  The effect of @ApplicationException is not demonstrated
+// Maybe have two methods that throw runtime exceptions and compare the behavior of both
+// TODO Remote the business interface and show only POJO usage
+public class ThrowBusinessExceptionImplTest {
+
+    //START SNIPPET: setup
+    private InitialContext initialContext;
+
+    @Before
+    public void setUp() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
+
+        initialContext = new InitialContext(properties);
+    }
+    //END SNIPPET: setup	
+
+    /**
+     * Lookup the Counter bean via its remote home interface
+     *
+     * @throws Exception
+     */
+    //START SNIPPET: remote
+    @Test(expected = ValueRequiredException.class)
+    public void testCounterViaRemoteInterface() throws Exception {
+        Object object = initialContext.lookup("ThrowBusinessExceptionImplRemote");
+
+        Assert.assertNotNull(object);
+        Assert.assertTrue(object instanceof ThrowBusinessException);
+        ThrowBusinessException bean = (ThrowBusinessException) object;
+        bean.throwValueRequiredException();
+    }
+    //END SNIPPET: remote
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/arquillian-jpa/README.md
----------------------------------------------------------------------
diff --git a/examples/arquillian-jpa/README.md b/examples/arquillian-jpa/README.md
index 1bc2e9f..d318839 100644
--- a/examples/arquillian-jpa/README.md
+++ b/examples/arquillian-jpa/README.md
@@ -1,169 +1,169 @@
-Title: Arquillian Persistence Extension
-
-A sample showing how to use TomEE, Arquillian and its Persistence Extension.
-
-Note that it doesn't work with embedded containers (openejb, tomee-embedded)
-if you don't use workarounds like https://github.com/rmannibucau/persistence-with-openejb-and-arquillian
-(see src/test/resources folder).
-
-# Running (output)
-
-    -------------------------------------------------------
-     T E S T S
-    -------------------------------------------------------
-    Running org.superbiz.arquillian.test.persistence.PersistenceTest
-    oct. 01, 2014 6:30:23 PM org.apache.openejb.arquillian.common.Setup findHome
-    INFOS: Unable to find home in: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote
-    oct. 01, 2014 6:30:23 PM org.apache.openejb.arquillian.common.MavenCache getArtifact
-    INFOS: Downloading org.apache.openejb:apache-tomee:7.0.0-SNAPSHOT:zip:webprofile please wait...
-    oct. 01, 2014 6:30:23 PM org.apache.openejb.arquillian.common.Zips unzip
-    INFOS: Extracting '/home/rmannibucau/.m2/repository/org/apache/openejb/apache-tomee/7.0.0-SNAPSHOT/apache-tomee-7.0.0-SNAPSHOT-webprofile.zip' to '/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote'
-    oct. 01, 2014 6:30:24 PM org.apache.tomee.arquillian.remote.RemoteTomEEContainer configure
-    INFOS: Downloaded container to: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT
-    INFOS - Server version: Apache Tomcat/8.0.14
-    INFOS - Server built:   Sep 24 2014 09:01:51
-    INFOS - Server number:  8.0.14.0
-    INFOS - OS Name:        Linux
-    INFOS - OS Version:     3.13.0-35-generic
-    INFOS - Architecture:   amd64
-    INFOS - JVM Version:    1.7.0_67-b01
-    INFOS - JVM Vendor:     Oracle Corporation
-    INFOS - The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib
-    INFOS - Initializing ProtocolHandler ["http-nio-52256"]
-    INFOS - Using a shared selector for servlet write/read
-    INFOS - Initializing ProtocolHandler ["ajp-nio-40071"]
-    INFOS - Using a shared selector for servlet write/read
-    INFOS - Using 'openejb.jdbc.datasource-creator=org.apache.tomee.jdbc.TomEEDataSourceCreator'
-    INFOS - ********************************************************************************
-    INFOS - OpenEJB http://tomee.apache.org/
-    INFOS - Startup: Wed Oct 01 18:30:26 CEST 2014
-    INFOS - Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
-    INFOS - Version: 7.0.0-SNAPSHOT
-    INFOS - Build date: 20141001
-    INFOS - Build time: 04:53
-    INFOS - ********************************************************************************
-    INFOS - openejb.home = /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT
-    INFOS - openejb.base = /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT
-    INFOS - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@13158bbd
-    INFOS - Succeeded in installing singleton service
-    INFOS - openejb configuration file is '/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT/conf/tomee.xml'
-    INFOS - Configuring Service(id=Tomcat Security Service, type=SecurityService, provider-id=Tomcat Security Service)
-    INFOS - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    INFOS - Configuring Service(id=demoDataSource, type=Resource, provider-id=Default JDBC Database)
-    INFOS - Using 'openejb.system.apps=true'
-    INFOS - Configuring enterprise application: openejb
-    INFOS - Using openejb.deploymentId.format '{ejbName}'
-    INFOS - Auto-deploying ejb openejb/Deployer: EjbDeployment(deployment-id=openejb/Deployer)
-    INFOS - Auto-deploying ejb openejb/ConfigurationInfo: EjbDeployment(deployment-id=openejb/ConfigurationInfo)
-    INFOS - Auto-deploying ejb MEJB: EjbDeployment(deployment-id=MEJB)
-    INFOS - Configuring Service(id=Default Stateless Container, type=Container, provider-id=Default Stateless Container)
-    INFOS - Auto-creating a container for bean openejb/Deployer: Container(type=STATELESS, id=Default Stateless Container)
-    INFOS - Enterprise application "openejb" loaded.
-    INFOS - Creating TransactionManager(id=Default Transaction Manager)
-    INFOS - Creating SecurityService(id=Tomcat Security Service)
-    INFOS - Creating Resource(id=demoDataSource)
-    INFOS - Disabling testOnBorrow since no validation query is provided
-    INFOS - Creating Container(id=Default Stateless Container)
-    INFOS - Not creating another application classloader for openejb
-    INFOS - Assembling app: openejb
-    INFOS - Using 'openejb.jndiname.format={deploymentId}{interfaceType.openejbLegacyName}'
-    INFOS - Jndi(name=openejb/DeployerBusinessRemote) --> Ejb(deployment-id=openejb/Deployer)
-    INFOS - Jndi(name=global/openejb/openejb/Deployer!org.apache.openejb.assembler.Deployer) --> Ejb(deployment-id=openejb/Deployer)
-    INFOS - Jndi(name=global/openejb/openejb/Deployer) --> Ejb(deployment-id=openejb/Deployer)
-    INFOS - Jndi(name=openejb/ConfigurationInfoBusinessRemote) --> Ejb(deployment-id=openejb/ConfigurationInfo)
-    INFOS - Jndi(name=global/openejb/openejb/ConfigurationInfo!org.apache.openejb.assembler.classic.cmd.ConfigurationInfo) --> Ejb(deployment-id=openejb/ConfigurationInfo)
-    INFOS - Jndi(name=global/openejb/openejb/ConfigurationInfo) --> Ejb(deployment-id=openejb/ConfigurationInfo)
-    INFOS - Jndi(name=MEJB) --> Ejb(deployment-id=MEJB)
-    INFOS - Jndi(name=global/openejb/MEJB!javax.management.j2ee.ManagementHome) --> Ejb(deployment-id=MEJB)
-    INFOS - Jndi(name=global/openejb/MEJB) --> Ejb(deployment-id=MEJB)
-    INFOS - Created Ejb(deployment-id=openejb/Deployer, ejb-name=openejb/Deployer, container=Default Stateless Container)
-    INFOS - Created Ejb(deployment-id=MEJB, ejb-name=MEJB, container=Default Stateless Container)
-    INFOS - Created Ejb(deployment-id=openejb/ConfigurationInfo, ejb-name=openejb/ConfigurationInfo, container=Default Stateless Container)
-    INFOS - Started Ejb(deployment-id=openejb/Deployer, ejb-name=openejb/Deployer, container=Default Stateless Container)
-    INFOS - Started Ejb(deployment-id=MEJB, ejb-name=MEJB, container=Default Stateless Container)
-    INFOS - Started Ejb(deployment-id=openejb/ConfigurationInfo, ejb-name=openejb/ConfigurationInfo, container=Default Stateless Container)
-    INFOS - Deployed MBean(openejb.user.mbeans:application=openejb,group=org.apache.openejb.assembler.monitoring,name=JMXDeployer)
-    INFOS - Deployed Application(path=openejb)
-    INFOS - Creating ServerService(id=cxf-rs)
-    INFOS -   ** Bound Services **
-    INFOS -   NAME                 IP              PORT  
-    INFOS - -------
-    INFOS - Ready!
-    INFOS - Initialization processed in 2589 ms
-    INFOS - Importing a Tomcat Resource with id 'UserDatabase' of type 'org.apache.catalina.UserDatabase'.
-    INFOS - Creating Resource(id=UserDatabase)
-    INFOS - Démarrage du service Catalina
-    INFOS - Starting Servlet Engine: Apache Tomcat (TomEE)/8.0.14 (7.0.0-SNAPSHOT)
-    INFOS - Starting ProtocolHandler ["http-nio-52256"]
-    INFOS - Starting ProtocolHandler ["ajp-nio-40071"]
-    INFOS - Server startup in 140 ms
-    oct. 01, 2014 6:30:30 PM org.apache.openejb.client.EventLogger log
-    INFOS: RemoteInitialContextCreated{providerUri=http://localhost:52256/tomee/ejb}
-    INFOS - Extracting jar: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest.war
-    INFOS - Extracted path: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest
-    INFOS - using default host: localhost
-    INFOS - ------------------------- localhost -> /UserPersistenceTest
-    INFOS - Using 'openejb.session.manager=org.apache.tomee.catalina.session.QuickSessionManager'
-    INFOS - Configuring enterprise application: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest
-    INFOS - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-    INFOS - Auto-creating a container for bean UserPersistenceTest_org.superbiz.arquillian.test.persistence.PersistenceTest: Container(type=MANAGED, id=Default Managed Container)
-    INFOS - Creating Container(id=Default Managed Container)
-    INFOS - Using directory /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT/temp for stateful session passivation
-    INFOS - Configuring PersistenceUnit(name=demoApplicationPU)
-    INFOS - Auto-creating a Resource with id 'demoDataSourceNonJta' of type 'DataSource for 'demoApplicationPU'.
-    INFOS - Configuring Service(id=demoDataSourceNonJta, type=Resource, provider-id=demoDataSource)
-    INFOS - Creating Resource(id=demoDataSourceNonJta)
-    INFOS - Disabling testOnBorrow since no validation query is provided
-    INFOS - Adjusting PersistenceUnit demoApplicationPU <non-jta-data-source> to Resource ID 'demoDataSourceNonJta' from 'null'
-    INFOS - Enterprise application "/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest" loaded.
-    INFOS - Assembling app: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest
-    INFOS - OpenJPA dynamically loaded a validation provider.
-    INFOS - Starting OpenJPA 2.4.0-nonfinal-1598334
-    INFOS - Using dictionary class "org.apache.openjpa.jdbc.sql.HSQLDictionary" (HSQL Database Engine 2.3.2 ,HSQL Database Engine Driver 2.3.2).
-    INFOS - Connected to HSQL Database Engine version 2.2 using JDBC driver HSQL Database Engine Driver version 2.3.2. 
-    INFOS - SELECT SEQUENCE_SCHEMA, SEQUENCE_NAME FROM INFORMATION_SCHEMA.SYSTEM_SEQUENCES --> 0ms
-    INFOS - CREATE TABLE User (id BIGINT NOT NULL, name VARCHAR(255), PRIMARY KEY (id)) --> 0ms
-    INFOS - PersistenceUnit(name=demoApplicationPU, provider=org.apache.openjpa.persistence.PersistenceProviderImpl) - provider time 1075ms
-    INFOS - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@13158bbd
-    INFOS - OpenWebBeans Container is starting...
-    INFOS - Adding OpenWebBeansPlugin : [CdiPlugin]
-    INFOS - Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin]
-    INFOS - All injection points were validated successfully.
-    INFOS - OpenWebBeans Container has started, it took 224 ms.
-    INFOS - Deployed Application(path=/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest)
-    INFOS - At least one JAR was scanned for TLDs yet contained no TLDs. Enable debug logging for this logger for a complete list of JARs that were scanned but no TLDs were found in them. Skipping unneeded JARs during scanning can improve startup time and JSP compilation time.
-    AVERTISSEMENT - Potential problem found: The configured data type factory 'class org.dbunit.dataset.datatype.DefaultDataTypeFactory' might cause problems with the current database 'HSQL Database Engine' (e.g. some datatypes may not be supported properly). In rare cases you might see this message because the list of supported database products is incomplete (list=[derby]). If so please request a java-class update via the forums.If you are using your own IDataTypeFactory extending DefaultDataTypeFactory, ensure that you override getValidDbProducts() to specify the supported database products.
-    INFOS - insert into USER (ID, NAME) values (1, TomEE) --> 1ms
-    INFOS - insert into USER (ID, NAME) values (1, 2)TomEE,Old) --> 0ms
-    INFOS - SELECT COUNT(t0.id) FROM User t0 --> 0ms
-    INFOS - SELECT t0.name FROM User t0 WHERE t0.id = 2 --> 0ms
-    INFOS - UPDATE User SET name = OpenEJB WHERE id = 2 --> 1ms
-    INFOS - select ID, NAME from USER order by ID --> 0ms
-    INFOS - select ID, NAME from USER order by ID --> 0ms
-    INFOS - select ID, NAME from USER order by ID --> 0ms
-    INFOS - select ID, NAME from USER order by ID --> 0ms
-    INFOS - delete from USER --> 0ms
-    oct. 01, 2014 6:30:34 PM org.apache.openejb.client.EventLogger log
-    INFOS: RemoteInitialContextCreated{providerUri=http://localhost:52256/tomee/ejb}
-    INFOS - Undeploying app: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest
-    oct. 01, 2014 6:30:34 PM org.apache.openejb.arquillian.common.TomEEContainer undeploy
-    INFOS: cleaning /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.242 sec
-    INFOS - A valid shutdown command was received via the shutdown port. Stopping the Server instance.
-    INFOS - Pausing ProtocolHandler ["http-nio-52256"]
-    INFOS - Pausing ProtocolHandler ["ajp-nio-40071"]
-    INFOS - Arrêt du service Catalina
-    INFOS - Stopping ProtocolHandler ["http-nio-52256"]
-    INFOS - Stopping ProtocolHandler ["ajp-nio-40071"]
-    INFOS - Stopping server services
-    INFOS - Undeploying app: openejb
-    INFOS - Closing DataSource: demoDataSource
-    INFOS - Closing DataSource: demoDataSourceNonJta
-    INFOS - Destroying ProtocolHandler ["http-nio-52256"]
-    INFOS - Destroying ProtocolHandler ["ajp-nio-40071"]
-    
-    Results :
-    
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-
+Title: Arquillian Persistence Extension
+
+A sample showing how to use TomEE, Arquillian and its Persistence Extension.
+
+Note that it doesn't work with embedded containers (openejb, tomee-embedded)
+if you don't use workarounds like https://github.com/rmannibucau/persistence-with-openejb-and-arquillian
+(see src/test/resources folder).
+
+# Running (output)
+
+    -------------------------------------------------------
+     T E S T S
+    -------------------------------------------------------
+    Running org.superbiz.arquillian.test.persistence.PersistenceTest
+    oct. 01, 2014 6:30:23 PM org.apache.openejb.arquillian.common.Setup findHome
+    INFOS: Unable to find home in: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote
+    oct. 01, 2014 6:30:23 PM org.apache.openejb.arquillian.common.MavenCache getArtifact
+    INFOS: Downloading org.apache.openejb:apache-tomee:7.0.0-SNAPSHOT:zip:webprofile please wait...
+    oct. 01, 2014 6:30:23 PM org.apache.openejb.arquillian.common.Zips unzip
+    INFOS: Extracting '/home/rmannibucau/.m2/repository/org/apache/openejb/apache-tomee/7.0.0-SNAPSHOT/apache-tomee-7.0.0-SNAPSHOT-webprofile.zip' to '/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote'
+    oct. 01, 2014 6:30:24 PM org.apache.tomee.arquillian.remote.RemoteTomEEContainer configure
+    INFOS: Downloaded container to: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT
+    INFOS - Server version: Apache Tomcat/8.0.14
+    INFOS - Server built:   Sep 24 2014 09:01:51
+    INFOS - Server number:  8.0.14.0
+    INFOS - OS Name:        Linux
+    INFOS - OS Version:     3.13.0-35-generic
+    INFOS - Architecture:   amd64
+    INFOS - JVM Version:    1.7.0_67-b01
+    INFOS - JVM Vendor:     Oracle Corporation
+    INFOS - The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib
+    INFOS - Initializing ProtocolHandler ["http-nio-52256"]
+    INFOS - Using a shared selector for servlet write/read
+    INFOS - Initializing ProtocolHandler ["ajp-nio-40071"]
+    INFOS - Using a shared selector for servlet write/read
+    INFOS - Using 'openejb.jdbc.datasource-creator=org.apache.tomee.jdbc.TomEEDataSourceCreator'
+    INFOS - ********************************************************************************
+    INFOS - OpenEJB http://tomee.apache.org/
+    INFOS - Startup: Wed Oct 01 18:30:26 CEST 2014
+    INFOS - Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
+    INFOS - Version: 7.0.0-SNAPSHOT
+    INFOS - Build date: 20141001
+    INFOS - Build time: 04:53
+    INFOS - ********************************************************************************
+    INFOS - openejb.home = /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT
+    INFOS - openejb.base = /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT
+    INFOS - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@13158bbd
+    INFOS - Succeeded in installing singleton service
+    INFOS - openejb configuration file is '/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT/conf/tomee.xml'
+    INFOS - Configuring Service(id=Tomcat Security Service, type=SecurityService, provider-id=Tomcat Security Service)
+    INFOS - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    INFOS - Configuring Service(id=demoDataSource, type=Resource, provider-id=Default JDBC Database)
+    INFOS - Using 'openejb.system.apps=true'
+    INFOS - Configuring enterprise application: openejb
+    INFOS - Using openejb.deploymentId.format '{ejbName}'
+    INFOS - Auto-deploying ejb openejb/Deployer: EjbDeployment(deployment-id=openejb/Deployer)
+    INFOS - Auto-deploying ejb openejb/ConfigurationInfo: EjbDeployment(deployment-id=openejb/ConfigurationInfo)
+    INFOS - Auto-deploying ejb MEJB: EjbDeployment(deployment-id=MEJB)
+    INFOS - Configuring Service(id=Default Stateless Container, type=Container, provider-id=Default Stateless Container)
+    INFOS - Auto-creating a container for bean openejb/Deployer: Container(type=STATELESS, id=Default Stateless Container)
+    INFOS - Enterprise application "openejb" loaded.
+    INFOS - Creating TransactionManager(id=Default Transaction Manager)
+    INFOS - Creating SecurityService(id=Tomcat Security Service)
+    INFOS - Creating Resource(id=demoDataSource)
+    INFOS - Disabling testOnBorrow since no validation query is provided
+    INFOS - Creating Container(id=Default Stateless Container)
+    INFOS - Not creating another application classloader for openejb
+    INFOS - Assembling app: openejb
+    INFOS - Using 'openejb.jndiname.format={deploymentId}{interfaceType.openejbLegacyName}'
+    INFOS - Jndi(name=openejb/DeployerBusinessRemote) --> Ejb(deployment-id=openejb/Deployer)
+    INFOS - Jndi(name=global/openejb/openejb/Deployer!org.apache.openejb.assembler.Deployer) --> Ejb(deployment-id=openejb/Deployer)
+    INFOS - Jndi(name=global/openejb/openejb/Deployer) --> Ejb(deployment-id=openejb/Deployer)
+    INFOS - Jndi(name=openejb/ConfigurationInfoBusinessRemote) --> Ejb(deployment-id=openejb/ConfigurationInfo)
+    INFOS - Jndi(name=global/openejb/openejb/ConfigurationInfo!org.apache.openejb.assembler.classic.cmd.ConfigurationInfo) --> Ejb(deployment-id=openejb/ConfigurationInfo)
+    INFOS - Jndi(name=global/openejb/openejb/ConfigurationInfo) --> Ejb(deployment-id=openejb/ConfigurationInfo)
+    INFOS - Jndi(name=MEJB) --> Ejb(deployment-id=MEJB)
+    INFOS - Jndi(name=global/openejb/MEJB!javax.management.j2ee.ManagementHome) --> Ejb(deployment-id=MEJB)
+    INFOS - Jndi(name=global/openejb/MEJB) --> Ejb(deployment-id=MEJB)
+    INFOS - Created Ejb(deployment-id=openejb/Deployer, ejb-name=openejb/Deployer, container=Default Stateless Container)
+    INFOS - Created Ejb(deployment-id=MEJB, ejb-name=MEJB, container=Default Stateless Container)
+    INFOS - Created Ejb(deployment-id=openejb/ConfigurationInfo, ejb-name=openejb/ConfigurationInfo, container=Default Stateless Container)
+    INFOS - Started Ejb(deployment-id=openejb/Deployer, ejb-name=openejb/Deployer, container=Default Stateless Container)
+    INFOS - Started Ejb(deployment-id=MEJB, ejb-name=MEJB, container=Default Stateless Container)
+    INFOS - Started Ejb(deployment-id=openejb/ConfigurationInfo, ejb-name=openejb/ConfigurationInfo, container=Default Stateless Container)
+    INFOS - Deployed MBean(openejb.user.mbeans:application=openejb,group=org.apache.openejb.assembler.monitoring,name=JMXDeployer)
+    INFOS - Deployed Application(path=openejb)
+    INFOS - Creating ServerService(id=cxf-rs)
+    INFOS -   ** Bound Services **
+    INFOS -   NAME                 IP              PORT  
+    INFOS - -------
+    INFOS - Ready!
+    INFOS - Initialization processed in 2589 ms
+    INFOS - Importing a Tomcat Resource with id 'UserDatabase' of type 'org.apache.catalina.UserDatabase'.
+    INFOS - Creating Resource(id=UserDatabase)
+    INFOS - Démarrage du service Catalina
+    INFOS - Starting Servlet Engine: Apache Tomcat (TomEE)/8.0.14 (7.0.0-SNAPSHOT)
+    INFOS - Starting ProtocolHandler ["http-nio-52256"]
+    INFOS - Starting ProtocolHandler ["ajp-nio-40071"]
+    INFOS - Server startup in 140 ms
+    oct. 01, 2014 6:30:30 PM org.apache.openejb.client.EventLogger log
+    INFOS: RemoteInitialContextCreated{providerUri=http://localhost:52256/tomee/ejb}
+    INFOS - Extracting jar: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest.war
+    INFOS - Extracted path: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest
+    INFOS - using default host: localhost
+    INFOS - ------------------------- localhost -> /UserPersistenceTest
+    INFOS - Using 'openejb.session.manager=org.apache.tomee.catalina.session.QuickSessionManager'
+    INFOS - Configuring enterprise application: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest
+    INFOS - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+    INFOS - Auto-creating a container for bean UserPersistenceTest_org.superbiz.arquillian.test.persistence.PersistenceTest: Container(type=MANAGED, id=Default Managed Container)
+    INFOS - Creating Container(id=Default Managed Container)
+    INFOS - Using directory /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/apache-tomee-remote/apache-tomee-webprofile-7.0.0-SNAPSHOT/temp for stateful session passivation
+    INFOS - Configuring PersistenceUnit(name=demoApplicationPU)
+    INFOS - Auto-creating a Resource with id 'demoDataSourceNonJta' of type 'DataSource for 'demoApplicationPU'.
+    INFOS - Configuring Service(id=demoDataSourceNonJta, type=Resource, provider-id=demoDataSource)
+    INFOS - Creating Resource(id=demoDataSourceNonJta)
+    INFOS - Disabling testOnBorrow since no validation query is provided
+    INFOS - Adjusting PersistenceUnit demoApplicationPU <non-jta-data-source> to Resource ID 'demoDataSourceNonJta' from 'null'
+    INFOS - Enterprise application "/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest" loaded.
+    INFOS - Assembling app: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest
+    INFOS - OpenJPA dynamically loaded a validation provider.
+    INFOS - Starting OpenJPA 2.4.0-nonfinal-1598334
+    INFOS - Using dictionary class "org.apache.openjpa.jdbc.sql.HSQLDictionary" (HSQL Database Engine 2.3.2 ,HSQL Database Engine Driver 2.3.2).
+    INFOS - Connected to HSQL Database Engine version 2.2 using JDBC driver HSQL Database Engine Driver version 2.3.2. 
+    INFOS - SELECT SEQUENCE_SCHEMA, SEQUENCE_NAME FROM INFORMATION_SCHEMA.SYSTEM_SEQUENCES --> 0ms
+    INFOS - CREATE TABLE User (id BIGINT NOT NULL, name VARCHAR(255), PRIMARY KEY (id)) --> 0ms
+    INFOS - PersistenceUnit(name=demoApplicationPU, provider=org.apache.openjpa.persistence.PersistenceProviderImpl) - provider time 1075ms
+    INFOS - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@13158bbd
+    INFOS - OpenWebBeans Container is starting...
+    INFOS - Adding OpenWebBeansPlugin : [CdiPlugin]
+    INFOS - Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin]
+    INFOS - All injection points were validated successfully.
+    INFOS - OpenWebBeans Container has started, it took 224 ms.
+    INFOS - Deployed Application(path=/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest)
+    INFOS - At least one JAR was scanned for TLDs yet contained no TLDs. Enable debug logging for this logger for a complete list of JARs that were scanned but no TLDs were found in them. Skipping unneeded JARs during scanning can improve startup time and JSP compilation time.
+    AVERTISSEMENT - Potential problem found: The configured data type factory 'class org.dbunit.dataset.datatype.DefaultDataTypeFactory' might cause problems with the current database 'HSQL Database Engine' (e.g. some datatypes may not be supported properly). In rare cases you might see this message because the list of supported database products is incomplete (list=[derby]). If so please request a java-class update via the forums.If you are using your own IDataTypeFactory extending DefaultDataTypeFactory, ensure that you override getValidDbProducts() to specify the supported database products.
+    INFOS - insert into USER (ID, NAME) values (1, TomEE) --> 1ms
+    INFOS - insert into USER (ID, NAME) values (1, 2)TomEE,Old) --> 0ms
+    INFOS - SELECT COUNT(t0.id) FROM User t0 --> 0ms
+    INFOS - SELECT t0.name FROM User t0 WHERE t0.id = 2 --> 0ms
+    INFOS - UPDATE User SET name = OpenEJB WHERE id = 2 --> 1ms
+    INFOS - select ID, NAME from USER order by ID --> 0ms
+    INFOS - select ID, NAME from USER order by ID --> 0ms
+    INFOS - select ID, NAME from USER order by ID --> 0ms
+    INFOS - select ID, NAME from USER order by ID --> 0ms
+    INFOS - delete from USER --> 0ms
+    oct. 01, 2014 6:30:34 PM org.apache.openejb.client.EventLogger log
+    INFOS: RemoteInitialContextCreated{providerUri=http://localhost:52256/tomee/ejb}
+    INFOS - Undeploying app: /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest
+    oct. 01, 2014 6:30:34 PM org.apache.openejb.arquillian.common.TomEEContainer undeploy
+    INFOS: cleaning /home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.242 sec
+    INFOS - A valid shutdown command was received via the shutdown port. Stopping the Server instance.
+    INFOS - Pausing ProtocolHandler ["http-nio-52256"]
+    INFOS - Pausing ProtocolHandler ["ajp-nio-40071"]
+    INFOS - Arrêt du service Catalina
+    INFOS - Stopping ProtocolHandler ["http-nio-52256"]
+    INFOS - Stopping ProtocolHandler ["ajp-nio-40071"]
+    INFOS - Stopping server services
+    INFOS - Undeploying app: openejb
+    INFOS - Closing DataSource: demoDataSource
+    INFOS - Closing DataSource: demoDataSourceNonJta
+    INFOS - Destroying ProtocolHandler ["http-nio-52256"]
+    INFOS - Destroying ProtocolHandler ["ajp-nio-40071"]
+    
+    Results :
+    
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/arquillian-jpa/src/main/java/org/superbiz/arquillian/persistence/User.java
----------------------------------------------------------------------
diff --git a/examples/arquillian-jpa/src/main/java/org/superbiz/arquillian/persistence/User.java b/examples/arquillian-jpa/src/main/java/org/superbiz/arquillian/persistence/User.java
index 65c0c67..a51226f 100644
--- a/examples/arquillian-jpa/src/main/java/org/superbiz/arquillian/persistence/User.java
+++ b/examples/arquillian-jpa/src/main/java/org/superbiz/arquillian/persistence/User.java
@@ -1,43 +1,43 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.arquillian.persistence;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class User {
-    @Id
-    private long id;
-    private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(final long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.arquillian.persistence;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+    @Id
+    private long id;
+    private String name;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java
----------------------------------------------------------------------
diff --git a/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java b/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java
index 4b68131..2cb01e3 100644
--- a/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java
+++ b/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java
@@ -1,63 +1,63 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.arquillian.test.persistence;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.persistence.ShouldMatchDataSet;
-import org.jboss.arquillian.persistence.UsingDataSet;
-import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
-import org.jboss.arquillian.transaction.api.annotation.Transactional;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.superbiz.arquillian.persistence.User;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(Arquillian.class)
-public class PersistenceTest {
-    @Deployment
-    public static Archive<?> createDeploymentPackage() {
-        return ShrinkWrap.create(WebArchive.class, "UserPersistenceTest.war")
-                .addPackage(User.class.getPackage())
-                .addAsManifestResource(new ClassLoaderAsset("META-INF/persistence.xml"), "persistence.xml");
-    }
-
-    @PersistenceContext
-    private EntityManager em;
-
-    @Test
-    @Transactional(TransactionMode.COMMIT) // default with persistence extension
-    @UsingDataSet("datasets/users.yml")
-    @ShouldMatchDataSet("datasets/expected-users.yml")
-    public void seriouslyYouAlreadyForgotOpenEJB_questionMark() throws Exception {
-        assertEquals(2, em.createQuery("select count(e) from User e", Number.class).getSingleResult().intValue());
-
-        final User user = em.find(User.class, 2L);
-        assertNotNull(user);
-
-        user.setName("OpenEJB"); // @Transactional(TransactionMode.COMMIT) will commit it and datasets/expected-users.yml will check it
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.arquillian.test.persistence;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.persistence.ShouldMatchDataSet;
+import org.jboss.arquillian.persistence.UsingDataSet;
+import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
+import org.jboss.arquillian.transaction.api.annotation.Transactional;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.superbiz.arquillian.persistence.User;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(Arquillian.class)
+public class PersistenceTest {
+    @Deployment
+    public static Archive<?> createDeploymentPackage() {
+        return ShrinkWrap.create(WebArchive.class, "UserPersistenceTest.war")
+                .addPackage(User.class.getPackage())
+                .addAsManifestResource(new ClassLoaderAsset("META-INF/persistence.xml"), "persistence.xml");
+    }
+
+    @PersistenceContext
+    private EntityManager em;
+
+    @Test
+    @Transactional(TransactionMode.COMMIT) // default with persistence extension
+    @UsingDataSet("datasets/users.yml")
+    @ShouldMatchDataSet("datasets/expected-users.yml")
+    public void seriouslyYouAlreadyForgotOpenEJB_questionMark() throws Exception {
+        assertEquals(2, em.createQuery("select count(e) from User e", Number.class).getSingleResult().intValue());
+
+        final User user = em.find(User.class, 2L);
+        assertNotNull(user);
+
+        user.setName("OpenEJB"); // @Transactional(TransactionMode.COMMIT) will commit it and datasets/expected-users.yml will check it
+    }
+}


[05/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java
index f3ab625..d79e272 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java
@@ -1,92 +1,92 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.ejb.EJB;
-import javax.ejb.EJBAccessException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.security.Principal;
-
-public class SecureServlet extends HttpServlet {
-
-    @EJB
-    private SecureEJBLocal secureEJBLocal;
-
-    protected void doGet(final HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.setContentType("text/plain");
-        final ServletOutputStream out = response.getOutputStream();
-
-        out.println("Servlet");
-        Principal principal = request.getUserPrincipal();
-        if (principal != null) {
-            out.println("Servlet.getUserPrincipal()=" + principal + " [" + principal.getName() + "]");
-        } else {
-            out.println("Servlet.getUserPrincipal()=<null>");
-        }
-        out.println("Servlet.isCallerInRole(\"user\")=" + request.isUserInRole("user"));
-        out.println("Servlet.isCallerInRole(\"manager\")=" + request.isUserInRole("manager"));
-        out.println("Servlet.isCallerInRole(\"fake\")=" + request.isUserInRole("fake"));
-        out.println();
-
-        out.println("@EJB=" + secureEJBLocal);
-        if (secureEJBLocal != null) {
-            principal = secureEJBLocal.getCallerPrincipal();
-            if (principal != null) {
-                out.println("@EJB.getCallerPrincipal()=" + principal + " [" + principal.getName() + "]");
-            } else {
-                out.println("@EJB.getCallerPrincipal()=<null>");
-            }
-            out.println("@EJB.isCallerInRole(\"user\")=" + secureEJBLocal.isCallerInRole("user"));
-            out.println("@EJB.isCallerInRole(\"manager\")=" + secureEJBLocal.isCallerInRole("manager"));
-            out.println("@EJB.isCallerInRole(\"fake\")=" + secureEJBLocal.isCallerInRole("fake"));
-
-            try {
-                secureEJBLocal.allowUserMethod();
-                out.println("@EJB.allowUserMethod() ALLOWED");
-            } catch (EJBAccessException e) {
-                out.println("@EJB.allowUserMethod() DENIED");
-            }
-
-            try {
-                secureEJBLocal.allowManagerMethod();
-                out.println("@EJB.allowManagerMethod() ALLOWED");
-            } catch (EJBAccessException e) {
-                out.println("@EJB.allowManagerMethod() DENIED");
-            }
-
-            try {
-                secureEJBLocal.allowFakeMethod();
-                out.println("@EJB.allowFakeMethod() ALLOWED");
-            } catch (final EJBAccessException e) {
-                out.println("@EJB.allowFakeMethod() DENIED");
-            }
-
-            try {
-                secureEJBLocal.denyAllMethod();
-                out.println("@EJB.denyAllMethod() ALLOWED");
-            } catch (EJBAccessException e) {
-                out.println("@EJB.denyAllMethod() DENIED");
-            }
-        }
-        out.println();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.ejb.EJB;
+import javax.ejb.EJBAccessException;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.security.Principal;
+
+public class SecureServlet extends HttpServlet {
+
+    @EJB
+    private SecureEJBLocal secureEJBLocal;
+
+    protected void doGet(final HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/plain");
+        final ServletOutputStream out = response.getOutputStream();
+
+        out.println("Servlet");
+        Principal principal = request.getUserPrincipal();
+        if (principal != null) {
+            out.println("Servlet.getUserPrincipal()=" + principal + " [" + principal.getName() + "]");
+        } else {
+            out.println("Servlet.getUserPrincipal()=<null>");
+        }
+        out.println("Servlet.isCallerInRole(\"user\")=" + request.isUserInRole("user"));
+        out.println("Servlet.isCallerInRole(\"manager\")=" + request.isUserInRole("manager"));
+        out.println("Servlet.isCallerInRole(\"fake\")=" + request.isUserInRole("fake"));
+        out.println();
+
+        out.println("@EJB=" + secureEJBLocal);
+        if (secureEJBLocal != null) {
+            principal = secureEJBLocal.getCallerPrincipal();
+            if (principal != null) {
+                out.println("@EJB.getCallerPrincipal()=" + principal + " [" + principal.getName() + "]");
+            } else {
+                out.println("@EJB.getCallerPrincipal()=<null>");
+            }
+            out.println("@EJB.isCallerInRole(\"user\")=" + secureEJBLocal.isCallerInRole("user"));
+            out.println("@EJB.isCallerInRole(\"manager\")=" + secureEJBLocal.isCallerInRole("manager"));
+            out.println("@EJB.isCallerInRole(\"fake\")=" + secureEJBLocal.isCallerInRole("fake"));
+
+            try {
+                secureEJBLocal.allowUserMethod();
+                out.println("@EJB.allowUserMethod() ALLOWED");
+            } catch (EJBAccessException e) {
+                out.println("@EJB.allowUserMethod() DENIED");
+            }
+
+            try {
+                secureEJBLocal.allowManagerMethod();
+                out.println("@EJB.allowManagerMethod() ALLOWED");
+            } catch (EJBAccessException e) {
+                out.println("@EJB.allowManagerMethod() DENIED");
+            }
+
+            try {
+                secureEJBLocal.allowFakeMethod();
+                out.println("@EJB.allowFakeMethod() ALLOWED");
+            } catch (final EJBAccessException e) {
+                out.println("@EJB.allowFakeMethod() DENIED");
+            }
+
+            try {
+                secureEJBLocal.denyAllMethod();
+                out.println("@EJB.denyAllMethod() ALLOWED");
+            } catch (EJBAccessException e) {
+                out.println("@EJB.denyAllMethod() DENIED");
+            }
+        }
+        out.println();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java
index c098ca8..533540c 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.handler.MessageContext;
-
-public class ServerHandler implements Handler {
-
-    public boolean handleMessage(MessageContext messageContext) {
-        WebserviceServlet.write("        ServerHandler handleMessage");
-        return true;
-    }
-
-    public void close(MessageContext messageContext) {
-        WebserviceServlet.write("        ServerHandler close");
-    }
-
-    public boolean handleFault(MessageContext messageContext) {
-        WebserviceServlet.write("        ServerHandler handleFault");
-        return true;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+
+public class ServerHandler implements Handler {
+
+    public boolean handleMessage(MessageContext messageContext) {
+        WebserviceServlet.write("        ServerHandler handleMessage");
+        return true;
+    }
+
+    public void close(MessageContext messageContext) {
+        WebserviceServlet.write("        ServerHandler close");
+    }
+
+    public boolean handleFault(MessageContext messageContext) {
+        WebserviceServlet.write("        ServerHandler handleFault");
+        return true;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java
index ea31abb..1ce9900 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java
@@ -1,79 +1,79 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.xml.ws.Service;
-import java.io.PrintStream;
-import java.net.URL;
-
-public class WebserviceClient {
-
-    /**
-     * Unfortunately, to run this example with CXF you need to have a HUGE class path.  This
-     * is just what is required to run CXF:
-     * <p/>
-     * jaxb-api-2.0.jar
-     * jaxb-impl-2.0.3.jar
-     * <p/>
-     * saaj-api-1.3.jar
-     * saaj-impl-1.3.jar
-     * <p/>
-     * <p/>
-     * cxf-api-2.0.2-incubator.jar
-     * cxf-common-utilities-2.0.2-incubator.jar
-     * cxf-rt-bindings-soap-2.0.2-incubator.jar
-     * cxf-rt-core-2.0.2-incubator.jar
-     * cxf-rt-databinding-jaxb-2.0.2-incubator.jar
-     * cxf-rt-frontend-jaxws-2.0.2-incubator.jar
-     * cxf-rt-frontend-simple-2.0.2-incubator.jar
-     * cxf-rt-transports-http-jetty-2.0.2-incubator.jar
-     * cxf-rt-transports-http-2.0.2-incubator.jar
-     * cxf-tools-common-2.0.2-incubator.jar
-     * <p/>
-     * geronimo-activation_1.1_spec-1.0.jar
-     * geronimo-annotation_1.0_spec-1.1.jar
-     * geronimo-ejb_3.0_spec-1.0.jar
-     * geronimo-jpa_3.0_spec-1.1.jar
-     * geronimo-servlet_2.5_spec-1.1.jar
-     * geronimo-stax-api_1.0_spec-1.0.jar
-     * jaxws-api-2.0.jar
-     * axis2-jws-api-1.3.jar
-     * <p/>
-     * wsdl4j-1.6.1.jar
-     * xml-resolver-1.2.jar
-     * XmlSchema-1.3.1.jar
-     */
-    public static void main(String[] args) throws Exception {
-        PrintStream out = System.out;
-
-        Service helloPojoService = Service.create(new URL("http://localhost:8080/ejb-examples/hello?wsdl"), null);
-        HelloPojo helloPojo = helloPojoService.getPort(HelloPojo.class);
-        out.println();
-        out.println("Pojo Webservice");
-        out.println("    helloPojo.hello(\"Bob\")=" + helloPojo.hello("Bob"));
-        out.println("    helloPojo.hello(null)=" + helloPojo.hello(null));
-        out.println();
-
-        Service helloEjbService = Service.create(new URL("http://localhost:8080/HelloEjbService?wsdl"), null);
-        HelloEjb helloEjb = helloEjbService.getPort(HelloEjb.class);
-        out.println();
-        out.println("EJB Webservice");
-        out.println("    helloEjb.hello(\"Bob\")=" + helloEjb.hello("Bob"));
-        out.println("    helloEjb.hello(null)=" + helloEjb.hello(null));
-        out.println();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.xml.ws.Service;
+import java.io.PrintStream;
+import java.net.URL;
+
+public class WebserviceClient {
+
+    /**
+     * Unfortunately, to run this example with CXF you need to have a HUGE class path.  This
+     * is just what is required to run CXF:
+     * <p/>
+     * jaxb-api-2.0.jar
+     * jaxb-impl-2.0.3.jar
+     * <p/>
+     * saaj-api-1.3.jar
+     * saaj-impl-1.3.jar
+     * <p/>
+     * <p/>
+     * cxf-api-2.0.2-incubator.jar
+     * cxf-common-utilities-2.0.2-incubator.jar
+     * cxf-rt-bindings-soap-2.0.2-incubator.jar
+     * cxf-rt-core-2.0.2-incubator.jar
+     * cxf-rt-databinding-jaxb-2.0.2-incubator.jar
+     * cxf-rt-frontend-jaxws-2.0.2-incubator.jar
+     * cxf-rt-frontend-simple-2.0.2-incubator.jar
+     * cxf-rt-transports-http-jetty-2.0.2-incubator.jar
+     * cxf-rt-transports-http-2.0.2-incubator.jar
+     * cxf-tools-common-2.0.2-incubator.jar
+     * <p/>
+     * geronimo-activation_1.1_spec-1.0.jar
+     * geronimo-annotation_1.0_spec-1.1.jar
+     * geronimo-ejb_3.0_spec-1.0.jar
+     * geronimo-jpa_3.0_spec-1.1.jar
+     * geronimo-servlet_2.5_spec-1.1.jar
+     * geronimo-stax-api_1.0_spec-1.0.jar
+     * jaxws-api-2.0.jar
+     * axis2-jws-api-1.3.jar
+     * <p/>
+     * wsdl4j-1.6.1.jar
+     * xml-resolver-1.2.jar
+     * XmlSchema-1.3.1.jar
+     */
+    public static void main(String[] args) throws Exception {
+        PrintStream out = System.out;
+
+        Service helloPojoService = Service.create(new URL("http://localhost:8080/ejb-examples/hello?wsdl"), null);
+        HelloPojo helloPojo = helloPojoService.getPort(HelloPojo.class);
+        out.println();
+        out.println("Pojo Webservice");
+        out.println("    helloPojo.hello(\"Bob\")=" + helloPojo.hello("Bob"));
+        out.println("    helloPojo.hello(null)=" + helloPojo.hello(null));
+        out.println();
+
+        Service helloEjbService = Service.create(new URL("http://localhost:8080/HelloEjbService?wsdl"), null);
+        HelloEjb helloEjb = helloEjbService.getPort(HelloEjb.class);
+        out.println();
+        out.println("EJB Webservice");
+        out.println("    helloEjb.hello(\"Bob\")=" + helloEjb.hello("Bob"));
+        out.println("    helloEjb.hello(null)=" + helloEjb.hello(null));
+        out.println();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceServlet.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceServlet.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceServlet.java
index 9eaeeab..0050725 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceServlet.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceServlet.java
@@ -1,69 +1,69 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.jws.HandlerChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.WebServiceRef;
-import java.io.IOException;
-
-public class WebserviceServlet extends HttpServlet {
-
-    @WebServiceRef
-    @HandlerChain(file = "client-handlers.xml")
-    private HelloPojo helloPojo;
-
-    @WebServiceRef
-    @HandlerChain(file = "client-handlers.xml")
-    private HelloEjb helloEjb;
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.setContentType("text/plain");
-        ServletOutputStream out = response.getOutputStream();
-
-        OUT = out;
-        try {
-            out.println("Pojo Webservice");
-            out.println("    helloPojo.hello(\"Bob\")=" + helloPojo.hello("Bob"));
-            out.println();
-            out.println("    helloPojo.hello(null)=" + helloPojo.hello(null));
-            out.println();
-            out.println("EJB Webservice");
-            out.println("    helloEjb.hello(\"Bob\")=" + helloEjb.hello("Bob"));
-            out.println();
-            out.println("    helloEjb.hello(null)=" + helloEjb.hello(null));
-            out.println();
-        } finally {
-            OUT = out;
-        }
-    }
-
-    private static ServletOutputStream OUT;
-
-    public static void write(String message) {
-        try {
-            ServletOutputStream out = OUT;
-            out.println(message);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.jws.HandlerChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceRef;
+import java.io.IOException;
+
+public class WebserviceServlet extends HttpServlet {
+
+    @WebServiceRef
+    @HandlerChain(file = "client-handlers.xml")
+    private HelloPojo helloPojo;
+
+    @WebServiceRef
+    @HandlerChain(file = "client-handlers.xml")
+    private HelloEjb helloEjb;
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/plain");
+        ServletOutputStream out = response.getOutputStream();
+
+        OUT = out;
+        try {
+            out.println("Pojo Webservice");
+            out.println("    helloPojo.hello(\"Bob\")=" + helloPojo.hello("Bob"));
+            out.println();
+            out.println("    helloPojo.hello(null)=" + helloPojo.hello(null));
+            out.println();
+            out.println("EJB Webservice");
+            out.println("    helloEjb.hello(\"Bob\")=" + helloEjb.hello("Bob"));
+            out.println();
+            out.println("    helloEjb.hello(null)=" + helloEjb.hello(null));
+            out.println();
+        } finally {
+            OUT = out;
+        }
+    }
+
+    private static ServletOutputStream OUT;
+
+    public static void write(String message) {
+        try {
+            ServletOutputStream out = OUT;
+            out.println(message);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java
----------------------------------------------------------------------
diff --git a/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java b/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java
index ac1e584..84ebc0c 100644
--- a/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java
+++ b/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ws;
-
-import javax.ejb.Stateless;
-import javax.jws.WebService;
-
-@Stateless
-@WebService(portName = "CalculatorPort",
-        serviceName = "CalculatorWebService",
-        targetNamespace = "http://superbiz.org/wsdl")
-public class Calculator {
-
-    public int sum(int add1, int add2) {
-        return add1 + add2;
-    }
-
-    public int multiply(int mul1, int mul2) {
-        return mul1 * mul2;
-    }
-
-}
-
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ws;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+@Stateless
+@WebService(portName = "CalculatorPort",
+        serviceName = "CalculatorWebService",
+        targetNamespace = "http://superbiz.org/wsdl")
+public class Calculator {
+
+    public int sum(int add1, int add2) {
+        return add1 + add2;
+    }
+
+    public int multiply(int mul1, int mul2) {
+        return mul1 * mul2;
+    }
+
+}
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloBean.java
----------------------------------------------------------------------
diff --git a/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloBean.java b/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloBean.java
index 1688f2a..17deafb 100644
--- a/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloBean.java
+++ b/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloBean.java
@@ -1,33 +1,33 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.hello;
-
-import javax.ejb.LocalHome;
-import javax.ejb.Stateless;
-
-/**
- * @version $Revision$ $Date$
- */
-@Stateless
-@LocalHome(HelloEjbLocalHome.class)
-public class HelloBean {
-
-    public String sayHello() {
-        return "Hello, World!";
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.hello;
+
+import javax.ejb.LocalHome;
+import javax.ejb.Stateless;
+
+/**
+ * @version $Revision$ $Date$
+ */
+@Stateless
+@LocalHome(HelloEjbLocalHome.class)
+public class HelloBean {
+
+    public String sayHello() {
+        return "Hello, World!";
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocal.java
----------------------------------------------------------------------
diff --git a/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocal.java b/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocal.java
index c8d3443..d8e12bc 100644
--- a/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocal.java
+++ b/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocal.java
@@ -1,28 +1,28 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.hello;
-
-import javax.ejb.EJBLocalObject;
-
-/**
- * @version $Revision$ $Date$
- */
-public interface HelloEjbLocal extends EJBLocalObject {
-
-    String sayHello();
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.hello;
+
+import javax.ejb.EJBLocalObject;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public interface HelloEjbLocal extends EJBLocalObject {
+
+    String sayHello();
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java
----------------------------------------------------------------------
diff --git a/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java b/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java
index a9b6db1..f448a89 100644
--- a/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java
+++ b/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java
@@ -1,28 +1,28 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.hello;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-
-/**
- * @version $Revision$ $Date$
- */
-public interface HelloEjbLocalHome extends EJBLocalHome {
-
-    HelloEjbLocal create() throws CreateException;
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.hello;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBLocalHome;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public interface HelloEjbLocalHome extends EJBLocalHome {
+
+    HelloEjbLocal create() throws CreateException;
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java
----------------------------------------------------------------------
diff --git a/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java b/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java
index 7be57dc..d2b4685 100644
--- a/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java
+++ b/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java
@@ -1,42 +1,42 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.hello;
-
-import junit.framework.TestCase;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @version $Revision$ $Date$
- */
-public class HelloTest extends TestCase {
-
-    public void test() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-        InitialContext initialContext = new InitialContext(properties);
-
-        HelloEjbLocalHome localHome = (HelloEjbLocalHome) initialContext.lookup("MyHello");
-        HelloEjbLocal helloEjb = localHome.create();
-
-        String message = helloEjb.sayHello();
-
-        assertEquals(message, "Hello, World!");
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.hello;
+
+import junit.framework.TestCase;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Properties;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public class HelloTest extends TestCase {
+
+    public void test() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
+        InitialContext initialContext = new InitialContext(properties);
+
+        HelloEjbLocalHome localHome = (HelloEjbLocalHome) initialContext.lookup("MyHello");
+        HelloEjbLocal helloEjb = localHome.create();
+
+        String message = helloEjb.sayHello();
+
+        assertEquals(message, "Hello, World!");
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java b/examples/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java
index 148f449..d28dfd5 100644
--- a/examples/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java
+++ b/examples/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java
@@ -1,106 +1,106 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-//START SNIPPET: code
-package org.superbiz.injection.jms;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-@Stateless
-public class Messages {
-
-    @Resource
-    private ConnectionFactory connectionFactory;
-
-    @Resource
-    private Queue chatQueue;
-
-    public void sendMessage(String text) throws JMSException {
-
-        Connection connection = null;
-        Session session = null;
-
-        try {
-            connection = connectionFactory.createConnection();
-            connection.start();
-
-            // Create a Session
-            session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            // Create a MessageProducer from the Session to the Topic or Queue
-            MessageProducer producer = session.createProducer(chatQueue);
-            producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
-            // Create a message
-            TextMessage message = session.createTextMessage(text);
-
-            // Tell the producer to send the message
-            producer.send(message);
-        } finally {
-            // Clean up
-            if (session != null) {
-                session.close();
-            }
-            if (connection != null) {
-                connection.close();
-            }
-        }
-    }
-
-    public String receiveMessage() throws JMSException {
-
-        Connection connection = null;
-        Session session = null;
-        MessageConsumer consumer = null;
-        try {
-            connection = connectionFactory.createConnection();
-            connection.start();
-
-            // Create a Session
-            session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            // Create a MessageConsumer from the Session to the Topic or Queue
-            consumer = session.createConsumer(chatQueue);
-
-            // Wait for a message
-            TextMessage message = (TextMessage) consumer.receive(1000);
-
-            return message.getText();
-        } finally {
-            if (consumer != null) {
-                consumer.close();
-            }
-            if (session != null) {
-                session.close();
-            }
-            if (connection != null) {
-                connection.close();
-            }
-        }
-
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+//START SNIPPET: code
+package org.superbiz.injection.jms;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+@Stateless
+public class Messages {
+
+    @Resource
+    private ConnectionFactory connectionFactory;
+
+    @Resource
+    private Queue chatQueue;
+
+    public void sendMessage(String text) throws JMSException {
+
+        Connection connection = null;
+        Session session = null;
+
+        try {
+            connection = connectionFactory.createConnection();
+            connection.start();
+
+            // Create a Session
+            session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            // Create a MessageProducer from the Session to the Topic or Queue
+            MessageProducer producer = session.createProducer(chatQueue);
+            producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+            // Create a message
+            TextMessage message = session.createTextMessage(text);
+
+            // Tell the producer to send the message
+            producer.send(message);
+        } finally {
+            // Clean up
+            if (session != null) {
+                session.close();
+            }
+            if (connection != null) {
+                connection.close();
+            }
+        }
+    }
+
+    public String receiveMessage() throws JMSException {
+
+        Connection connection = null;
+        Session session = null;
+        MessageConsumer consumer = null;
+        try {
+            connection = connectionFactory.createConnection();
+            connection.start();
+
+            // Create a Session
+            session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            // Create a MessageConsumer from the Session to the Topic or Queue
+            consumer = session.createConsumer(chatQueue);
+
+            // Wait for a message
+            TextMessage message = (TextMessage) consumer.receive(1000);
+
+            return message.getText();
+        } finally {
+            if (consumer != null) {
+                consumer.close();
+            }
+            if (session != null) {
+                session.close();
+            }
+            if (connection != null) {
+                connection.close();
+            }
+        }
+
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-connectionfactory/src/test/java/org/superbiz/injection/jms/MessagingBeanTest.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-connectionfactory/src/test/java/org/superbiz/injection/jms/MessagingBeanTest.java b/examples/injection-of-connectionfactory/src/test/java/org/superbiz/injection/jms/MessagingBeanTest.java
index 9767b4d..eb2abc7 100644
--- a/examples/injection-of-connectionfactory/src/test/java/org/superbiz/injection/jms/MessagingBeanTest.java
+++ b/examples/injection-of-connectionfactory/src/test/java/org/superbiz/injection/jms/MessagingBeanTest.java
@@ -1,42 +1,42 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-//START SNIPPET: code
-package org.superbiz.injection.jms;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-
-public class MessagingBeanTest extends TestCase {
-
-    public void test() throws Exception {
-
-        final Context context = EJBContainer.createEJBContainer().getContext();
-
-        Messages messages = (Messages) context.lookup("java:global/injection-of-connectionfactory/Messages");
-
-        messages.sendMessage("Hello World!");
-        messages.sendMessage("How are you?");
-        messages.sendMessage("Still spinning?");
-
-        assertEquals(messages.receiveMessage(), "Hello World!");
-        assertEquals(messages.receiveMessage(), "How are you?");
-        assertEquals(messages.receiveMessage(), "Still spinning?");
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+//START SNIPPET: code
+package org.superbiz.injection.jms;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+
+public class MessagingBeanTest extends TestCase {
+
+    public void test() throws Exception {
+
+        final Context context = EJBContainer.createEJBContainer().getContext();
+
+        Messages messages = (Messages) context.lookup("java:global/injection-of-connectionfactory/Messages");
+
+        messages.sendMessage("Hello World!");
+        messages.sendMessage("How are you?");
+        messages.sendMessage("Still spinning?");
+
+        assertEquals(messages.receiveMessage(), "Hello World!");
+        assertEquals(messages.receiveMessage(), "How are you?");
+        assertEquals(messages.receiveMessage(), "Still spinning?");
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java b/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java
index b9961ef..a5924b9 100644
--- a/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java
+++ b/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java
@@ -1,61 +1,61 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection;
-
-/**
- * @version $Revision$ $Date$
- */
-public class Movie {
-
-    private String director;
-    private String title;
-    private int year;
-
-    public Movie() {
-    }
-
-    public Movie(String director, String title, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public class Movie {
+
+    private String director;
+    private String title;
+    private int year;
+
+    public Movie() {
+    }
+
+    public Movie(String director, String title, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movies.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movies.java b/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movies.java
index 7a9136b..17822f5 100644
--- a/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movies.java
+++ b/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movies.java
@@ -1,106 +1,106 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-//START SNIPPET: code
-package org.superbiz.injection;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.ejb.Stateful;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-
-@Stateful
-public class Movies {
-
-    /**
-     * The field name "movieDatabase" matches the DataSource we
-     * configure in the TestCase via :
-     * p.put("movieDatabase", "new://Resource?type=DataSource");
-     * <p/>
-     * This would also match an equivalent delcaration in an openejb.xml:
-     * <Resource id="movieDatabase" type="DataSource"/>
-     * <p/>
-     * If you'd like the freedom to change the field name without
-     * impact on your configuration you can set the "name" attribute
-     * of the @Resource annotation to "movieDatabase" instead.
-     */
-    @Resource
-    private DataSource movieDatabase;
-
-    @PostConstruct
-    private void construct() throws Exception {
-        Connection connection = movieDatabase.getConnection();
-        try {
-            PreparedStatement stmt = connection.prepareStatement("CREATE TABLE movie ( director VARCHAR(255), title VARCHAR(255), year integer)");
-            stmt.execute();
-        } finally {
-            connection.close();
-        }
-    }
-
-    public void addMovie(Movie movie) throws Exception {
-        Connection conn = movieDatabase.getConnection();
-        try {
-            PreparedStatement sql = conn.prepareStatement("INSERT into movie (director, title, year) values (?, ?, ?)");
-            sql.setString(1, movie.getDirector());
-            sql.setString(2, movie.getTitle());
-            sql.setInt(3, movie.getYear());
-            sql.execute();
-        } finally {
-            conn.close();
-        }
-    }
-
-    public void deleteMovie(Movie movie) throws Exception {
-        Connection conn = movieDatabase.getConnection();
-        try {
-            PreparedStatement sql = conn.prepareStatement("DELETE from movie where director = ? AND title = ? AND year = ?");
-            sql.setString(1, movie.getDirector());
-            sql.setString(2, movie.getTitle());
-            sql.setInt(3, movie.getYear());
-            sql.execute();
-        } finally {
-            conn.close();
-        }
-    }
-
-    public List<Movie> getMovies() throws Exception {
-        ArrayList<Movie> movies = new ArrayList<Movie>();
-        Connection conn = movieDatabase.getConnection();
-        try {
-            PreparedStatement sql = conn.prepareStatement("SELECT director, title, year from movie");
-            ResultSet set = sql.executeQuery();
-            while (set.next()) {
-                Movie movie = new Movie();
-                movie.setDirector(set.getString("director"));
-                movie.setTitle(set.getString("title"));
-                movie.setYear(set.getInt("year"));
-                movies.add(movie);
-            }
-
-        } finally {
-            conn.close();
-        }
-        return movies;
-    }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+//START SNIPPET: code
+package org.superbiz.injection;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.ejb.Stateful;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+
+@Stateful
+public class Movies {
+
+    /**
+     * The field name "movieDatabase" matches the DataSource we
+     * configure in the TestCase via :
+     * p.put("movieDatabase", "new://Resource?type=DataSource");
+     * <p/>
+     * This would also match an equivalent delcaration in an openejb.xml:
+     * <Resource id="movieDatabase" type="DataSource"/>
+     * <p/>
+     * If you'd like the freedom to change the field name without
+     * impact on your configuration you can set the "name" attribute
+     * of the @Resource annotation to "movieDatabase" instead.
+     */
+    @Resource
+    private DataSource movieDatabase;
+
+    @PostConstruct
+    private void construct() throws Exception {
+        Connection connection = movieDatabase.getConnection();
+        try {
+            PreparedStatement stmt = connection.prepareStatement("CREATE TABLE movie ( director VARCHAR(255), title VARCHAR(255), year integer)");
+            stmt.execute();
+        } finally {
+            connection.close();
+        }
+    }
+
+    public void addMovie(Movie movie) throws Exception {
+        Connection conn = movieDatabase.getConnection();
+        try {
+            PreparedStatement sql = conn.prepareStatement("INSERT into movie (director, title, year) values (?, ?, ?)");
+            sql.setString(1, movie.getDirector());
+            sql.setString(2, movie.getTitle());
+            sql.setInt(3, movie.getYear());
+            sql.execute();
+        } finally {
+            conn.close();
+        }
+    }
+
+    public void deleteMovie(Movie movie) throws Exception {
+        Connection conn = movieDatabase.getConnection();
+        try {
+            PreparedStatement sql = conn.prepareStatement("DELETE from movie where director = ? AND title = ? AND year = ?");
+            sql.setString(1, movie.getDirector());
+            sql.setString(2, movie.getTitle());
+            sql.setInt(3, movie.getYear());
+            sql.execute();
+        } finally {
+            conn.close();
+        }
+    }
+
+    public List<Movie> getMovies() throws Exception {
+        ArrayList<Movie> movies = new ArrayList<Movie>();
+        Connection conn = movieDatabase.getConnection();
+        try {
+            PreparedStatement sql = conn.prepareStatement("SELECT director, title, year from movie");
+            ResultSet set = sql.executeQuery();
+            while (set.next()) {
+                Movie movie = new Movie();
+                movie.setDirector(set.getString("director"));
+                movie.setTitle(set.getString("title"));
+                movie.setYear(set.getInt("year"));
+                movies.add(movie);
+            }
+
+        } finally {
+            conn.close();
+        }
+        return movies;
+    }
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-datasource/src/test/java/org/superbiz/injection/MoviesTest.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-datasource/src/test/java/org/superbiz/injection/MoviesTest.java b/examples/injection-of-datasource/src/test/java/org/superbiz/injection/MoviesTest.java
index 6c41f19..4ab7fcd 100644
--- a/examples/injection-of-datasource/src/test/java/org/superbiz/injection/MoviesTest.java
+++ b/examples/injection-of-datasource/src/test/java/org/superbiz/injection/MoviesTest.java
@@ -1,54 +1,54 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.List;
-import java.util.Properties;
-
-//START SNIPPET: code
-public class MoviesTest extends TestCase {
-
-    public void test() throws Exception {
-
-        Properties p = new Properties();
-        p.put("movieDatabase", "new://Resource?type=DataSource");
-        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-        Context context = EJBContainer.createEJBContainer(p).getContext();
-
-        Movies movies = (Movies) context.lookup("java:global/injection-of-datasource/Movies");
-
-        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
-        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
-
-        List<Movie> list = movies.getMovies();
-        assertEquals("List.size()", 3, list.size());
-
-        for (Movie movie : list) {
-            movies.deleteMovie(movie);
-        }
-
-        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.List;
+import java.util.Properties;
+
+//START SNIPPET: code
+public class MoviesTest extends TestCase {
+
+    public void test() throws Exception {
+
+        Properties p = new Properties();
+        p.put("movieDatabase", "new://Resource?type=DataSource");
+        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+        Context context = EJBContainer.createEJBContainer(p).getContext();
+
+        Movies movies = (Movies) context.lookup("java:global/injection-of-datasource/Movies");
+
+        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
+        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+        List<Movie> list = movies.getMovies();
+        assertEquals("List.size()", 3, list.size());
+
+        for (Movie movie : list) {
+            movies.deleteMovie(movie);
+        }
+
+        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataReader.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataReader.java b/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataReader.java
index 9b98efc..7a8d9be 100644
--- a/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataReader.java
+++ b/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataReader.java
@@ -1,60 +1,60 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-
-/**
- * This is an EJB 3.1 style pojo stateless session bean
- * Every stateless session bean implementation must be annotated
- * using the annotation @Stateless
- * This EJB has 2 business interfaces: DataReaderRemote, a remote business
- * interface, and DataReaderLocal, a local business interface
- * <p/>
- * The instance variables 'dataStoreRemote' is annotated with the @EJB annotation:
- * this means that the application server, at runtime, will inject in this instance
- * variable a reference to the EJB DataStoreRemote
- * <p/>
- * The instance variables 'dataStoreLocal' is annotated with the @EJB annotation:
- * this means that the application server, at runtime, will inject in this instance
- * variable a reference to the EJB DataStoreLocal
- */
-//START SNIPPET: code
-@Stateless
-public class DataReader {
-
-    @EJB
-    private DataStoreRemote dataStoreRemote;
-    @EJB
-    private DataStoreLocal dataStoreLocal;
-    @EJB
-    private DataStore dataStore;
-
-    public String readDataFromLocalStore() {
-        return "LOCAL:" + dataStoreLocal.getData();
-    }
-
-    public String readDataFromLocalBeanStore() {
-        return "LOCALBEAN:" + dataStore.getData();
-    }
-
-    public String readDataFromRemoteStore() {
-        return "REMOTE:" + dataStoreRemote.getData();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+
+/**
+ * This is an EJB 3.1 style pojo stateless session bean
+ * Every stateless session bean implementation must be annotated
+ * using the annotation @Stateless
+ * This EJB has 2 business interfaces: DataReaderRemote, a remote business
+ * interface, and DataReaderLocal, a local business interface
+ * <p/>
+ * The instance variables 'dataStoreRemote' is annotated with the @EJB annotation:
+ * this means that the application server, at runtime, will inject in this instance
+ * variable a reference to the EJB DataStoreRemote
+ * <p/>
+ * The instance variables 'dataStoreLocal' is annotated with the @EJB annotation:
+ * this means that the application server, at runtime, will inject in this instance
+ * variable a reference to the EJB DataStoreLocal
+ */
+//START SNIPPET: code
+@Stateless
+public class DataReader {
+
+    @EJB
+    private DataStoreRemote dataStoreRemote;
+    @EJB
+    private DataStoreLocal dataStoreLocal;
+    @EJB
+    private DataStore dataStore;
+
+    public String readDataFromLocalStore() {
+        return "LOCAL:" + dataStoreLocal.getData();
+    }
+
+    public String readDataFromLocalBeanStore() {
+        return "LOCALBEAN:" + dataStore.getData();
+    }
+
+    public String readDataFromRemoteStore() {
+        return "REMOTE:" + dataStoreRemote.getData();
+    }
+}
 //END SNIPPET: code
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStore.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStore.java b/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStore.java
index 0bd8b07..a2edf61 100644
--- a/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStore.java
+++ b/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStore.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection;
-
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-
-/**
- * This is an EJB 3 style pojo stateless session bean
- * Every stateless session bean implementation must be annotated
- * using the annotation @Stateless
- * This EJB has 2 business interfaces: DataStoreRemote, a remote business
- * interface, and DataStoreLocal, a local business interface
- */
-//START SNIPPET: code
-@Stateless
-@LocalBean
-public class DataStore implements DataStoreLocal, DataStoreRemote {
-
-    public String getData() {
-        return "42";
-    }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+
+/**
+ * This is an EJB 3 style pojo stateless session bean
+ * Every stateless session bean implementation must be annotated
+ * using the annotation @Stateless
+ * This EJB has 2 business interfaces: DataStoreRemote, a remote business
+ * interface, and DataStoreLocal, a local business interface
+ */
+//START SNIPPET: code
+@Stateless
+@LocalBean
+public class DataStore implements DataStoreLocal, DataStoreRemote {
+
+    public String getData() {
+        return "42";
+    }
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreLocal.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreLocal.java b/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreLocal.java
index 477ee6e..ca881bf 100644
--- a/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreLocal.java
+++ b/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreLocal.java
@@ -1,34 +1,34 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection;
-
-import javax.ejb.Local;
-
-/**
- * This is an EJB 3 local business interface
- * A local business interface may be annotated with the @Local
- * annotation, but it's optional. A business interface which is
- * not annotated with @Local or @Remote is assumed to be Local
- */
-//START SNIPPET: code
-@Local
-public interface DataStoreLocal {
-
-    public String getData();
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection;
+
+import javax.ejb.Local;
+
+/**
+ * This is an EJB 3 local business interface
+ * A local business interface may be annotated with the @Local
+ * annotation, but it's optional. A business interface which is
+ * not annotated with @Local or @Remote is assumed to be Local
+ */
+//START SNIPPET: code
+@Local
+public interface DataStoreLocal {
+
+    public String getData();
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreRemote.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreRemote.java b/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreRemote.java
index 7d30a2d..eaf8b7a 100644
--- a/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreRemote.java
+++ b/examples/injection-of-ejbs/src/main/java/org/superbiz/injection/DataStoreRemote.java
@@ -1,33 +1,33 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection;
-
-import javax.ejb.Remote;
-
-/**
- * This is an EJB 3 remote business interface
- * A remote business interface must be annotated with the @Remote
- * annotation
- */
-//START SNIPPET: code
-@Remote
-public interface DataStoreRemote {
-
-    public String getData();
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection;
+
+import javax.ejb.Remote;
+
+/**
+ * This is an EJB 3 remote business interface
+ * A remote business interface must be annotated with the @Remote
+ * annotation
+ */
+//START SNIPPET: code
+@Remote
+public interface DataStoreRemote {
+
+    public String getData();
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-ejbs/src/test/java/org/superbiz/injection/EjbDependencyTest.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-ejbs/src/test/java/org/superbiz/injection/EjbDependencyTest.java b/examples/injection-of-ejbs/src/test/java/org/superbiz/injection/EjbDependencyTest.java
index 7c199f2..28ef670 100644
--- a/examples/injection-of-ejbs/src/test/java/org/superbiz/injection/EjbDependencyTest.java
+++ b/examples/injection-of-ejbs/src/test/java/org/superbiz/injection/EjbDependencyTest.java
@@ -1,42 +1,42 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-
-/**
- * A test case for DataReaderImpl ejb, testing both the remote and local interface
- */
-//START SNIPPET: code
-public class EjbDependencyTest extends TestCase {
-
-    public void test() throws Exception {
-        final Context context = EJBContainer.createEJBContainer().getContext();
-
-        DataReader dataReader = (DataReader) context.lookup("java:global/injection-of-ejbs/DataReader");
-
-        assertNotNull(dataReader);
-
-        assertEquals("LOCAL:42", dataReader.readDataFromLocalStore());
-        assertEquals("REMOTE:42", dataReader.readDataFromRemoteStore());
-        assertEquals("LOCALBEAN:42", dataReader.readDataFromLocalBeanStore());
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+
+/**
+ * A test case for DataReaderImpl ejb, testing both the remote and local interface
+ */
+//START SNIPPET: code
+public class EjbDependencyTest extends TestCase {
+
+    public void test() throws Exception {
+        final Context context = EJBContainer.createEJBContainer().getContext();
+
+        DataReader dataReader = (DataReader) context.lookup("java:global/injection-of-ejbs/DataReader");
+
+        assertNotNull(dataReader);
+
+        assertEquals("LOCAL:42", dataReader.readDataFromLocalStore());
+        assertEquals("REMOTE:42", dataReader.readDataFromRemoteStore());
+        assertEquals("LOCALBEAN:42", dataReader.readDataFromLocalBeanStore());
+    }
+}
+//END SNIPPET: code


[03/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java
index 29b9030..82e4d13 100644
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.InvocationContext;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Utils {
-
-    public static List<String> addClassSimpleName(InvocationContext ic, String classSimpleName) throws Exception {
-        List<String> list = new ArrayList<String>();
-        list.add(classSimpleName);
-        List<String> listOfStrings = (List<String>) ic.proceed();
-        if (listOfStrings != null) {
-            list.addAll(listOfStrings);
-        }
-        return list;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.InvocationContext;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Utils {
+
+    public static List<String> addClassSimpleName(InvocationContext ic, String classSimpleName) throws Exception {
+        List<String> list = new ArrayList<String>();
+        list.add(classSimpleName);
+        List<String> listOfStrings = (List<String>) ic.proceed();
+        if (listOfStrings != null) {
+            list.addAll(listOfStrings);
+        }
+        return list;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java b/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java
index 9c9cf1c..f27c828 100755
--- a/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java
+++ b/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java
@@ -1,94 +1,94 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import junit.framework.TestCase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FullyInterceptedTest extends TestCase {
-
-    private InitialContext initCtx;
-
-    @Before
-    public void setUp() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-        properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
-
-        initCtx = new InitialContext(properties);
-    }
-
-    @Test
-    public void testBusinessMethod() throws Exception {
-
-        FullyIntercepted fullyIntercepted = (FullyIntercepted) initCtx.lookup("FullyInterceptedBeanLocal");
-
-        assert fullyIntercepted != null;
-
-        List<String> expected = new ArrayList<String>();
-        expected.add("DefaultInterceptorOne");
-        expected.add("DefaultInterceptorTwo");
-        expected.add("ClassLevelInterceptorSuperClassOne");
-        expected.add("ClassLevelInterceptorSuperClassTwo");
-        expected.add("ClassLevelInterceptorOne");
-        expected.add("ClassLevelInterceptorTwo");
-        expected.add("MethodLevelInterceptorOne");
-        expected.add("MethodLevelInterceptorTwo");
-        expected.add("beanClassBusinessMethodInterceptor");
-        expected.add("businessMethod");
-
-        List<String> actual = fullyIntercepted.businessMethod();
-        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
-    }
-
-    @Test
-    public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
-
-        FullyIntercepted fullyIntercepted = (FullyIntercepted) initCtx.lookup("FullyInterceptedBeanLocal");
-
-        assert fullyIntercepted != null;
-
-        List<String> expected = new ArrayList<String>();
-        expected.add("ClassLevelInterceptorSuperClassOne");
-        expected.add("ClassLevelInterceptorSuperClassTwo");
-        expected.add("ClassLevelInterceptorOne");
-        expected.add("ClassLevelInterceptorTwo");
-        expected.add("MethodLevelInterceptorOne");
-        expected.add("MethodLevelInterceptorTwo");
-        expected.add("beanClassBusinessMethodInterceptor");
-        expected.add("methodWithDefaultInterceptorsExcluded");
-
-        List<String> actual = fullyIntercepted.methodWithDefaultInterceptorsExcluded();
-        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        initCtx.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class FullyInterceptedTest extends TestCase {
+
+    private InitialContext initCtx;
+
+    @Before
+    public void setUp() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
+        properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
+
+        initCtx = new InitialContext(properties);
+    }
+
+    @Test
+    public void testBusinessMethod() throws Exception {
+
+        FullyIntercepted fullyIntercepted = (FullyIntercepted) initCtx.lookup("FullyInterceptedBeanLocal");
+
+        assert fullyIntercepted != null;
+
+        List<String> expected = new ArrayList<String>();
+        expected.add("DefaultInterceptorOne");
+        expected.add("DefaultInterceptorTwo");
+        expected.add("ClassLevelInterceptorSuperClassOne");
+        expected.add("ClassLevelInterceptorSuperClassTwo");
+        expected.add("ClassLevelInterceptorOne");
+        expected.add("ClassLevelInterceptorTwo");
+        expected.add("MethodLevelInterceptorOne");
+        expected.add("MethodLevelInterceptorTwo");
+        expected.add("beanClassBusinessMethodInterceptor");
+        expected.add("businessMethod");
+
+        List<String> actual = fullyIntercepted.businessMethod();
+        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
+    }
+
+    @Test
+    public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
+
+        FullyIntercepted fullyIntercepted = (FullyIntercepted) initCtx.lookup("FullyInterceptedBeanLocal");
+
+        assert fullyIntercepted != null;
+
+        List<String> expected = new ArrayList<String>();
+        expected.add("ClassLevelInterceptorSuperClassOne");
+        expected.add("ClassLevelInterceptorSuperClassTwo");
+        expected.add("ClassLevelInterceptorOne");
+        expected.add("ClassLevelInterceptorTwo");
+        expected.add("MethodLevelInterceptorOne");
+        expected.add("MethodLevelInterceptorTwo");
+        expected.add("beanClassBusinessMethodInterceptor");
+        expected.add("methodWithDefaultInterceptorsExcluded");
+
+        List<String> actual = fullyIntercepted.methodWithDefaultInterceptorsExcluded();
+        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        initCtx.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java b/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java
index 937e0e0..8a298d0 100755
--- a/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java
+++ b/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java
@@ -1,58 +1,58 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import junit.framework.TestCase;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MethodLevelInterceptorOnlyTest extends TestCase {
-
-    private InitialContext initCtx;
-
-    @Before
-    public void setUp() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-        properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
-
-        initCtx = new InitialContext(properties);
-    }
-
-    @Test
-    public void testInterceptedGenerifiedBusinessIntfMethod() throws Exception {
-        MethodLevelInterceptorOnlyParent bean = (MethodLevelInterceptorOnlyParent) initCtx.lookup("MethodLevelInterceptorOnlySLSBeanLocal");
-
-        assert bean != null;
-
-        List<String> expected = new ArrayList<String>();
-        expected.add("MethodLevelInterceptorOne");
-        expected.add("makePersistent");
-
-        List<String> actual = bean.makePersistent(null);
-        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
-    }
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MethodLevelInterceptorOnlyTest extends TestCase {
+
+    private InitialContext initCtx;
+
+    @Before
+    public void setUp() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
+        properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
+
+        initCtx = new InitialContext(properties);
+    }
+
+    @Test
+    public void testInterceptedGenerifiedBusinessIntfMethod() throws Exception {
+        MethodLevelInterceptorOnlyParent bean = (MethodLevelInterceptorOnlyParent) initCtx.lookup("MethodLevelInterceptorOnlySLSBeanLocal");
+
+        assert bean != null;
+
+        List<String> expected = new ArrayList<String>();
+        expected.add("MethodLevelInterceptorOne");
+        expected.add("makePersistent");
+
+        List<String> actual = bean.makePersistent(null);
+        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java b/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java
index ad6b363..38117a7 100644
--- a/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java
+++ b/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java
@@ -1,63 +1,63 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import junit.framework.TestCase;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SecondStatelessInterceptedTest extends TestCase {
-
-    private InitialContext initCtx;
-
-    @Before
-    public void setUp() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-        properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
-
-        initCtx = new InitialContext(properties);
-    }
-
-    @Test
-    public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
-        SecondStatelessInterceptedLocal bean =
-                (SecondStatelessInterceptedLocal) initCtx.lookup("SecondStatelessInterceptedBeanLocal");
-
-        assert bean != null;
-
-        List<String> expected = new ArrayList<String>();
-        expected.add("ClassLevelInterceptorOne");
-        expected.add("ClassLevelInterceptorTwo");
-        expected.add("MethodLevelInterceptorOne");
-        expected.add("MethodLevelInterceptorTwo");
-        expected.add("SecondStatelessInterceptedBean");
-        expected.add("methodWithDefaultInterceptorsExcluded");
-
-        List<String> actual = bean.methodWithDefaultInterceptorsExcluded();
-        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class SecondStatelessInterceptedTest extends TestCase {
+
+    private InitialContext initCtx;
+
+    @Before
+    public void setUp() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
+        properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
+
+        initCtx = new InitialContext(properties);
+    }
+
+    @Test
+    public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
+        SecondStatelessInterceptedLocal bean =
+                (SecondStatelessInterceptedLocal) initCtx.lookup("SecondStatelessInterceptedBeanLocal");
+
+        assert bean != null;
+
+        List<String> expected = new ArrayList<String>();
+        expected.add("ClassLevelInterceptorOne");
+        expected.add("ClassLevelInterceptorTwo");
+        expected.add("MethodLevelInterceptorOne");
+        expected.add("MethodLevelInterceptorTwo");
+        expected.add("SecondStatelessInterceptedBean");
+        expected.add("methodWithDefaultInterceptorsExcluded");
+
+        List<String> actual = bean.methodWithDefaultInterceptorsExcluded();
+        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java b/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java
index e775612..9009316 100755
--- a/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java
+++ b/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java
@@ -1,78 +1,78 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import junit.framework.TestCase;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ThirdSLSBeanTest extends TestCase {
-
-    private InitialContext initCtx;
-
-    @Before
-    public void setUp() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-        properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
-
-        initCtx = new InitialContext(properties);
-    }
-
-    @Test
-    public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
-        ThirdSLSBeanLocal bean = (ThirdSLSBeanLocal) initCtx.lookup("ThirdSLSBeanLocal");
-
-        assert bean != null;
-
-        List<String> expected = new ArrayList<String>();
-        expected.add("ClassLevelInterceptorOne");
-        expected.add("ClassLevelInterceptorTwo");
-        expected.add("MethodLevelInterceptorOne");
-        expected.add("MethodLevelInterceptorTwo");
-        expected.add("ThirdSLSBean");
-        expected.add("businessMethod");
-
-        List<String> actual = bean.businessMethod();
-        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
-    }
-
-    @Test
-    public void testMethodWithDefaultAndClassInterceptorsExcluded() throws Exception {
-        ThirdSLSBeanLocal bean = (ThirdSLSBeanLocal) initCtx.lookup("ThirdSLSBeanLocal");
-
-        assert bean != null;
-
-        List<String> expected = new ArrayList<String>();
-        expected.add("MethodLevelInterceptorOne");
-        expected.add("MethodLevelInterceptorTwo");
-        expected.add("ThirdSLSBean");
-        expected.add("anotherBusinessMethod");
-
-        List<String> actual = bean.anotherBusinessMethod();
-        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ThirdSLSBeanTest extends TestCase {
+
+    private InitialContext initCtx;
+
+    @Before
+    public void setUp() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
+        properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
+
+        initCtx = new InitialContext(properties);
+    }
+
+    @Test
+    public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
+        ThirdSLSBeanLocal bean = (ThirdSLSBeanLocal) initCtx.lookup("ThirdSLSBeanLocal");
+
+        assert bean != null;
+
+        List<String> expected = new ArrayList<String>();
+        expected.add("ClassLevelInterceptorOne");
+        expected.add("ClassLevelInterceptorTwo");
+        expected.add("MethodLevelInterceptorOne");
+        expected.add("MethodLevelInterceptorTwo");
+        expected.add("ThirdSLSBean");
+        expected.add("businessMethod");
+
+        List<String> actual = bean.businessMethod();
+        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
+    }
+
+    @Test
+    public void testMethodWithDefaultAndClassInterceptorsExcluded() throws Exception {
+        ThirdSLSBeanLocal bean = (ThirdSLSBeanLocal) initCtx.lookup("ThirdSLSBeanLocal");
+
+        assert bean != null;
+
+        List<String> expected = new ArrayList<String>();
+        expected.add("MethodLevelInterceptorOne");
+        expected.add("MethodLevelInterceptorTwo");
+        expected.add("ThirdSLSBean");
+        expected.add("anotherBusinessMethod");
+
+        List<String> actual = bean.anotherBusinessMethod();
+        assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/javamail/README.md
----------------------------------------------------------------------
diff --git a/examples/javamail/README.md b/examples/javamail/README.md
index 89be081..61ff594 100644
--- a/examples/javamail/README.md
+++ b/examples/javamail/README.md
@@ -1,184 +1,184 @@
-Title: Javamail API
-
-This is just a simple example to demonstrate a very basic usage of the API. It should be enough to get you started using the java mail packages.
-
-#The Code
-
-## A simple REST service using the Javamail API
-
-Here we see a very simple RESTful endpoint that can be called with a message to send by Email. It would not be hard to modify the application to provide
-more useful configuration options. As is, this will not send anything, but if you change the parameters to match your mail server then you'll see the message being sent.
-You can find much more detailed information on the [Javamail API here](https://java.net/projects/javamail/pages/Home#Samples)
-
-    package org.superbiz.rest;
-
-    import javax.mail.Authenticator;
-    import javax.mail.Message;
-    import javax.mail.MessagingException;
-    import javax.mail.PasswordAuthentication;
-    import javax.mail.Session;
-    import javax.mail.Transport;
-    import javax.mail.internet.InternetAddress;
-    import javax.mail.internet.MimeMessage;
-    import javax.ws.rs.POST;
-    import javax.ws.rs.Path;
-    import java.util.Date;
-    import java.util.Properties;
-
-    @Path("/email")
-    public class EmailService {
-
-        @POST
-        public String lowerCase(final String message) {
-
-            try {
-
-                //Create some properties and get the default Session
-                final Properties props = new Properties();
-                props.put("mail.smtp.host", "your.mailserver.host");
-                props.put("mail.debug", "true");
-
-                final Session session = Session.getInstance(props, new Authenticator() {
-                    @Override
-                    protected PasswordAuthentication getPasswordAuthentication() {
-                        return new PasswordAuthentication("MyUsername", "MyPassword");
-                    }
-                });
-
-                //Set this just to see some internal logging
-                session.setDebug(true);
-
-                //Create a message
-                final MimeMessage msg = new MimeMessage(session);
-                msg.setFrom(new InternetAddress("your@email.address"));
-                final InternetAddress[] address = {new InternetAddress("general@tomitribe.com")};
-                msg.setRecipients(Message.RecipientType.TO, address);
-                msg.setSubject("JavaMail API test");
-                msg.setSentDate(new Date());
-                msg.setText(message, "UTF-8");
-
-
-                Transport.send(msg);
-            } catch (MessagingException e) {
-                return "Failed to send message: " + e.getMessage();
-            }
-
-            return "Sent";
-        }
-    }
-
-# Testing
-
-## Test for the JAXRS service
-
-The test uses the OpenEJB ApplicationComposer to make it trivial.
-
-The idea is first to activate the jaxrs services. This is done using @EnableServices annotation.
-
-Then we create on the fly the application simply returning an object representing the web.xml. Here we simply
-use it to define the context root but you can use it to define your REST Application too. And to complete the
-application definition we add @Classes annotation to define the set of classes to use in this app.
-
-Finally to test it we use cxf client API to call the REST service post() method.
-
-    package org.superbiz.rest;
-
-    import org.apache.cxf.jaxrs.client.WebClient;
-    import org.apache.openejb.jee.WebApp;
-    import org.apache.openejb.junit.ApplicationComposer;
-    import org.apache.openejb.testing.Classes;
-    import org.apache.openejb.testing.EnableServices;
-    import org.apache.openejb.testing.Module;
-    import org.junit.Test;
-    import org.junit.runner.RunWith;
-
-    import java.io.IOException;
-
-    import static org.junit.Assert.assertEquals;
-
-    @EnableServices(value = "jaxrs")
-    @RunWith(ApplicationComposer.class)
-    public class EmailServiceTest {
-
-        @Module
-        @Classes(EmailService.class)
-        public WebApp app() {
-            return new WebApp().contextRoot("test");
-        }
-
-        @Test
-        public void post() throws IOException {
-            final String message = WebClient.create("http://localhost:4204").path("/test/email/").post("Hello Tomitribe", String.class);
-            assertEquals("Failed to send message: Unknown SMTP host: your.mailserver.host", message);
-        }
-    }
-
-#Running
-
-Running the example is fairly simple. In the "javamail-api" directory run:
-
-    $ mvn clean install
-
-Which should create output like the following.
-
-    INFO - Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
-    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
-    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    INFO - Creating TransactionManager(id=Default Transaction Manager)
-    INFO - Creating SecurityService(id=Default Security Service)
-    INFO - Initializing network services
-    INFO - Creating ServerService(id=cxf-rs)
-    INFO - Creating ServerService(id=httpejbd)
-    INFO - Created ServicePool 'httpejbd' with (10) core threads, limited to (200) threads with a queue of (9)
-    INFO - Initializing network services
-    INFO -   ** Bound Services **
-    INFO -   NAME                 IP              PORT
-    INFO -   httpejbd             127.0.0.1       4204
-    INFO - -------
-    INFO - Ready!
-    INFO - Configuring enterprise application: D:\github\tomee\examples\javamail\EmailServiceTest
-    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-    INFO - Auto-creating a container for bean org.superbiz.rest.EmailServiceTest: Container(type=MANAGED, id=Default Managed Container)
-    INFO - Creating Container(id=Default Managed Container)
-    INFO - Using directory D:\windows\tmp for stateful session passivation
-    INFO - Configuring Service(id=comp/DefaultManagedExecutorService, type=Resource, provider-id=Default Executor Service)
-    INFO - Auto-creating a Resource with id 'comp/DefaultManagedExecutorService' of type 'javax.enterprise.concurrent.ManagedExecutorService for 'test'.
-    INFO - Configuring Service(id=comp/DefaultManagedScheduledExecutorService, type=Resource, provider-id=Default Scheduled Executor Service)
-    INFO - Auto-creating a Resource with id 'comp/DefaultManagedScheduledExecutorService' of type 'javax.enterprise.concurrent.ManagedScheduledExecutorService for 'test'.
-    INFO - Configuring Service(id=comp/DefaultManagedThreadFactory, type=Resource, provider-id=Default Managed Thread Factory)
-    INFO - Auto-creating a Resource with id 'comp/DefaultManagedThreadFactory' of type 'javax.enterprise.concurrent.ManagedThreadFactory for 'test'.
-    INFO - Enterprise application "D:\github\tomee\examples\javamail\EmailServiceTest" loaded.
-    INFO - Creating dedicated application classloader for EmailServiceTest
-    INFO - Assembling app: D:\github\tomee\examples\javamail\EmailServiceTest
-    INFO - Using providers:
-    INFO -      org.apache.johnzon.jaxrs.JohnzonProvider@2687f956
-    INFO -      org.apache.cxf.jaxrs.provider.JAXBElementProvider@1ded7b14
-    INFO -      org.apache.johnzon.jaxrs.JsrProvider@29be7749
-    INFO -      org.apache.johnzon.jaxrs.WadlDocumentMessageBodyWriter@5f84abe8
-    INFO -      org.apache.openejb.server.cxf.rs.EJBAccessExceptionMapper@4650a407
-    INFO -      org.apache.cxf.jaxrs.validation.ValidationExceptionMapper@30135202
-    INFO - REST Application: http://127.0.0.1:4204/test/       -> org.apache.openejb.server.rest.InternalApplication
-    INFO -      Service URI: http://127.0.0.1:4204/test/email  -> Pojo org.superbiz.rest.EmailService
-    INFO -              POST http://127.0.0.1:4204/test/email/ ->      String lowerCase(String)
-    INFO - Deployed Application(path=D:\github\tomee\examples\javamail\EmailServiceTest)
-    DEBUG: JavaMail version 1.4ea
-    DEBUG: java.io.FileNotFoundException: D:\java\jdk8\jre\lib\javamail.providers (The system cannot find the file specified)
-    DEBUG: !anyLoaded
-    DEBUG: not loading resource: /META-INF/javamail.providers
-    DEBUG: successfully loaded resource: /META-INF/javamail.default.providers
-    DEBUG: Tables of loaded providers
-    DEBUG: Providers Listed By Class Name: {com.sun.mail.smtp.SMTPSSLTransport=javax.mail.Provider[TRANSPORT,smtps,com.sun.mail.smtp.SMTPSSLTransport,Sun Microsystems, Inc], com.sun.mail.smtp.SMTPTransport=javax.mail.Provider[TRANSPORT,smtp,com.sun.mail.smtp.SMTPTransport,Sun Microsystems, Inc], com.sun.mail.imap.IMAPSSLStore=javax.mail.Provider[STORE,imaps,com.sun.mail.imap.IMAPSSLStore,Sun Microsystems, Inc], com.sun.mail.pop3.POP3SSLStore=javax.mail.Provider[STORE,pop3s,com.sun.mail.pop3.POP3SSLStore,Sun Microsystems, Inc], com.sun.mail.imap.IMAPStore=javax.mail.Provider[STORE,imap,com.sun.mail.imap.IMAPStore,Sun Microsystems, Inc], com.sun.mail.pop3.POP3Store=javax.mail.Provider[STORE,pop3,com.sun.mail.pop3.POP3Store,Sun Microsystems, Inc]}
-    DEBUG: Providers Listed By Protocol: {imaps=javax.mail.Provider[STORE,imaps,com.sun.mail.imap.IMAPSSLStore,Sun Microsystems, Inc], imap=javax.mail.Provider[STORE,imap,com.sun.mail.imap.IMAPStore,Sun Microsystems, Inc], smtps=javax.mail.Provider[TRANSPORT,smtps,com.sun.mail.smtp.SMTPSSLTransport,Sun Microsystems, Inc], pop3=javax.mail.Provider[STORE,pop3,com.sun.mail.pop3.POP3Store,Sun Microsystems, Inc], pop3s=javax.mail.Provider[STORE,pop3s,com.sun.mail.pop3.POP3SSLStore,Sun Microsystems, Inc], smtp=javax.mail.Provider[TRANSPORT,smtp,com.sun.mail.smtp.SMTPTransport,Sun Microsystems, Inc]}
-    DEBUG: successfully loaded resource: /META-INF/javamail.default.address.map
-    DEBUG: !anyLoaded
-    DEBUG: not loading resource: /META-INF/javamail.address.map
-    DEBUG: java.io.FileNotFoundException: D:\java\jdk8\jre\lib\javamail.address.map (The system cannot find the file specified)
-    DEBUG: setDebug: JavaMail version 1.4ea
-    DEBUG: getProvider() returning javax.mail.Provider[TRANSPORT,smtp,com.sun.mail.smtp.SMTPTransport,Sun Microsystems, Inc]
-    DEBUG SMTP: useEhlo true, useAuth false
-    DEBUG SMTP: trying to connect to host "your.mailserver.host", port 25, isSSL false
-    INFO - Undeploying app: D:\github\tomee\examples\javamail\EmailServiceTest
-    INFO - Stopping network services
-    INFO - Stopping server services
-
-
+Title: Javamail API
+
+This is just a simple example to demonstrate a very basic usage of the API. It should be enough to get you started using the java mail packages.
+
+#The Code
+
+## A simple REST service using the Javamail API
+
+Here we see a very simple RESTful endpoint that can be called with a message to send by Email. It would not be hard to modify the application to provide
+more useful configuration options. As is, this will not send anything, but if you change the parameters to match your mail server then you'll see the message being sent.
+You can find much more detailed information on the [Javamail API here](https://java.net/projects/javamail/pages/Home#Samples)
+
+    package org.superbiz.rest;
+
+    import javax.mail.Authenticator;
+    import javax.mail.Message;
+    import javax.mail.MessagingException;
+    import javax.mail.PasswordAuthentication;
+    import javax.mail.Session;
+    import javax.mail.Transport;
+    import javax.mail.internet.InternetAddress;
+    import javax.mail.internet.MimeMessage;
+    import javax.ws.rs.POST;
+    import javax.ws.rs.Path;
+    import java.util.Date;
+    import java.util.Properties;
+
+    @Path("/email")
+    public class EmailService {
+
+        @POST
+        public String lowerCase(final String message) {
+
+            try {
+
+                //Create some properties and get the default Session
+                final Properties props = new Properties();
+                props.put("mail.smtp.host", "your.mailserver.host");
+                props.put("mail.debug", "true");
+
+                final Session session = Session.getInstance(props, new Authenticator() {
+                    @Override
+                    protected PasswordAuthentication getPasswordAuthentication() {
+                        return new PasswordAuthentication("MyUsername", "MyPassword");
+                    }
+                });
+
+                //Set this just to see some internal logging
+                session.setDebug(true);
+
+                //Create a message
+                final MimeMessage msg = new MimeMessage(session);
+                msg.setFrom(new InternetAddress("your@email.address"));
+                final InternetAddress[] address = {new InternetAddress("general@tomitribe.com")};
+                msg.setRecipients(Message.RecipientType.TO, address);
+                msg.setSubject("JavaMail API test");
+                msg.setSentDate(new Date());
+                msg.setText(message, "UTF-8");
+
+
+                Transport.send(msg);
+            } catch (MessagingException e) {
+                return "Failed to send message: " + e.getMessage();
+            }
+
+            return "Sent";
+        }
+    }
+
+# Testing
+
+## Test for the JAXRS service
+
+The test uses the OpenEJB ApplicationComposer to make it trivial.
+
+The idea is first to activate the jaxrs services. This is done using @EnableServices annotation.
+
+Then we create on the fly the application simply returning an object representing the web.xml. Here we simply
+use it to define the context root but you can use it to define your REST Application too. And to complete the
+application definition we add @Classes annotation to define the set of classes to use in this app.
+
+Finally to test it we use cxf client API to call the REST service post() method.
+
+    package org.superbiz.rest;
+
+    import org.apache.cxf.jaxrs.client.WebClient;
+    import org.apache.openejb.jee.WebApp;
+    import org.apache.openejb.junit.ApplicationComposer;
+    import org.apache.openejb.testing.Classes;
+    import org.apache.openejb.testing.EnableServices;
+    import org.apache.openejb.testing.Module;
+    import org.junit.Test;
+    import org.junit.runner.RunWith;
+
+    import java.io.IOException;
+
+    import static org.junit.Assert.assertEquals;
+
+    @EnableServices(value = "jaxrs")
+    @RunWith(ApplicationComposer.class)
+    public class EmailServiceTest {
+
+        @Module
+        @Classes(EmailService.class)
+        public WebApp app() {
+            return new WebApp().contextRoot("test");
+        }
+
+        @Test
+        public void post() throws IOException {
+            final String message = WebClient.create("http://localhost:4204").path("/test/email/").post("Hello Tomitribe", String.class);
+            assertEquals("Failed to send message: Unknown SMTP host: your.mailserver.host", message);
+        }
+    }
+
+#Running
+
+Running the example is fairly simple. In the "javamail-api" directory run:
+
+    $ mvn clean install
+
+Which should create output like the following.
+
+    INFO - Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
+    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    INFO - Creating TransactionManager(id=Default Transaction Manager)
+    INFO - Creating SecurityService(id=Default Security Service)
+    INFO - Initializing network services
+    INFO - Creating ServerService(id=cxf-rs)
+    INFO - Creating ServerService(id=httpejbd)
+    INFO - Created ServicePool 'httpejbd' with (10) core threads, limited to (200) threads with a queue of (9)
+    INFO - Initializing network services
+    INFO -   ** Bound Services **
+    INFO -   NAME                 IP              PORT
+    INFO -   httpejbd             127.0.0.1       4204
+    INFO - -------
+    INFO - Ready!
+    INFO - Configuring enterprise application: D:\github\tomee\examples\javamail\EmailServiceTest
+    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+    INFO - Auto-creating a container for bean org.superbiz.rest.EmailServiceTest: Container(type=MANAGED, id=Default Managed Container)
+    INFO - Creating Container(id=Default Managed Container)
+    INFO - Using directory D:\windows\tmp for stateful session passivation
+    INFO - Configuring Service(id=comp/DefaultManagedExecutorService, type=Resource, provider-id=Default Executor Service)
+    INFO - Auto-creating a Resource with id 'comp/DefaultManagedExecutorService' of type 'javax.enterprise.concurrent.ManagedExecutorService for 'test'.
+    INFO - Configuring Service(id=comp/DefaultManagedScheduledExecutorService, type=Resource, provider-id=Default Scheduled Executor Service)
+    INFO - Auto-creating a Resource with id 'comp/DefaultManagedScheduledExecutorService' of type 'javax.enterprise.concurrent.ManagedScheduledExecutorService for 'test'.
+    INFO - Configuring Service(id=comp/DefaultManagedThreadFactory, type=Resource, provider-id=Default Managed Thread Factory)
+    INFO - Auto-creating a Resource with id 'comp/DefaultManagedThreadFactory' of type 'javax.enterprise.concurrent.ManagedThreadFactory for 'test'.
+    INFO - Enterprise application "D:\github\tomee\examples\javamail\EmailServiceTest" loaded.
+    INFO - Creating dedicated application classloader for EmailServiceTest
+    INFO - Assembling app: D:\github\tomee\examples\javamail\EmailServiceTest
+    INFO - Using providers:
+    INFO -      org.apache.johnzon.jaxrs.JohnzonProvider@2687f956
+    INFO -      org.apache.cxf.jaxrs.provider.JAXBElementProvider@1ded7b14
+    INFO -      org.apache.johnzon.jaxrs.JsrProvider@29be7749
+    INFO -      org.apache.johnzon.jaxrs.WadlDocumentMessageBodyWriter@5f84abe8
+    INFO -      org.apache.openejb.server.cxf.rs.EJBAccessExceptionMapper@4650a407
+    INFO -      org.apache.cxf.jaxrs.validation.ValidationExceptionMapper@30135202
+    INFO - REST Application: http://127.0.0.1:4204/test/       -> org.apache.openejb.server.rest.InternalApplication
+    INFO -      Service URI: http://127.0.0.1:4204/test/email  -> Pojo org.superbiz.rest.EmailService
+    INFO -              POST http://127.0.0.1:4204/test/email/ ->      String lowerCase(String)
+    INFO - Deployed Application(path=D:\github\tomee\examples\javamail\EmailServiceTest)
+    DEBUG: JavaMail version 1.4ea
+    DEBUG: java.io.FileNotFoundException: D:\java\jdk8\jre\lib\javamail.providers (The system cannot find the file specified)
+    DEBUG: !anyLoaded
+    DEBUG: not loading resource: /META-INF/javamail.providers
+    DEBUG: successfully loaded resource: /META-INF/javamail.default.providers
+    DEBUG: Tables of loaded providers
+    DEBUG: Providers Listed By Class Name: {com.sun.mail.smtp.SMTPSSLTransport=javax.mail.Provider[TRANSPORT,smtps,com.sun.mail.smtp.SMTPSSLTransport,Sun Microsystems, Inc], com.sun.mail.smtp.SMTPTransport=javax.mail.Provider[TRANSPORT,smtp,com.sun.mail.smtp.SMTPTransport,Sun Microsystems, Inc], com.sun.mail.imap.IMAPSSLStore=javax.mail.Provider[STORE,imaps,com.sun.mail.imap.IMAPSSLStore,Sun Microsystems, Inc], com.sun.mail.pop3.POP3SSLStore=javax.mail.Provider[STORE,pop3s,com.sun.mail.pop3.POP3SSLStore,Sun Microsystems, Inc], com.sun.mail.imap.IMAPStore=javax.mail.Provider[STORE,imap,com.sun.mail.imap.IMAPStore,Sun Microsystems, Inc], com.sun.mail.pop3.POP3Store=javax.mail.Provider[STORE,pop3,com.sun.mail.pop3.POP3Store,Sun Microsystems, Inc]}
+    DEBUG: Providers Listed By Protocol: {imaps=javax.mail.Provider[STORE,imaps,com.sun.mail.imap.IMAPSSLStore,Sun Microsystems, Inc], imap=javax.mail.Provider[STORE,imap,com.sun.mail.imap.IMAPStore,Sun Microsystems, Inc], smtps=javax.mail.Provider[TRANSPORT,smtps,com.sun.mail.smtp.SMTPSSLTransport,Sun Microsystems, Inc], pop3=javax.mail.Provider[STORE,pop3,com.sun.mail.pop3.POP3Store,Sun Microsystems, Inc], pop3s=javax.mail.Provider[STORE,pop3s,com.sun.mail.pop3.POP3SSLStore,Sun Microsystems, Inc], smtp=javax.mail.Provider[TRANSPORT,smtp,com.sun.mail.smtp.SMTPTransport,Sun Microsystems, Inc]}
+    DEBUG: successfully loaded resource: /META-INF/javamail.default.address.map
+    DEBUG: !anyLoaded
+    DEBUG: not loading resource: /META-INF/javamail.address.map
+    DEBUG: java.io.FileNotFoundException: D:\java\jdk8\jre\lib\javamail.address.map (The system cannot find the file specified)
+    DEBUG: setDebug: JavaMail version 1.4ea
+    DEBUG: getProvider() returning javax.mail.Provider[TRANSPORT,smtp,com.sun.mail.smtp.SMTPTransport,Sun Microsystems, Inc]
+    DEBUG SMTP: useEhlo true, useAuth false
+    DEBUG SMTP: trying to connect to host "your.mailserver.host", port 25, isSSL false
+    INFO - Undeploying app: D:\github\tomee\examples\javamail\EmailServiceTest
+    INFO - Stopping network services
+    INFO - Stopping server services
+
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/javamail/src/main/java/org/superbiz/rest/EmailService.java
----------------------------------------------------------------------
diff --git a/examples/javamail/src/main/java/org/superbiz/rest/EmailService.java b/examples/javamail/src/main/java/org/superbiz/rest/EmailService.java
index 5d037a9..0b33681 100644
--- a/examples/javamail/src/main/java/org/superbiz/rest/EmailService.java
+++ b/examples/javamail/src/main/java/org/superbiz/rest/EmailService.java
@@ -1,72 +1,72 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.rest;
-
-import javax.mail.Authenticator;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import java.util.Date;
-import java.util.Properties;
-
-@Path("/email")
-public class EmailService {
-
-    @POST
-    public String lowerCase(final String message) {
-
-        try {
-
-            //Create some properties and get the default Session
-            final Properties props = new Properties();
-            props.put("mail.smtp.host", "your.mailserver.host");
-            props.put("mail.debug", "true");
-
-            final Session session = Session.getInstance(props, new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication("MyUsername", "MyPassword");
-                }
-            });
-
-            //Set this just to see some internal logging
-            session.setDebug(true);
-
-            //Create a message
-            final MimeMessage msg = new MimeMessage(session);
-            msg.setFrom(new InternetAddress("your@email.address"));
-            final InternetAddress[] address = {new InternetAddress("general@tomitribe.com")};
-            msg.setRecipients(Message.RecipientType.TO, address);
-            msg.setSubject("JavaMail API test");
-            msg.setSentDate(new Date());
-            msg.setText(message, "UTF-8");
-
-
-            Transport.send(msg);
-        } catch (final MessagingException e) {
-            return "Failed to send message: " + e.getMessage();
-        }
-
-        return "Sent";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.rest;
+
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import java.util.Date;
+import java.util.Properties;
+
+@Path("/email")
+public class EmailService {
+
+    @POST
+    public String lowerCase(final String message) {
+
+        try {
+
+            //Create some properties and get the default Session
+            final Properties props = new Properties();
+            props.put("mail.smtp.host", "your.mailserver.host");
+            props.put("mail.debug", "true");
+
+            final Session session = Session.getInstance(props, new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication("MyUsername", "MyPassword");
+                }
+            });
+
+            //Set this just to see some internal logging
+            session.setDebug(true);
+
+            //Create a message
+            final MimeMessage msg = new MimeMessage(session);
+            msg.setFrom(new InternetAddress("your@email.address"));
+            final InternetAddress[] address = {new InternetAddress("general@tomitribe.com")};
+            msg.setRecipients(Message.RecipientType.TO, address);
+            msg.setSubject("JavaMail API test");
+            msg.setSentDate(new Date());
+            msg.setText(message, "UTF-8");
+
+
+            Transport.send(msg);
+        } catch (final MessagingException e) {
+            return "Failed to send message: " + e.getMessage();
+        }
+
+        return "Sent";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/javamail/src/test/java/org/superbiz/rest/EmailServiceTest.java
----------------------------------------------------------------------
diff --git a/examples/javamail/src/test/java/org/superbiz/rest/EmailServiceTest.java b/examples/javamail/src/test/java/org/superbiz/rest/EmailServiceTest.java
index 53798f8..de52865 100644
--- a/examples/javamail/src/test/java/org/superbiz/rest/EmailServiceTest.java
+++ b/examples/javamail/src/test/java/org/superbiz/rest/EmailServiceTest.java
@@ -1,47 +1,47 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.rest;
-
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.openejb.jee.WebApp;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Classes;
-import org.apache.openejb.testing.EnableServices;
-import org.apache.openejb.testing.Module;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-
-@EnableServices(value = "jaxrs")
-@RunWith(ApplicationComposer.class)
-public class EmailServiceTest {
-
-    @Module
-    @Classes(EmailService.class)
-    public WebApp app() {
-        return new WebApp().contextRoot("test");
-    }
-
-    @Test
-    public void post() throws IOException {
-        final String message = WebClient.create("http://localhost:4204").path("/test/email/").post("Hello Tomitribe", String.class);
-        assertEquals("Failed to send message: Unknown SMTP host: your.mailserver.host", message);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.rest;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.openejb.jee.WebApp;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+
+@EnableServices(value = "jaxrs")
+@RunWith(ApplicationComposer.class)
+public class EmailServiceTest {
+
+    @Module
+    @Classes(EmailService.class)
+    public WebApp app() {
+        return new WebApp().contextRoot("test");
+    }
+
+    @Test
+    public void post() throws IOException {
+        final String message = WebClient.create("http://localhost:4204").path("/test/email/").post("Hello Tomitribe", String.class);
+        assertEquals("Failed to send message: Unknown SMTP host: your.mailserver.host", message);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java
----------------------------------------------------------------------
diff --git a/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java b/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java
index f2b119c..150e56f 100644
--- a/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java
+++ b/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java
@@ -1,68 +1,68 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.eclipselink;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-public class Movie {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long id;
-
-    private String director;
-    private String title;
-    private int year;
-
-    public Movie() {
-    }
-
-    public Movie(String director, String title, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.eclipselink;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Movie {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    private String director;
+    private String title;
+    private int year;
+
+    public Movie() {
+    }
+
+    public Movie(String director, String title, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movies.java
----------------------------------------------------------------------
diff --git a/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movies.java b/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movies.java
index af0e412..e716152 100644
--- a/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movies.java
+++ b/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movies.java
@@ -1,45 +1,45 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.eclipselink;
-
-import javax.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Query;
-import java.util.List;
-
-@Stateful
-public class Movies {
-
-    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
-    private EntityManager entityManager;
-
-    public void addMovie(Movie movie) throws Exception {
-        entityManager.persist(movie);
-    }
-
-    public void deleteMovie(Movie movie) throws Exception {
-        entityManager.remove(movie);
-    }
-
-    public List<Movie> getMovies() throws Exception {
-        Query query = entityManager.createQuery("SELECT m from Movie as m");
-        return query.getResultList();
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.eclipselink;
+
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
+import java.util.List;
+
+@Stateful
+public class Movies {
+
+    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
+    private EntityManager entityManager;
+
+    public void addMovie(Movie movie) throws Exception {
+        entityManager.persist(movie);
+    }
+
+    public void deleteMovie(Movie movie) throws Exception {
+        entityManager.remove(movie);
+    }
+
+    public List<Movie> getMovies() throws Exception {
+        Query query = entityManager.createQuery("SELECT m from Movie as m");
+        return query.getResultList();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-eclipselink/src/test/java/org/superbiz/eclipselink/MoviesTest.java
----------------------------------------------------------------------
diff --git a/examples/jpa-eclipselink/src/test/java/org/superbiz/eclipselink/MoviesTest.java b/examples/jpa-eclipselink/src/test/java/org/superbiz/eclipselink/MoviesTest.java
index c6584148..f661b2d 100644
--- a/examples/jpa-eclipselink/src/test/java/org/superbiz/eclipselink/MoviesTest.java
+++ b/examples/jpa-eclipselink/src/test/java/org/superbiz/eclipselink/MoviesTest.java
@@ -1,54 +1,54 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.eclipselink;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
- */
-public class MoviesTest extends TestCase {
-
-    public void test() throws Exception {
-        Properties p = new Properties();
-        p.put("movieDatabase", "new://Resource?type=DataSource");
-        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-        final Context context = EJBContainer.createEJBContainer(p).getContext();
-
-        Movies movies = (Movies) context.lookup("java:global/jpa-eclipselink/Movies");
-
-        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
-        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
-
-        List<Movie> list = movies.getMovies();
-        assertEquals("List.size()", 3, list.size());
-
-        for (Movie movie : list) {
-            movies.deleteMovie(movie);
-        }
-
-        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.eclipselink;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
+ */
+public class MoviesTest extends TestCase {
+
+    public void test() throws Exception {
+        Properties p = new Properties();
+        p.put("movieDatabase", "new://Resource?type=DataSource");
+        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+        final Context context = EJBContainer.createEJBContainer(p).getContext();
+
+        Movies movies = (Movies) context.lookup("java:global/jpa-eclipselink/Movies");
+
+        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
+        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+        List<Movie> list = movies.getMovies();
+        assertEquals("List.size()", 3, list.size());
+
+        for (Movie movie : list) {
+            movies.deleteMovie(movie);
+        }
+
+        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movie.java
----------------------------------------------------------------------
diff --git a/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movie.java b/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movie.java
index 1e1c21f..b76c269 100644
--- a/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movie.java
+++ b/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movie.java
@@ -1,79 +1,79 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.jpa.enums;
-
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class Movie {
-
-    @Id
-    @GeneratedValue
-    private int id;
-    private String director;
-    private String title;
-    private int year;
-
-    @Enumerated(EnumType.STRING)
-    private Rating rating;
-
-    public Movie() {
-    }
-
-    public Movie(String director, String title, int year, Rating rating) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-        this.rating = rating;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-    public Rating getRating() {
-        return rating;
-    }
-
-    public void setRating(Rating rating) {
-        this.rating = rating;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.jpa.enums;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Movie {
+
+    @Id
+    @GeneratedValue
+    private int id;
+    private String director;
+    private String title;
+    private int year;
+
+    @Enumerated(EnumType.STRING)
+    private Rating rating;
+
+    public Movie() {
+    }
+
+    public Movie(String director, String title, int year, Rating rating) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+        this.rating = rating;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+    public Rating getRating() {
+        return rating;
+    }
+
+    public void setRating(Rating rating) {
+        this.rating = rating;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movies.java
----------------------------------------------------------------------
diff --git a/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movies.java b/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movies.java
index 46fc1c0..b152d29 100644
--- a/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movies.java
+++ b/examples/jpa-enumerated/src/main/java/org/superbiz/jpa/enums/Movies.java
@@ -1,54 +1,54 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.jpa.enums;
-
-//START SNIPPET: code
-
-import javax.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Query;
-import java.util.List;
-
-@Stateful
-public class Movies {
-
-    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
-    private EntityManager entityManager;
-
-    public void addMovie(Movie movie) {
-        entityManager.persist(movie);
-    }
-
-    public void deleteMovie(Movie movie) {
-        entityManager.remove(movie);
-    }
-
-    public List<Movie> findByRating(Rating rating) {
-        final Query query = entityManager.createQuery("SELECT m FROM Movie as m WHERE m.rating = :rating");
-        query.setParameter("rating", rating);
-        return query.getResultList();
-    }
-
-    public List<Movie> getMovies() throws Exception {
-        Query query = entityManager.createQuery("SELECT m from Movie as m");
-        return query.getResultList();
-    }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.jpa.enums;
+
+//START SNIPPET: code
+
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
+import java.util.List;
+
+@Stateful
+public class Movies {
+
+    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
+    private EntityManager entityManager;
+
+    public void addMovie(Movie movie) {
+        entityManager.persist(movie);
+    }
+
+    public void deleteMovie(Movie movie) {
+        entityManager.remove(movie);
+    }
+
+    public List<Movie> findByRating(Rating rating) {
+        final Query query = entityManager.createQuery("SELECT m FROM Movie as m WHERE m.rating = :rating");
+        query.setParameter("rating", rating);
+        return query.getResultList();
+    }
+
+    public List<Movie> getMovies() throws Exception {
+        Query query = entityManager.createQuery("SELECT m from Movie as m");
+        return query.getResultList();
+    }
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java
----------------------------------------------------------------------
diff --git a/examples/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java b/examples/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java
index dd90258..69ced20 100644
--- a/examples/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java
+++ b/examples/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java
@@ -1,54 +1,54 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.jpa.enums;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.Properties;
-
-public class MoviesTest extends TestCase {
-
-    public void test() throws Exception {
-
-        final Properties p = new Properties();
-        p.put("movieDatabase", "new://Resource?type=DataSource");
-        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-        EJBContainer container = EJBContainer.createEJBContainer(p);
-        final Context context = container.getContext();
-
-        final Movies movies = (Movies) context.lookup("java:global/jpa-enumerated/Movies");
-
-        movies.addMovie(new Movie("James Frawley", "The Muppet Movie", 1979, Rating.G));
-        movies.addMovie(new Movie("Jim Henson", "The Great Muppet Caper", 1981, Rating.G));
-        movies.addMovie(new Movie("Frank Oz", "The Muppets Take Manhattan", 1984, Rating.G));
-        movies.addMovie(new Movie("James Bobin", "The Muppets", 2011, Rating.PG));
-
-        assertEquals("List.size()", 4, movies.getMovies().size());
-
-        assertEquals("List.size()", 3, movies.findByRating(Rating.G).size());
-
-        assertEquals("List.size()", 1, movies.findByRating(Rating.PG).size());
-
-        assertEquals("List.size()", 0, movies.findByRating(Rating.R).size());
-
-        container.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.jpa.enums;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.Properties;
+
+public class MoviesTest extends TestCase {
+
+    public void test() throws Exception {
+
+        final Properties p = new Properties();
+        p.put("movieDatabase", "new://Resource?type=DataSource");
+        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+        EJBContainer container = EJBContainer.createEJBContainer(p);
+        final Context context = container.getContext();
+
+        final Movies movies = (Movies) context.lookup("java:global/jpa-enumerated/Movies");
+
+        movies.addMovie(new Movie("James Frawley", "The Muppet Movie", 1979, Rating.G));
+        movies.addMovie(new Movie("Jim Henson", "The Great Muppet Caper", 1981, Rating.G));
+        movies.addMovie(new Movie("Frank Oz", "The Muppets Take Manhattan", 1984, Rating.G));
+        movies.addMovie(new Movie("James Bobin", "The Muppets", 2011, Rating.PG));
+
+        assertEquals("List.size()", 4, movies.getMovies().size());
+
+        assertEquals("List.size()", 3, movies.findByRating(Rating.G).size());
+
+        assertEquals("List.size()", 1, movies.findByRating(Rating.PG).size());
+
+        assertEquals("List.size()", 0, movies.findByRating(Rating.R).size());
+
+        container.close();
+    }
+}


[07/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java
index b22dc08..86c6b89 100755
--- a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java
+++ b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java
@@ -1,107 +1,107 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamicdatasourcerouting;
-
-import org.apache.openejb.resource.jdbc.router.AbstractRouter;
-
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class DeterminedRouter extends AbstractRouter {
-
-    private String dataSourceNames;
-    private String defaultDataSourceName;
-    private Map<String, DataSource> dataSources = null;
-    private ThreadLocal<DataSource> currentDataSource = new ThreadLocal<DataSource>();
-
-    /**
-     * @param datasourceList datasource resource name, separator is a space
-     */
-    public void setDataSourceNames(String datasourceList) {
-        dataSourceNames = datasourceList;
-    }
-
-    /**
-     * lookup datasource in openejb resources
-     */
-    private void init() {
-        dataSources = new ConcurrentHashMap<String, DataSource>();
-        for (String ds : dataSourceNames.split(" ")) {
-            try {
-                Object o = getOpenEJBResource(ds);
-                if (o instanceof DataSource) {
-                    dataSources.put(ds, DataSource.class.cast(o));
-                }
-            } catch (NamingException e) {
-                // ignored
-            }
-        }
-    }
-
-    /**
-     * @return the user selected data source if it is set
-     *         or the default one
-     * @throws IllegalArgumentException if the data source is not found
-     */
-    @Override
-    public DataSource getDataSource() {
-        // lazy init of routed datasources
-        if (dataSources == null) {
-            init();
-        }
-
-        // if no datasource is selected use the default one
-        if (currentDataSource.get() == null) {
-            if (dataSources.containsKey(defaultDataSourceName)) {
-                return dataSources.get(defaultDataSourceName);
-
-            } else {
-                throw new IllegalArgumentException("you have to specify at least one datasource");
-            }
-        }
-
-        // the developper set the datasource to use
-        return currentDataSource.get();
-    }
-
-    /**
-     * @param datasourceName data source name
-     */
-    public void setDataSource(String datasourceName) {
-        if (dataSources == null) {
-            init();
-        }
-        if (!dataSources.containsKey(datasourceName)) {
-            throw new IllegalArgumentException("data source called " + datasourceName + " can't be found.");
-        }
-        DataSource ds = dataSources.get(datasourceName);
-        currentDataSource.set(ds);
-    }
-
-    /**
-     * reset the data source
-     */
-    public void clear() {
-        currentDataSource.remove();
-    }
-
-    public void setDefaultDataSourceName(String name) {
-        this.defaultDataSourceName = name;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamicdatasourcerouting;
+
+import org.apache.openejb.resource.jdbc.router.AbstractRouter;
+
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class DeterminedRouter extends AbstractRouter {
+
+    private String dataSourceNames;
+    private String defaultDataSourceName;
+    private Map<String, DataSource> dataSources = null;
+    private ThreadLocal<DataSource> currentDataSource = new ThreadLocal<DataSource>();
+
+    /**
+     * @param datasourceList datasource resource name, separator is a space
+     */
+    public void setDataSourceNames(String datasourceList) {
+        dataSourceNames = datasourceList;
+    }
+
+    /**
+     * lookup datasource in openejb resources
+     */
+    private void init() {
+        dataSources = new ConcurrentHashMap<String, DataSource>();
+        for (String ds : dataSourceNames.split(" ")) {
+            try {
+                Object o = getOpenEJBResource(ds);
+                if (o instanceof DataSource) {
+                    dataSources.put(ds, DataSource.class.cast(o));
+                }
+            } catch (NamingException e) {
+                // ignored
+            }
+        }
+    }
+
+    /**
+     * @return the user selected data source if it is set
+     *         or the default one
+     * @throws IllegalArgumentException if the data source is not found
+     */
+    @Override
+    public DataSource getDataSource() {
+        // lazy init of routed datasources
+        if (dataSources == null) {
+            init();
+        }
+
+        // if no datasource is selected use the default one
+        if (currentDataSource.get() == null) {
+            if (dataSources.containsKey(defaultDataSourceName)) {
+                return dataSources.get(defaultDataSourceName);
+
+            } else {
+                throw new IllegalArgumentException("you have to specify at least one datasource");
+            }
+        }
+
+        // the developper set the datasource to use
+        return currentDataSource.get();
+    }
+
+    /**
+     * @param datasourceName data source name
+     */
+    public void setDataSource(String datasourceName) {
+        if (dataSources == null) {
+            init();
+        }
+        if (!dataSources.containsKey(datasourceName)) {
+            throw new IllegalArgumentException("data source called " + datasourceName + " can't be found.");
+        }
+        DataSource ds = dataSources.get(datasourceName);
+        currentDataSource.set(ds);
+    }
+
+    /**
+     * reset the data source
+     */
+    public void clear() {
+        currentDataSource.remove();
+    }
+
+    public void setDefaultDataSourceName(String name) {
+        this.defaultDataSourceName = name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/Person.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/Person.java b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/Person.java
index 00e3b89..636ed2a 100755
--- a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/Person.java
+++ b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/Person.java
@@ -1,53 +1,53 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamicdatasourcerouting;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class Person {
-
-    @Id
-    private long id;
-    private String name;
-
-    public Person() {
-        // no-op
-    }
-
-    public Person(int i, String n) {
-        id = i;
-        name = n;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamicdatasourcerouting;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class Person {
+
+    @Id
+    private long id;
+    private String name;
+
+    public Person() {
+        // no-op
+    }
+
+    public Person(int i, String n) {
+        id = i;
+        name = n;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/RoutedPersister.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/RoutedPersister.java b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/RoutedPersister.java
index d2398a6..13b862b 100755
--- a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/RoutedPersister.java
+++ b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/RoutedPersister.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamicdatasourcerouting;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-@Stateless
-public class RoutedPersister {
-
-    @PersistenceContext(unitName = "router")
-    private EntityManager em;
-
-    @Resource(name = "My Router", type = DeterminedRouter.class)
-    private DeterminedRouter router;
-
-    public void persist(int id, String name, String ds) {
-        router.setDataSource(ds);
-        em.persist(new Person(id, name));
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamicdatasourcerouting;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+@Stateless
+public class RoutedPersister {
+
+    @PersistenceContext(unitName = "router")
+    private EntityManager em;
+
+    @Resource(name = "My Router", type = DeterminedRouter.class)
+    private DeterminedRouter router;
+
+    public void persist(int id, String name, String ds) {
+        router.setDataSource(ds);
+        em.persist(new Person(id, name));
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-implementation/src/main/java/org/superbiz/dynamic/SocialInterceptor.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-implementation/src/main/java/org/superbiz/dynamic/SocialInterceptor.java b/examples/dynamic-implementation/src/main/java/org/superbiz/dynamic/SocialInterceptor.java
index d43c4e0..3e0a748 100644
--- a/examples/dynamic-implementation/src/main/java/org/superbiz/dynamic/SocialInterceptor.java
+++ b/examples/dynamic-implementation/src/main/java/org/superbiz/dynamic/SocialInterceptor.java
@@ -1,40 +1,40 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamic;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-public class SocialInterceptor {
-
-    @AroundInvoke
-    public Object around(InvocationContext context) throws Exception {
-        String mtd = context.getMethod().getName();
-        String address;
-        if (mtd.toLowerCase().contains("facebook")) {
-            address = "http://www.facebook.com";
-        } else if (mtd.toLowerCase().contains("twitter")) {
-            address = "http://twitter.com";
-        } else {
-            address = "no website for you";
-        }
-
-        System.out.println("go on " + address);
-        return context.proceed();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamic;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+public class SocialInterceptor {
+
+    @AroundInvoke
+    public Object around(InvocationContext context) throws Exception {
+        String mtd = context.getMethod().getName();
+        String address;
+        if (mtd.toLowerCase().contains("facebook")) {
+            address = "http://www.facebook.com";
+        } else if (mtd.toLowerCase().contains("twitter")) {
+            address = "http://twitter.com";
+        } else {
+            address = "no website for you";
+        }
+
+        System.out.println("go on " + address);
+        return context.proceed();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java b/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java
index d07a705..63046da 100644
--- a/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java
+++ b/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java
@@ -1,260 +1,260 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamic.mbean;
-
-import javax.annotation.PreDestroy;
-import javax.management.Attribute;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Need a @PreDestroy method to disconnect the remote host when used in remote mode.
- */
-public class DynamicMBeanHandler implements InvocationHandler {
-
-    private final Map<Method, ConnectionInfo> infos = new ConcurrentHashMap<Method, ConnectionInfo>();
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        final String methodName = method.getName();
-        if (method.getDeclaringClass().equals(Object.class) && "toString".equals(methodName)) {
-            return getClass().getSimpleName() + " Proxy";
-        }
-        if (method.getAnnotation(PreDestroy.class) != null) {
-            return destroy();
-        }
-
-        final ConnectionInfo info = getConnectionInfo(method);
-        final MBeanInfo infos = info.getMBeanInfo();
-        if (methodName.startsWith("set") && methodName.length() > 3 && args != null && args.length == 1
-                && (Void.TYPE.equals(method.getReturnType()) || Void.class.equals(method.getReturnType()))) {
-            final String attributeName = attributeName(infos, methodName, method.getParameterTypes()[0]);
-            info.setAttribute(new Attribute(attributeName, args[0]));
-            return null;
-        } else if (methodName.startsWith("get") && (args == null || args.length == 0) && methodName.length() > 3) {
-            final String attributeName = attributeName(infos, methodName, method.getReturnType());
-            return info.getAttribute(attributeName);
-        }
-        // operation
-        return info.invoke(methodName, args, getSignature(method));
-    }
-
-    public Object destroy() {
-        for (ConnectionInfo info : infos.values()) {
-            info.clean();
-        }
-        infos.clear();
-        return null;
-    }
-
-    private String[] getSignature(Method method) {
-        String[] args = new String[method.getParameterTypes().length];
-        for (int i = 0; i < method.getParameterTypes().length; i++) {
-            args[i] = method.getParameterTypes()[i].getName();
-        }
-        return args; // note: null should often work...
-    }
-
-    private String attributeName(MBeanInfo infos, String methodName, Class<?> type) {
-        String found = null;
-        String foundBackUp = null; // without checking the type
-        final String attributeName = methodName.substring(3, methodName.length());
-        final String lowerName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4, methodName.length());
-
-        for (MBeanAttributeInfo attribute : infos.getAttributes()) {
-            final String name = attribute.getName();
-            if (attributeName.equals(name)) {
-                foundBackUp = attributeName;
-                if (attribute.getType().equals(type.getName())) {
-                    found = name;
-                }
-            } else if (found == null && ((lowerName.equals(name) && !attributeName.equals(name))
-                    || lowerName.equalsIgnoreCase(name))) {
-                foundBackUp = name;
-                if (attribute.getType().equals(type.getName())) {
-                    found = name;
-                }
-            }
-        }
-
-        if (found == null && foundBackUp == null) {
-            throw new UnsupportedOperationException("cannot find attribute " + attributeName);
-        }
-
-        if (found != null) {
-            return found;
-        }
-        return foundBackUp;
-    }
-
-    private synchronized ConnectionInfo getConnectionInfo(Method method) throws Exception {
-        if (!infos.containsKey(method)) {
-            synchronized (infos) {
-                if (!infos.containsKey(method)) { // double check for synchro
-                    org.superbiz.dynamic.mbean.ObjectName on = method.getAnnotation(org.superbiz.dynamic.mbean.ObjectName.class);
-                    if (on == null) {
-                        Class<?> current = method.getDeclaringClass();
-                        do {
-                            on = method.getDeclaringClass().getAnnotation(org.superbiz.dynamic.mbean.ObjectName.class);
-                            current = current.getSuperclass();
-                        } while (on == null && current != null);
-                        if (on == null) {
-                            throw new UnsupportedOperationException("class or method should define the objectName to use for invocation: " + method.toGenericString());
-                        }
-                    }
-                    final ConnectionInfo info;
-                    if (on.url().isEmpty()) {
-                        info = new LocalConnectionInfo();
-                        ((LocalConnectionInfo) info).server = ManagementFactory.getPlatformMBeanServer(); // could use an id...
-                    } else {
-                        info = new RemoteConnectionInfo();
-                        final Map<String, String[]> environment = new HashMap<String, String[]>();
-                        if (!on.user().isEmpty()) {
-                            environment.put(JMXConnector.CREDENTIALS, new String[]{on.user(), on.password()});
-                        }
-                        // ((RemoteConnectionInfo) info).connector = JMXConnectorFactory.newJMXConnector(new JMXServiceURL(on.url()), environment);
-                        ((RemoteConnectionInfo) info).connector = JMXConnectorFactory.connect(new JMXServiceURL(on.url()), environment);
-
-                    }
-                    info.objectName = new ObjectName(on.value());
-
-                    infos.put(method, info);
-                }
-            }
-        }
-        return infos.get(method);
-    }
-
-    private abstract static class ConnectionInfo {
-
-        protected ObjectName objectName;
-
-        public abstract void setAttribute(Attribute attribute) throws Exception;
-
-        public abstract Object getAttribute(String attribute) throws Exception;
-
-        public abstract Object invoke(String operationName, Object params[], String signature[]) throws Exception;
-
-        public abstract MBeanInfo getMBeanInfo() throws Exception;
-
-        public abstract void clean();
-    }
-
-    private static class LocalConnectionInfo extends ConnectionInfo {
-
-        private MBeanServer server;
-
-        @Override
-        public void setAttribute(Attribute attribute) throws Exception {
-            server.setAttribute(objectName, attribute);
-        }
-
-        @Override
-        public Object getAttribute(String attribute) throws Exception {
-            return server.getAttribute(objectName, attribute);
-        }
-
-        @Override
-        public Object invoke(String operationName, Object[] params, String[] signature) throws Exception {
-            return server.invoke(objectName, operationName, params, signature);
-        }
-
-        @Override
-        public MBeanInfo getMBeanInfo() throws Exception {
-            return server.getMBeanInfo(objectName);
-        }
-
-        @Override
-        public void clean() {
-            // no-op
-        }
-    }
-
-    private static class RemoteConnectionInfo extends ConnectionInfo {
-
-        private JMXConnector connector;
-        private MBeanServerConnection connection;
-
-        private void before() throws IOException {
-            connection = connector.getMBeanServerConnection();
-        }
-
-        private void after() throws IOException {
-            // no-op
-        }
-
-        @Override
-        public void setAttribute(Attribute attribute) throws Exception {
-            before();
-            connection.setAttribute(objectName, attribute);
-            after();
-        }
-
-        @Override
-        public Object getAttribute(String attribute) throws Exception {
-            before();
-            try {
-                return connection.getAttribute(objectName, attribute);
-            } finally {
-                after();
-            }
-        }
-
-        @Override
-        public Object invoke(String operationName, Object[] params, String[] signature) throws Exception {
-            before();
-            try {
-                return connection.invoke(objectName, operationName, params, signature);
-            } finally {
-                after();
-            }
-        }
-
-        @Override
-        public MBeanInfo getMBeanInfo() throws Exception {
-            before();
-            try {
-                return connection.getMBeanInfo(objectName);
-            } finally {
-                after();
-            }
-        }
-
-        @Override
-        public void clean() {
-            try {
-                connector.close();
-            } catch (IOException e) {
-                // no-op
-            }
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamic.mbean;
+
+import javax.annotation.PreDestroy;
+import javax.management.Attribute;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanInfo;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Need a @PreDestroy method to disconnect the remote host when used in remote mode.
+ */
+public class DynamicMBeanHandler implements InvocationHandler {
+
+    private final Map<Method, ConnectionInfo> infos = new ConcurrentHashMap<Method, ConnectionInfo>();
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        final String methodName = method.getName();
+        if (method.getDeclaringClass().equals(Object.class) && "toString".equals(methodName)) {
+            return getClass().getSimpleName() + " Proxy";
+        }
+        if (method.getAnnotation(PreDestroy.class) != null) {
+            return destroy();
+        }
+
+        final ConnectionInfo info = getConnectionInfo(method);
+        final MBeanInfo infos = info.getMBeanInfo();
+        if (methodName.startsWith("set") && methodName.length() > 3 && args != null && args.length == 1
+                && (Void.TYPE.equals(method.getReturnType()) || Void.class.equals(method.getReturnType()))) {
+            final String attributeName = attributeName(infos, methodName, method.getParameterTypes()[0]);
+            info.setAttribute(new Attribute(attributeName, args[0]));
+            return null;
+        } else if (methodName.startsWith("get") && (args == null || args.length == 0) && methodName.length() > 3) {
+            final String attributeName = attributeName(infos, methodName, method.getReturnType());
+            return info.getAttribute(attributeName);
+        }
+        // operation
+        return info.invoke(methodName, args, getSignature(method));
+    }
+
+    public Object destroy() {
+        for (ConnectionInfo info : infos.values()) {
+            info.clean();
+        }
+        infos.clear();
+        return null;
+    }
+
+    private String[] getSignature(Method method) {
+        String[] args = new String[method.getParameterTypes().length];
+        for (int i = 0; i < method.getParameterTypes().length; i++) {
+            args[i] = method.getParameterTypes()[i].getName();
+        }
+        return args; // note: null should often work...
+    }
+
+    private String attributeName(MBeanInfo infos, String methodName, Class<?> type) {
+        String found = null;
+        String foundBackUp = null; // without checking the type
+        final String attributeName = methodName.substring(3, methodName.length());
+        final String lowerName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4, methodName.length());
+
+        for (MBeanAttributeInfo attribute : infos.getAttributes()) {
+            final String name = attribute.getName();
+            if (attributeName.equals(name)) {
+                foundBackUp = attributeName;
+                if (attribute.getType().equals(type.getName())) {
+                    found = name;
+                }
+            } else if (found == null && ((lowerName.equals(name) && !attributeName.equals(name))
+                    || lowerName.equalsIgnoreCase(name))) {
+                foundBackUp = name;
+                if (attribute.getType().equals(type.getName())) {
+                    found = name;
+                }
+            }
+        }
+
+        if (found == null && foundBackUp == null) {
+            throw new UnsupportedOperationException("cannot find attribute " + attributeName);
+        }
+
+        if (found != null) {
+            return found;
+        }
+        return foundBackUp;
+    }
+
+    private synchronized ConnectionInfo getConnectionInfo(Method method) throws Exception {
+        if (!infos.containsKey(method)) {
+            synchronized (infos) {
+                if (!infos.containsKey(method)) { // double check for synchro
+                    org.superbiz.dynamic.mbean.ObjectName on = method.getAnnotation(org.superbiz.dynamic.mbean.ObjectName.class);
+                    if (on == null) {
+                        Class<?> current = method.getDeclaringClass();
+                        do {
+                            on = method.getDeclaringClass().getAnnotation(org.superbiz.dynamic.mbean.ObjectName.class);
+                            current = current.getSuperclass();
+                        } while (on == null && current != null);
+                        if (on == null) {
+                            throw new UnsupportedOperationException("class or method should define the objectName to use for invocation: " + method.toGenericString());
+                        }
+                    }
+                    final ConnectionInfo info;
+                    if (on.url().isEmpty()) {
+                        info = new LocalConnectionInfo();
+                        ((LocalConnectionInfo) info).server = ManagementFactory.getPlatformMBeanServer(); // could use an id...
+                    } else {
+                        info = new RemoteConnectionInfo();
+                        final Map<String, String[]> environment = new HashMap<String, String[]>();
+                        if (!on.user().isEmpty()) {
+                            environment.put(JMXConnector.CREDENTIALS, new String[]{on.user(), on.password()});
+                        }
+                        // ((RemoteConnectionInfo) info).connector = JMXConnectorFactory.newJMXConnector(new JMXServiceURL(on.url()), environment);
+                        ((RemoteConnectionInfo) info).connector = JMXConnectorFactory.connect(new JMXServiceURL(on.url()), environment);
+
+                    }
+                    info.objectName = new ObjectName(on.value());
+
+                    infos.put(method, info);
+                }
+            }
+        }
+        return infos.get(method);
+    }
+
+    private abstract static class ConnectionInfo {
+
+        protected ObjectName objectName;
+
+        public abstract void setAttribute(Attribute attribute) throws Exception;
+
+        public abstract Object getAttribute(String attribute) throws Exception;
+
+        public abstract Object invoke(String operationName, Object params[], String signature[]) throws Exception;
+
+        public abstract MBeanInfo getMBeanInfo() throws Exception;
+
+        public abstract void clean();
+    }
+
+    private static class LocalConnectionInfo extends ConnectionInfo {
+
+        private MBeanServer server;
+
+        @Override
+        public void setAttribute(Attribute attribute) throws Exception {
+            server.setAttribute(objectName, attribute);
+        }
+
+        @Override
+        public Object getAttribute(String attribute) throws Exception {
+            return server.getAttribute(objectName, attribute);
+        }
+
+        @Override
+        public Object invoke(String operationName, Object[] params, String[] signature) throws Exception {
+            return server.invoke(objectName, operationName, params, signature);
+        }
+
+        @Override
+        public MBeanInfo getMBeanInfo() throws Exception {
+            return server.getMBeanInfo(objectName);
+        }
+
+        @Override
+        public void clean() {
+            // no-op
+        }
+    }
+
+    private static class RemoteConnectionInfo extends ConnectionInfo {
+
+        private JMXConnector connector;
+        private MBeanServerConnection connection;
+
+        private void before() throws IOException {
+            connection = connector.getMBeanServerConnection();
+        }
+
+        private void after() throws IOException {
+            // no-op
+        }
+
+        @Override
+        public void setAttribute(Attribute attribute) throws Exception {
+            before();
+            connection.setAttribute(objectName, attribute);
+            after();
+        }
+
+        @Override
+        public Object getAttribute(String attribute) throws Exception {
+            before();
+            try {
+                return connection.getAttribute(objectName, attribute);
+            } finally {
+                after();
+            }
+        }
+
+        @Override
+        public Object invoke(String operationName, Object[] params, String[] signature) throws Exception {
+            before();
+            try {
+                return connection.invoke(objectName, operationName, params, signature);
+            } finally {
+                after();
+            }
+        }
+
+        @Override
+        public MBeanInfo getMBeanInfo() throws Exception {
+            before();
+            try {
+                return connection.getMBeanInfo(objectName);
+            } finally {
+                after();
+            }
+        }
+
+        @Override
+        public void clean() {
+            try {
+                connector.close();
+            } catch (IOException e) {
+                // no-op
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java b/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java
index 69c4ab1..305db5b 100644
--- a/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java
+++ b/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamic.mbean;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-public @interface ObjectName {
-
-    String value();
-
-    // for remote usage only
-    String url() default "";
-
-    String user() default "";
-
-    String password() default "";
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamic.mbean;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+public @interface ObjectName {
+
+    String value();
+
+    // for remote usage only
+    String url() default "";
+
+    String user() default "";
+
+    String password() default "";
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java
index 57a16cf..ee772f4 100644
--- a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java
+++ b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java
@@ -1,36 +1,36 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamic.mbean;
-
-import org.apache.openejb.api.Proxy;
-
-import javax.ejb.Singleton;
-
-@Singleton
-@Proxy(DynamicMBeanHandler.class)
-@ObjectName(DynamicMBeanClient.OBJECT_NAME)
-public interface DynamicMBeanClient {
-
-    static final String OBJECT_NAME = "test:group=DynamicMBeanClientTest";
-
-    int getCounter();
-
-    void setCounter(int i);
-
-    int length(String aString);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamic.mbean;
+
+import org.apache.openejb.api.Proxy;
+
+import javax.ejb.Singleton;
+
+@Singleton
+@Proxy(DynamicMBeanHandler.class)
+@ObjectName(DynamicMBeanClient.OBJECT_NAME)
+public interface DynamicMBeanClient {
+
+    static final String OBJECT_NAME = "test:group=DynamicMBeanClientTest";
+
+    int getCounter();
+
+    void setCounter(int i);
+
+    int length(String aString);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java
index 81da560..50f4668 100644
--- a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java
+++ b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java
@@ -1,108 +1,108 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamic.mbean;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.superbiz.dynamic.mbean.simple.Simple;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-import javax.management.Attribute;
-import javax.management.ObjectName;
-import java.lang.management.ManagementFactory;
-
-import static org.junit.Assert.assertEquals;
-
-public class DynamicMBeanClientTest {
-
-    private static ObjectName objectName;
-    private static EJBContainer container;
-
-    @EJB
-    private DynamicMBeanClient localClient;
-    @EJB
-    private DynamicRemoteMBeanClient remoteClient;
-
-    @BeforeClass
-    public static void start() {
-        container = EJBContainer.createEJBContainer();
-    }
-
-    @Before
-    public void injectAndRegisterMBean() throws Exception {
-        container.getContext().bind("inject", this);
-        objectName = new ObjectName(DynamicMBeanClient.OBJECT_NAME);
-        ManagementFactory.getPlatformMBeanServer().registerMBean(new Simple(), objectName);
-    }
-
-    @After
-    public void unregisterMBean() throws Exception {
-        if (objectName != null) {
-            ManagementFactory.getPlatformMBeanServer().unregisterMBean(objectName);
-        }
-    }
-
-    @Test
-    public void localGet() throws Exception {
-        assertEquals(0, localClient.getCounter());
-        ManagementFactory.getPlatformMBeanServer().setAttribute(objectName, new Attribute("Counter", 5));
-        assertEquals(5, localClient.getCounter());
-    }
-
-    @Test
-    public void localSet() throws Exception {
-        assertEquals(0, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
-        localClient.setCounter(8);
-        assertEquals(8, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
-    }
-
-    @Test
-    public void localOperation() {
-        assertEquals(7, localClient.length("openejb"));
-    }
-
-    @Test
-    public void remoteGet() throws Exception {
-        assertEquals(0, remoteClient.getCounter());
-        ManagementFactory.getPlatformMBeanServer().setAttribute(objectName, new Attribute("Counter", 5));
-        assertEquals(5, remoteClient.getCounter());
-    }
-
-    @Test
-    public void remoteSet() throws Exception {
-        assertEquals(0, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
-        remoteClient.setCounter(8);
-        assertEquals(8, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
-    }
-
-    @Test
-    public void remoteOperation() {
-        assertEquals(7, remoteClient.length("openejb"));
-    }
-
-    @AfterClass
-    public static void close() {
-        if (container != null) {
-            container.close();
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamic.mbean;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.superbiz.dynamic.mbean.simple.Simple;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+import javax.management.Attribute;
+import javax.management.ObjectName;
+import java.lang.management.ManagementFactory;
+
+import static org.junit.Assert.assertEquals;
+
+public class DynamicMBeanClientTest {
+
+    private static ObjectName objectName;
+    private static EJBContainer container;
+
+    @EJB
+    private DynamicMBeanClient localClient;
+    @EJB
+    private DynamicRemoteMBeanClient remoteClient;
+
+    @BeforeClass
+    public static void start() {
+        container = EJBContainer.createEJBContainer();
+    }
+
+    @Before
+    public void injectAndRegisterMBean() throws Exception {
+        container.getContext().bind("inject", this);
+        objectName = new ObjectName(DynamicMBeanClient.OBJECT_NAME);
+        ManagementFactory.getPlatformMBeanServer().registerMBean(new Simple(), objectName);
+    }
+
+    @After
+    public void unregisterMBean() throws Exception {
+        if (objectName != null) {
+            ManagementFactory.getPlatformMBeanServer().unregisterMBean(objectName);
+        }
+    }
+
+    @Test
+    public void localGet() throws Exception {
+        assertEquals(0, localClient.getCounter());
+        ManagementFactory.getPlatformMBeanServer().setAttribute(objectName, new Attribute("Counter", 5));
+        assertEquals(5, localClient.getCounter());
+    }
+
+    @Test
+    public void localSet() throws Exception {
+        assertEquals(0, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
+        localClient.setCounter(8);
+        assertEquals(8, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
+    }
+
+    @Test
+    public void localOperation() {
+        assertEquals(7, localClient.length("openejb"));
+    }
+
+    @Test
+    public void remoteGet() throws Exception {
+        assertEquals(0, remoteClient.getCounter());
+        ManagementFactory.getPlatformMBeanServer().setAttribute(objectName, new Attribute("Counter", 5));
+        assertEquals(5, remoteClient.getCounter());
+    }
+
+    @Test
+    public void remoteSet() throws Exception {
+        assertEquals(0, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
+        remoteClient.setCounter(8);
+        assertEquals(8, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
+    }
+
+    @Test
+    public void remoteOperation() {
+        assertEquals(7, remoteClient.length("openejb"));
+    }
+
+    @AfterClass
+    public static void close() {
+        if (container != null) {
+            container.close();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java
index d626517..f93befe 100644
--- a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java
+++ b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java
@@ -1,40 +1,40 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamic.mbean;
-
-import org.apache.openejb.api.Proxy;
-
-import javax.annotation.PreDestroy;
-import javax.ejb.Singleton;
-
-@Singleton
-@Proxy(DynamicMBeanHandler.class)
-@ObjectName(value = DynamicRemoteMBeanClient.OBJECT_NAME, url = "service:jmx:rmi:///jndi/rmi://localhost:8243/jmxrmi")
-public interface DynamicRemoteMBeanClient {
-
-    static final String OBJECT_NAME = "test:group=DynamicMBeanClientTest";
-
-    int getCounter();
-
-    void setCounter(int i);
-
-    int length(String aString);
-
-    @PreDestroy
-    void clean();
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamic.mbean;
+
+import org.apache.openejb.api.Proxy;
+
+import javax.annotation.PreDestroy;
+import javax.ejb.Singleton;
+
+@Singleton
+@Proxy(DynamicMBeanHandler.class)
+@ObjectName(value = DynamicRemoteMBeanClient.OBJECT_NAME, url = "service:jmx:rmi:///jndi/rmi://localhost:8243/jmxrmi")
+public interface DynamicRemoteMBeanClient {
+
+    static final String OBJECT_NAME = "test:group=DynamicMBeanClientTest";
+
+    int getCounter();
+
+    void setCounter(int i);
+
+    int length(String aString);
+
+    @PreDestroy
+    void clean();
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java
index aaceacf..ff51482 100644
--- a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java
+++ b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java
@@ -1,41 +1,41 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamic.mbean.simple;
-
-public class Simple implements SimpleMBean {
-
-    private int counter = 0;
-
-    @Override
-    public int length(String s) {
-        if (s == null) {
-            return 0;
-        }
-        return s.length();
-    }
-
-    @Override
-    public int getCounter() {
-        return counter;
-    }
-
-    @Override
-    public void setCounter(int c) {
-        counter = c;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamic.mbean.simple;
+
+public class Simple implements SimpleMBean {
+
+    private int counter = 0;
+
+    @Override
+    public int length(String s) {
+        if (s == null) {
+            return 0;
+        }
+        return s.length();
+    }
+
+    @Override
+    public int getCounter() {
+        return counter;
+    }
+
+    @Override
+    public void setCounter(int c) {
+        counter = c;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java
index 0b4b8de..95f698e 100644
--- a/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java
+++ b/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java
@@ -1,27 +1,27 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dynamic.mbean.simple;
-
-public interface SimpleMBean {
-
-    int length(String s);
-
-    int getCounter();
-
-    void setCounter(int c);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dynamic.mbean.simple;
+
+public interface SimpleMBean {
+
+    int length(String s);
+
+    int getCounter();
+
+    void setCounter(int c);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ear-testing/README.md
----------------------------------------------------------------------
diff --git a/examples/ear-testing/README.md b/examples/ear-testing/README.md
index ab6c2ab..0ca8f8f 100644
--- a/examples/ear-testing/README.md
+++ b/examples/ear-testing/README.md
@@ -1,212 +1,212 @@
-Title: EAR Testing
-
-The goal of this example is to demonstrate how maven projects might be organized in a more real world style and how testing with OpenEJB can fit into that structure.
-
-This example takes the basic moviefun code we us in many of examples and splits it into two modules:
-
- - `business-logic`
- - `business-model`
-
-As the names imply, we keep our `@Entity` beans in the `business-model` module and our session beans in the `business-logic` model.  The tests located and run from the business logic module.
-
-    ear-testing
-    ear-testing/business-logic
-    ear-testing/business-logic/pom.xml
-    ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java
-    ear-testing/business-logic/src/main/java/org/superbiz/logic/MoviesImpl.java
-    ear-testing/business-logic/src/main/resources
-    ear-testing/business-logic/src/main/resources/META-INF
-    ear-testing/business-logic/src/main/resources/META-INF/ejb-jar.xml
-    ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java
-    ear-testing/business-model
-    ear-testing/business-model/pom.xml
-    ear-testing/business-model/src/main/java/org/superbiz/model/Movie.java
-    ear-testing/business-model/src/main/resources/META-INF/persistence.xml
-    ear-testing/pom.xml
-
-# Project configuration
-
-The parent pom, trimmed to the minimum, looks like so:
-
-    <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>
-      <groupId>org.superbiz</groupId>
-      <artifactId>myear</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-
-      <packaging>pom</packaging>
-
-      <modules>
-        <module>business-model</module>
-        <module>business-logic</module>
-      </modules>
-
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>6.0-2</version>
-          </dependency>
-          <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </project>
-
-The `business-model/pom.xml` as follows:
-
-    <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">
-      <parent>
-        <groupId>org.superbiz</groupId>
-        <artifactId>myear</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-      </parent>
-
-      <modelVersion>4.0.0</modelVersion>
-
-      <artifactId>business-model</artifactId>
-      <packaging>jar</packaging>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>javaee-api</artifactId>
-          <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-        </dependency>
-
-      </dependencies>
-
-    </project>
-
-And finally, the `business-logic/pom.xml` which is setup to support embedded testing with OpenEJB:
-
-    <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">
-      <parent>
-        <groupId>org.superbiz</groupId>
-        <artifactId>myear</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-      </parent>
-
-      <modelVersion>4.0.0</modelVersion>
-
-      <artifactId>business-logic</artifactId>
-      <packaging>jar</packaging>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.superbiz</groupId>
-          <artifactId>business-model</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>javaee-api</artifactId>
-          <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <!--
-        The <scope>test</scope> guarantees that non of your runtime
-        code is dependent on any OpenEJB classes.
-        -->
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>openejb-core</artifactId>
-          <version>7.0.0-SNAPSHOT</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </project>
-
-# TestCode
-
-The test code is the same as always:
-
-    public class MoviesTest extends TestCase {
-
-        public void test() throws Exception {
-            Properties p = new Properties();
-            p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-
-            p.put("openejb.deployments.classpath.ear", "true");
-
-            p.put("movieDatabase", "new://Resource?type=DataSource");
-            p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-            p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-            p.put("movieDatabaseUnmanaged", "new://Resource?type=DataSource");
-            p.put("movieDatabaseUnmanaged.JdbcDriver", "org.hsqldb.jdbcDriver");
-            p.put("movieDatabaseUnmanaged.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-            p.put("movieDatabaseUnmanaged.JtaManaged", "false");
-
-            Context context = new InitialContext(p);
-
-            Movies movies = (Movies) context.lookup("MoviesLocal");
-
-            movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-            movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
-            movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
-
-            List<Movie> list = movies.getMovies();
-            assertEquals("List.size()", 3, list.size());
-
-            for (Movie movie : list) {
-                movies.deleteMovie(movie);
-            }
-
-            assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
-        }
-    }
-
-
-# Running
-
-
-    -------------------------------------------------------
-     T E S T S
-    -------------------------------------------------------
-    Running org.superbiz.logic.MoviesTest
-    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20111002-04:06
-    http://tomee.apache.org/
-    INFO - openejb.home = /Users/dblevins/examples/ear-testing/business-logic
-    INFO - openejb.base = /Users/dblevins/examples/ear-testing/business-logic
-    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
-    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    INFO - Configuring Service(id=movieDatabaseUnmanaged, type=Resource, provider-id=Default JDBC Database)
-    INFO - Configuring Service(id=movieDatabase, type=Resource, provider-id=Default JDBC Database)
-    INFO - Found PersistenceModule in classpath: /Users/dblevins/examples/ear-testing/business-model/target/business-model-1.0.jar
-    INFO - Found EjbModule in classpath: /Users/dblevins/examples/ear-testing/business-logic/target/classes
-    INFO - Using 'openejb.deployments.classpath.ear=true'
-    INFO - Beginning load: /Users/dblevins/examples/ear-testing/business-model/target/business-model-1.0.jar
-    INFO - Beginning load: /Users/dblevins/examples/ear-testing/business-logic/target/classes
-    INFO - Configuring enterprise application: /Users/dblevins/examples/ear-testing/business-logic/classpath.ear
-    INFO - Configuring Service(id=Default Stateful Container, type=Container, provider-id=Default Stateful Container)
-    INFO - Auto-creating a container for bean Movies: Container(type=STATEFUL, id=Default Stateful Container)
-    INFO - Configuring PersistenceUnit(name=movie-unit)
-    INFO - Enterprise application "/Users/dblevins/examples/ear-testing/business-logic/classpath.ear" loaded.
-    INFO - Assembling app: /Users/dblevins/examples/ear-testing/business-logic/classpath.ear
-    INFO - PersistenceUnit(name=movie-unit, provider=org.apache.openjpa.persistence.PersistenceProviderImpl) - provider time 415ms
-    INFO - Jndi(name=MoviesLocal) --> Ejb(deployment-id=Movies)
-    INFO - Jndi(name=global/classpath.ear/business-logic/Movies!org.superbiz.logic.Movies) --> Ejb(deployment-id=Movies)
-    INFO - Jndi(name=global/classpath.ear/business-logic/Movies) --> Ejb(deployment-id=Movies)
-    INFO - Created Ejb(deployment-id=Movies, ejb-name=Movies, container=Default Stateful Container)
-    INFO - Started Ejb(deployment-id=Movies, ejb-name=Movies, container=Default Stateful Container)
-    INFO - Deployed Application(path=/Users/dblevins/examples/ear-testing/business-logic/classpath.ear)
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.393 sec
-
-    Results :
-
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+Title: EAR Testing
+
+The goal of this example is to demonstrate how maven projects might be organized in a more real world style and how testing with OpenEJB can fit into that structure.
+
+This example takes the basic moviefun code we us in many of examples and splits it into two modules:
+
+ - `business-logic`
+ - `business-model`
+
+As the names imply, we keep our `@Entity` beans in the `business-model` module and our session beans in the `business-logic` model.  The tests located and run from the business logic module.
+
+    ear-testing
+    ear-testing/business-logic
+    ear-testing/business-logic/pom.xml
+    ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java
+    ear-testing/business-logic/src/main/java/org/superbiz/logic/MoviesImpl.java
+    ear-testing/business-logic/src/main/resources
+    ear-testing/business-logic/src/main/resources/META-INF
+    ear-testing/business-logic/src/main/resources/META-INF/ejb-jar.xml
+    ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java
+    ear-testing/business-model
+    ear-testing/business-model/pom.xml
+    ear-testing/business-model/src/main/java/org/superbiz/model/Movie.java
+    ear-testing/business-model/src/main/resources/META-INF/persistence.xml
+    ear-testing/pom.xml
+
+# Project configuration
+
+The parent pom, trimmed to the minimum, looks like so:
+
+    <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>
+      <groupId>org.superbiz</groupId>
+      <artifactId>myear</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+
+      <packaging>pom</packaging>
+
+      <modules>
+        <module>business-model</module>
+        <module>business-logic</module>
+      </modules>
+
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>6.0-2</version>
+          </dependency>
+          <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </project>
+
+The `business-model/pom.xml` as follows:
+
+    <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">
+      <parent>
+        <groupId>org.superbiz</groupId>
+        <artifactId>myear</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+      </parent>
+
+      <modelVersion>4.0.0</modelVersion>
+
+      <artifactId>business-model</artifactId>
+      <packaging>jar</packaging>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.openejb</groupId>
+          <artifactId>javaee-api</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <scope>test</scope>
+        </dependency>
+
+      </dependencies>
+
+    </project>
+
+And finally, the `business-logic/pom.xml` which is setup to support embedded testing with OpenEJB:
+
+    <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">
+      <parent>
+        <groupId>org.superbiz</groupId>
+        <artifactId>myear</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+      </parent>
+
+      <modelVersion>4.0.0</modelVersion>
+
+      <artifactId>business-logic</artifactId>
+      <packaging>jar</packaging>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.superbiz</groupId>
+          <artifactId>business-model</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.openejb</groupId>
+          <artifactId>javaee-api</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <!--
+        The <scope>test</scope> guarantees that non of your runtime
+        code is dependent on any OpenEJB classes.
+        -->
+        <dependency>
+          <groupId>org.apache.openejb</groupId>
+          <artifactId>openejb-core</artifactId>
+          <version>7.0.0-SNAPSHOT</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </project>
+
+# TestCode
+
+The test code is the same as always:
+
+    public class MoviesTest extends TestCase {
+
+        public void test() throws Exception {
+            Properties p = new Properties();
+            p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
+
+            p.put("openejb.deployments.classpath.ear", "true");
+
+            p.put("movieDatabase", "new://Resource?type=DataSource");
+            p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+            p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+            p.put("movieDatabaseUnmanaged", "new://Resource?type=DataSource");
+            p.put("movieDatabaseUnmanaged.JdbcDriver", "org.hsqldb.jdbcDriver");
+            p.put("movieDatabaseUnmanaged.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+            p.put("movieDatabaseUnmanaged.JtaManaged", "false");
+
+            Context context = new InitialContext(p);
+
+            Movies movies = (Movies) context.lookup("MoviesLocal");
+
+            movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+            movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
+            movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+            List<Movie> list = movies.getMovies();
+            assertEquals("List.size()", 3, list.size());
+
+            for (Movie movie : list) {
+                movies.deleteMovie(movie);
+            }
+
+            assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+        }
+    }
+
+
+# Running
+
+
+    -------------------------------------------------------
+     T E S T S
+    -------------------------------------------------------
+    Running org.superbiz.logic.MoviesTest
+    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20111002-04:06
+    http://tomee.apache.org/
+    INFO - openejb.home = /Users/dblevins/examples/ear-testing/business-logic
+    INFO - openejb.base = /Users/dblevins/examples/ear-testing/business-logic
+    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    INFO - Configuring Service(id=movieDatabaseUnmanaged, type=Resource, provider-id=Default JDBC Database)
+    INFO - Configuring Service(id=movieDatabase, type=Resource, provider-id=Default JDBC Database)
+    INFO - Found PersistenceModule in classpath: /Users/dblevins/examples/ear-testing/business-model/target/business-model-1.0.jar
+    INFO - Found EjbModule in classpath: /Users/dblevins/examples/ear-testing/business-logic/target/classes
+    INFO - Using 'openejb.deployments.classpath.ear=true'
+    INFO - Beginning load: /Users/dblevins/examples/ear-testing/business-model/target/business-model-1.0.jar
+    INFO - Beginning load: /Users/dblevins/examples/ear-testing/business-logic/target/classes
+    INFO - Configuring enterprise application: /Users/dblevins/examples/ear-testing/business-logic/classpath.ear
+    INFO - Configuring Service(id=Default Stateful Container, type=Container, provider-id=Default Stateful Container)
+    INFO - Auto-creating a container for bean Movies: Container(type=STATEFUL, id=Default Stateful Container)
+    INFO - Configuring PersistenceUnit(name=movie-unit)
+    INFO - Enterprise application "/Users/dblevins/examples/ear-testing/business-logic/classpath.ear" loaded.
+    INFO - Assembling app: /Users/dblevins/examples/ear-testing/business-logic/classpath.ear
+    INFO - PersistenceUnit(name=movie-unit, provider=org.apache.openjpa.persistence.PersistenceProviderImpl) - provider time 415ms
+    INFO - Jndi(name=MoviesLocal) --> Ejb(deployment-id=Movies)
+    INFO - Jndi(name=global/classpath.ear/business-logic/Movies!org.superbiz.logic.Movies) --> Ejb(deployment-id=Movies)
+    INFO - Jndi(name=global/classpath.ear/business-logic/Movies) --> Ejb(deployment-id=Movies)
+    INFO - Created Ejb(deployment-id=Movies, ejb-name=Movies, container=Default Stateful Container)
+    INFO - Started Ejb(deployment-id=Movies, ejb-name=Movies, container=Default Stateful Container)
+    INFO - Deployed Application(path=/Users/dblevins/examples/ear-testing/business-logic/classpath.ear)
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.393 sec
+
+    Results :
+
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java
----------------------------------------------------------------------
diff --git a/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java b/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java
index b5401a0..396e23e 100644
--- a/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java
+++ b/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java
@@ -1,33 +1,33 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.logic;
-
-import org.superbiz.model.Movie;
-
-import java.util.List;
-
-/**
- * @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
- */
-public interface Movies {
-
-    void addMovie(Movie movie) throws Exception;
-
-    void deleteMovie(Movie movie) throws Exception;
-
-    List<Movie> getMovies() throws Exception;
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.logic;
+
+import org.superbiz.model.Movie;
+
+import java.util.List;
+
+/**
+ * @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
+ */
+public interface Movies {
+
+    void addMovie(Movie movie) throws Exception;
+
+    void deleteMovie(Movie movie) throws Exception;
+
+    List<Movie> getMovies() throws Exception;
+}


[41/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java
index 1e9197f..b15a375 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java
@@ -1,309 +1,309 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 The icon type contains small-icon and large-icon elements that
- * specify the file names for small and large GIF or JPEG icon images
- * used to represent the parent element in a GUI tool.
- * <p/>
- * The xml:lang attribute defines the language that the icon file names
- * are provided in. Its value is "en" (English) by default.
- * <p/>
- * <p/>
- * <p/>
- * Java class for IconType complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="IconType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="lang" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="largeIcon" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="smallIcon" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "IconType", propOrder = {"extensions"})
-public class IconType {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String lang;
-    @XmlAttribute
-    protected String largeIcon;
-    @XmlAttribute
-    protected String smallIcon;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the lang property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLang() {
-        return lang;
-    }
-
-    /**
-     * Sets the value of the lang property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLang(final String value) {
-        this.lang = value;
-    }
-
-    /**
-     * Gets the value of the largeIcon property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLargeIcon() {
-        return largeIcon;
-    }
-
-    /**
-     * Sets the value of the largeIcon property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLargeIcon(final String value) {
-        this.largeIcon = value;
-    }
-
-    /**
-     * Gets the value of the smallIcon property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getSmallIcon() {
-        return smallIcon;
-    }
-
-    /**
-     * Sets the value of the smallIcon property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setSmallIcon(final String value) {
-        this.smallIcon = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 The icon type contains small-icon and large-icon elements that
+ * specify the file names for small and large GIF or JPEG icon images
+ * used to represent the parent element in a GUI tool.
+ * <p/>
+ * The xml:lang attribute defines the language that the icon file names
+ * are provided in. Its value is "en" (English) by default.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for IconType complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="IconType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="lang" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="largeIcon" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="smallIcon" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "IconType", propOrder = {"extensions"})
+public class IconType {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String lang;
+    @XmlAttribute
+    protected String largeIcon;
+    @XmlAttribute
+    protected String smallIcon;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the lang property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLang() {
+        return lang;
+    }
+
+    /**
+     * Sets the value of the lang property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLang(final String value) {
+        this.lang = value;
+    }
+
+    /**
+     * Gets the value of the largeIcon property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLargeIcon() {
+        return largeIcon;
+    }
+
+    /**
+     * Sets the value of the largeIcon property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLargeIcon(final String value) {
+        this.largeIcon = value;
+    }
+
+    /**
+     * Gets the value of the smallIcon property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getSmallIcon() {
+        return smallIcon;
+    }
+
+    /**
+     * Sets the value of the smallIcon property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setSmallIcon(final String value) {
+        this.smallIcon = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java
index 31b310a..8126cb5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java
@@ -1,319 +1,319 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * Specifies the run-as identity to be used for the execution of the methods of
- * an enterprise bean. It contains an optional description, and the name of a
- * security role.
- * <p/>
- * <p/>
- * <p/>
- * Java class for Identity complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Identity">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="roleName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Identity", propOrder = {"descriptions", "extensions"})
-public class Identity {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String roleName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the roleName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getRoleName() {
-        return roleName;
-    }
-
-    /**
-     * Sets the value of the roleName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setRoleName(final String value) {
-        this.roleName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * Specifies the run-as identity to be used for the execution of the methods of
+ * an enterprise bean. It contains an optional description, and the name of a
+ * security role.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for Identity complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Identity">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="roleName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Identity", propOrder = {"descriptions", "extensions"})
+public class Identity {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String roleName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the roleName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getRoleName() {
+        return roleName;
+    }
+
+    /**
+     * Sets the value of the roleName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setRoleName(final String value) {
+        this.roleName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/JNDIEnvRefsGroup.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/JNDIEnvRefsGroup.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/JNDIEnvRefsGroup.java
index 78dc001..4968f97 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/JNDIEnvRefsGroup.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/JNDIEnvRefsGroup.java
@@ -1,279 +1,279 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.openejb.jee.was.v6.wsclient.ServiceRef;
-
-/**
- * @since J2EE1.4 This group keeps the usage of the contained JNDI environment
- * reference elements consistent across J2EE deployment descriptors.
- * <p/>
- * <p/>
- * <p/>
- * Java class for JNDIEnvRefsGroup complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="JNDIEnvRefsGroup">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="environmentProperties" type="{common.xmi}EnvEntry"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="resourceRefs" type="{common.xmi}ResourceRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="ejbRefs" type="{common.xmi}EjbRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="resourceEnvRefs" type="{common.xmi}ResourceEnvRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="ejbLocalRefs" type="{common.xmi}EJBLocalRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="messageDestinationRefs" type="{common.xmi}MessageDestinationRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="serviceRefs" type="{webservice_client.xmi}ServiceRef"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JNDIEnvRefsGroup", propOrder = {"environmentProperties",
-    "resourceRefs", "ejbRefs", "resourceEnvRefs", "ejbLocalRefs",
-    "messageDestinationRefs", "serviceRefs"})
-public class JNDIEnvRefsGroup extends CompatibilityDescriptionGroup {
-
-    protected List<EnvEntry> environmentProperties;
-    protected List<ResourceRef> resourceRefs;
-    protected List<EjbRef> ejbRefs;
-    protected List<ResourceEnvRef> resourceEnvRefs;
-    protected List<EJBLocalRef> ejbLocalRefs;
-    protected List<MessageDestinationRef> messageDestinationRefs;
-    protected List<ServiceRef> serviceRefs;
-
-    /**
-     * Gets the value of the environmentProperties 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 environmentProperties property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEnvironmentProperties().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link EnvEntry }
-     */
-    public List<EnvEntry> getEnvironmentProperties() {
-        if (environmentProperties == null) {
-            environmentProperties = new ArrayList<EnvEntry>();
-        }
-        return this.environmentProperties;
-    }
-
-    /**
-     * Gets the value of the resourceRefs 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 resourceRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getResourceRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceRef }
-     */
-    public List<ResourceRef> getResourceRefs() {
-        if (resourceRefs == null) {
-            resourceRefs = new ArrayList<ResourceRef>();
-        }
-        return this.resourceRefs;
-    }
-
-    /**
-     * Gets the value of the ejbRefs 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 ejbRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEjbRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link EjbRef }
-     */
-    public List<EjbRef> getEjbRefs() {
-        if (ejbRefs == null) {
-            ejbRefs = new ArrayList<EjbRef>();
-        }
-        return this.ejbRefs;
-    }
-
-    /**
-     * Gets the value of the resourceEnvRefs 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 resourceEnvRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getResourceEnvRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceEnvRef }
-     */
-    public List<ResourceEnvRef> getResourceEnvRefs() {
-        if (resourceEnvRefs == null) {
-            resourceEnvRefs = new ArrayList<ResourceEnvRef>();
-        }
-        return this.resourceEnvRefs;
-    }
-
-    /**
-     * Gets the value of the ejbLocalRefs 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 ejbLocalRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEjbLocalRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EJBLocalRef }
-     */
-    public List<EJBLocalRef> getEjbLocalRefs() {
-        if (ejbLocalRefs == null) {
-            ejbLocalRefs = new ArrayList<EJBLocalRef>();
-        }
-        return this.ejbLocalRefs;
-    }
-
-    /**
-     * Gets the value of the messageDestinationRefs 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 messageDestinationRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMessageDestinationRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MessageDestinationRef }
-     */
-    public List<MessageDestinationRef> getMessageDestinationRefs() {
-        if (messageDestinationRefs == null) {
-            messageDestinationRefs = new ArrayList<MessageDestinationRef>();
-        }
-        return this.messageDestinationRefs;
-    }
-
-    /**
-     * Gets the value of the serviceRefs 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 serviceRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getServiceRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceRef }
-     */
-    public List<ServiceRef> getServiceRefs() {
-        if (serviceRefs == null) {
-            serviceRefs = new ArrayList<ServiceRef>();
-        }
-        return this.serviceRefs;
-    }
-
-}
+/**
+ * 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.openejb.jee.was.v6.wsclient.ServiceRef;
+
+/**
+ * @since J2EE1.4 This group keeps the usage of the contained JNDI environment
+ * reference elements consistent across J2EE deployment descriptors.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for JNDIEnvRefsGroup complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="JNDIEnvRefsGroup">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="environmentProperties" type="{common.xmi}EnvEntry"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="resourceRefs" type="{common.xmi}ResourceRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="ejbRefs" type="{common.xmi}EjbRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="resourceEnvRefs" type="{common.xmi}ResourceEnvRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="ejbLocalRefs" type="{common.xmi}EJBLocalRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="messageDestinationRefs" type="{common.xmi}MessageDestinationRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="serviceRefs" type="{webservice_client.xmi}ServiceRef"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "JNDIEnvRefsGroup", propOrder = {"environmentProperties",
+    "resourceRefs", "ejbRefs", "resourceEnvRefs", "ejbLocalRefs",
+    "messageDestinationRefs", "serviceRefs"})
+public class JNDIEnvRefsGroup extends CompatibilityDescriptionGroup {
+
+    protected List<EnvEntry> environmentProperties;
+    protected List<ResourceRef> resourceRefs;
+    protected List<EjbRef> ejbRefs;
+    protected List<ResourceEnvRef> resourceEnvRefs;
+    protected List<EJBLocalRef> ejbLocalRefs;
+    protected List<MessageDestinationRef> messageDestinationRefs;
+    protected List<ServiceRef> serviceRefs;
+
+    /**
+     * Gets the value of the environmentProperties 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 environmentProperties property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEnvironmentProperties().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link EnvEntry }
+     */
+    public List<EnvEntry> getEnvironmentProperties() {
+        if (environmentProperties == null) {
+            environmentProperties = new ArrayList<EnvEntry>();
+        }
+        return this.environmentProperties;
+    }
+
+    /**
+     * Gets the value of the resourceRefs 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 resourceRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getResourceRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceRef }
+     */
+    public List<ResourceRef> getResourceRefs() {
+        if (resourceRefs == null) {
+            resourceRefs = new ArrayList<ResourceRef>();
+        }
+        return this.resourceRefs;
+    }
+
+    /**
+     * Gets the value of the ejbRefs 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 ejbRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEjbRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link EjbRef }
+     */
+    public List<EjbRef> getEjbRefs() {
+        if (ejbRefs == null) {
+            ejbRefs = new ArrayList<EjbRef>();
+        }
+        return this.ejbRefs;
+    }
+
+    /**
+     * Gets the value of the resourceEnvRefs 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 resourceEnvRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getResourceEnvRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceEnvRef }
+     */
+    public List<ResourceEnvRef> getResourceEnvRefs() {
+        if (resourceEnvRefs == null) {
+            resourceEnvRefs = new ArrayList<ResourceEnvRef>();
+        }
+        return this.resourceEnvRefs;
+    }
+
+    /**
+     * Gets the value of the ejbLocalRefs 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 ejbLocalRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEjbLocalRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EJBLocalRef }
+     */
+    public List<EJBLocalRef> getEjbLocalRefs() {
+        if (ejbLocalRefs == null) {
+            ejbLocalRefs = new ArrayList<EJBLocalRef>();
+        }
+        return this.ejbLocalRefs;
+    }
+
+    /**
+     * Gets the value of the messageDestinationRefs 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 messageDestinationRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMessageDestinationRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MessageDestinationRef }
+     */
+    public List<MessageDestinationRef> getMessageDestinationRefs() {
+        if (messageDestinationRefs == null) {
+            messageDestinationRefs = new ArrayList<MessageDestinationRef>();
+        }
+        return this.messageDestinationRefs;
+    }
+
+    /**
+     * Gets the value of the serviceRefs 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 serviceRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getServiceRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceRef }
+     */
+    public List<ServiceRef> getServiceRefs() {
+        if (serviceRefs == null) {
+            serviceRefs = new ArrayList<ServiceRef>();
+        }
+        return this.serviceRefs;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Listener.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Listener.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Listener.java
index db14ea5..5cb385f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Listener.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Listener.java
@@ -1,111 +1,111 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.java.JavaClass;
-
-/**
- * @since J2EE1.4 moved from webapp
- * <p/>
- * Declares a class in the application must be registered as a web
- * application listener bean.
- * <p/>
- * <p/>
- * <p/>
- * Java class for Listener complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Listener">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="listenerClass" type="{java.xmi}JavaClass"/>
- *       &lt;/choice>
- *       &lt;attribute name="listenerClass" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Listener", propOrder = {"listenerClasses"})
-public class Listener extends CompatibilityDescriptionGroup {
-
-    @XmlElement(name = "listenerClass")
-    protected List<JavaClass> listenerClasses;
-    @XmlAttribute(name = "listenerClass")
-    protected String listenerClassString;
-
-    /**
-     * Gets the value of the listenerClasses 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 listenerClasses property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getListenerClasses().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getListenerClasses() {
-        if (listenerClasses == null) {
-            listenerClasses = new ArrayList<JavaClass>();
-        }
-        return this.listenerClasses;
-    }
-
-    /**
-     * Gets the value of the listenerClassString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getListenerClassString() {
-        return listenerClassString;
-    }
-
-    /**
-     * Sets the value of the listenerClassString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setListenerClassString(final String value) {
-        this.listenerClassString = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.java.JavaClass;
+
+/**
+ * @since J2EE1.4 moved from webapp
+ * <p/>
+ * Declares a class in the application must be registered as a web
+ * application listener bean.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for Listener complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Listener">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="listenerClass" type="{java.xmi}JavaClass"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="listenerClass" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Listener", propOrder = {"listenerClasses"})
+public class Listener extends CompatibilityDescriptionGroup {
+
+    @XmlElement(name = "listenerClass")
+    protected List<JavaClass> listenerClasses;
+    @XmlAttribute(name = "listenerClass")
+    protected String listenerClassString;
+
+    /**
+     * Gets the value of the listenerClasses 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 listenerClasses property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getListenerClasses().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getListenerClasses() {
+        if (listenerClasses == null) {
+            listenerClasses = new ArrayList<JavaClass>();
+        }
+        return this.listenerClasses;
+    }
+
+    /**
+     * Gets the value of the listenerClassString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getListenerClassString() {
+        return listenerClassString;
+    }
+
+    /**
+     * Sets the value of the listenerClassString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setListenerClassString(final String value) {
+        this.listenerClassString = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestination.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestination.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestination.java
index 8f512cb..89efbab 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestination.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestination.java
@@ -1,92 +1,92 @@
-/**
- * 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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @since J2EE1.4 The message-destinationType specifies a message destination.
- * The logical destination described by this element is mapped to a
- * physical destination by the Deployer.
- * <p/>
- * The message destination element contains:
- * <p/>
- * - an optional description - an optional display-name - an optional
- * icon - a message destination name which must be unique among message
- * destination names within the same Deployment File.
- * <p/>
- * Example:
- * <p/>
- * <p/>
- * <pre>
- * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;message-destination xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;message-destination-name&gt;
- *
- * 						CorporateStocks
- *
- * 					&lt;/message-destination-name&gt;
- *
- * 				&lt;/message-destination&gt;
- * </pre>
- * <p/>
- * <p/>
- * <p/>
- * <p/>
- * Java class for MessageDestination complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MessageDestination">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageDestination")
-public class MessageDestination extends CompatibilityDescriptionGroup {
-
-    @XmlAttribute
-    protected String name;
-
-    /**
-     * 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;
-    }
-
-}
+/**
+ * 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @since J2EE1.4 The message-destinationType specifies a message destination.
+ * The logical destination described by this element is mapped to a
+ * physical destination by the Deployer.
+ * <p/>
+ * The message destination element contains:
+ * <p/>
+ * - an optional description - an optional display-name - an optional
+ * icon - a message destination name which must be unique among message
+ * destination names within the same Deployment File.
+ * <p/>
+ * Example:
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;message-destination xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;message-destination-name&gt;
+ *
+ * 						CorporateStocks
+ *
+ * 					&lt;/message-destination-name&gt;
+ *
+ * 				&lt;/message-destination&gt;
+ * </pre>
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for MessageDestination complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MessageDestination">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageDestination")
+public class MessageDestination extends CompatibilityDescriptionGroup {
+
+    @XmlAttribute
+    protected String name;
+
+    /**
+     * 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;
+    }
+
+}


[20/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java
index f87cb61..1c8d109 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java
@@ -1,434 +1,434 @@
-/**
- * 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.was.v6.xmi;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-/**
- * <p/>
- * Java class for Difference complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Difference">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="target">
- *             &lt;complexType>
- *               &lt;complexContent>
- *                 &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   &lt;choice maxOccurs="unbounded" minOccurs="0">
- *                     &lt;any/>
- *                   &lt;/choice>
- *                 &lt;/restriction>
- *               &lt;/complexContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="difference" type="{http://www.omg.org/XMI}Difference"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="container" type="{http://www.omg.org/XMI}Difference"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="container" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
- *       &lt;attribute name="target" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Difference", propOrder = {"differenceTargets", "differences",
-    "differenceContainers"})
-public class Difference {
-
-    @XmlElement(name = "target")
-    protected List<Difference.Target> differenceTargets;
-    @XmlElement(name = "difference")
-    protected List<Difference> differences;
-    @XmlElement(name = "container")
-    protected List<Difference> differenceContainers;
-    @XmlAttribute(name = "container")
-    @XmlIDREF
-    protected List<Object> containers;
-    @XmlAttribute(name = "target")
-    @XmlIDREF
-    protected List<Object> targets;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the differenceTargets 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 differenceTargets property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDifferenceTargets().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Difference.Target }
-     */
-    public List<Difference.Target> getDifferenceTargets() {
-        if (differenceTargets == null) {
-            differenceTargets = new ArrayList<Difference.Target>();
-        }
-        return this.differenceTargets;
-    }
-
-    /**
-     * Gets the value of the differences 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 differences property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDifferences().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Difference }
-     */
-    public List<Difference> getDifferences() {
-        if (differences == null) {
-            differences = new ArrayList<Difference>();
-        }
-        return this.differences;
-    }
-
-    /**
-     * Gets the value of the differenceContainers 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 differenceContainers property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDifferenceContainers().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Difference }
-     */
-    public List<Difference> getDifferenceContainers() {
-        if (differenceContainers == null) {
-            differenceContainers = new ArrayList<Difference>();
-        }
-        return this.differenceContainers;
-    }
-
-    /**
-     * Gets the value of the containers 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 containers property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getContainers().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Object }
-     */
-    public List<Object> getContainers() {
-        if (containers == null) {
-            containers = new ArrayList<Object>();
-        }
-        return this.containers;
-    }
-
-    /**
-     * Gets the value of the targets 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 targets property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getTargets().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Object }
-     */
-    public List<Object> getTargets() {
-        if (targets == null) {
-            targets = new ArrayList<Object>();
-        }
-        return this.targets;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = value;
-    }
-
-    /**
-     * <p/>
-     * Java class for anonymous complex type.
-     * <p/>
-     * <p/>
-     * The following schema fragment specifies the expected content contained
-     * within this class.
-     * <p/>
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;choice maxOccurs="unbounded" minOccurs="0">
-     *         &lt;any/>
-     *       &lt;/choice>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {"elements"})
-    public static class Target {
-
-        @XmlAnyElement
-        protected List<Element> elements;
-        @XmlAnyAttribute
-        private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-        /**
-         * Gets the value of the elements 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 elements property.
-         * <p/>
-         * <p/>
-         * For example, to add a new item, do as follows:
-         * <p/>
-         * <pre>
-         * getElements().add(newItem);
-         * </pre>
-         * <p/>
-         * <p/>
-         * <p/>
-         * Objects of the following type(s) are allowed in the list
-         * {@link Element }
-         */
-        public List<Element> getElements() {
-            if (elements == null) {
-                elements = new ArrayList<Element>();
-            }
-            return this.elements;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed
-         * property on this class.
-         * <p/>
-         * <p/>
-         * the map is keyed by the name of the attribute and the value is the
-         * string value of the attribute.
-         * <p/>
-         * the map returned by this method is live, and you can add new
-         * attribute by updating the map directly. Because of this design,
-         * there's no setter.
-         *
-         * @return always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-}
+/**
+ * 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.was.v6.xmi;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+/**
+ * <p/>
+ * Java class for Difference complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Difference">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="target">
+ *             &lt;complexType>
+ *               &lt;complexContent>
+ *                 &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *                     &lt;any/>
+ *                   &lt;/choice>
+ *                 &lt;/restriction>
+ *               &lt;/complexContent>
+ *             &lt;/complexType>
+ *           &lt;/element>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="difference" type="{http://www.omg.org/XMI}Difference"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="container" type="{http://www.omg.org/XMI}Difference"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="container" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
+ *       &lt;attribute name="target" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Difference", propOrder = {"differenceTargets", "differences",
+    "differenceContainers"})
+public class Difference {
+
+    @XmlElement(name = "target")
+    protected List<Difference.Target> differenceTargets;
+    @XmlElement(name = "difference")
+    protected List<Difference> differences;
+    @XmlElement(name = "container")
+    protected List<Difference> differenceContainers;
+    @XmlAttribute(name = "container")
+    @XmlIDREF
+    protected List<Object> containers;
+    @XmlAttribute(name = "target")
+    @XmlIDREF
+    protected List<Object> targets;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the differenceTargets 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 differenceTargets property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDifferenceTargets().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Difference.Target }
+     */
+    public List<Difference.Target> getDifferenceTargets() {
+        if (differenceTargets == null) {
+            differenceTargets = new ArrayList<Difference.Target>();
+        }
+        return this.differenceTargets;
+    }
+
+    /**
+     * Gets the value of the differences 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 differences property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDifferences().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Difference }
+     */
+    public List<Difference> getDifferences() {
+        if (differences == null) {
+            differences = new ArrayList<Difference>();
+        }
+        return this.differences;
+    }
+
+    /**
+     * Gets the value of the differenceContainers 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 differenceContainers property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDifferenceContainers().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Difference }
+     */
+    public List<Difference> getDifferenceContainers() {
+        if (differenceContainers == null) {
+            differenceContainers = new ArrayList<Difference>();
+        }
+        return this.differenceContainers;
+    }
+
+    /**
+     * Gets the value of the containers 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 containers property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getContainers().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Object }
+     */
+    public List<Object> getContainers() {
+        if (containers == null) {
+            containers = new ArrayList<Object>();
+        }
+        return this.containers;
+    }
+
+    /**
+     * Gets the value of the targets 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 targets property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getTargets().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Object }
+     */
+    public List<Object> getTargets() {
+        if (targets == null) {
+            targets = new ArrayList<Object>();
+        }
+        return this.targets;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+    /**
+     * <p/>
+     * Java class for anonymous complex type.
+     * <p/>
+     * <p/>
+     * The following schema fragment specifies the expected content contained
+     * within this class.
+     * <p/>
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+     *         &lt;any/>
+     *       &lt;/choice>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {"elements"})
+    public static class Target {
+
+        @XmlAnyElement
+        protected List<Element> elements;
+        @XmlAnyAttribute
+        private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+        /**
+         * Gets the value of the elements 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 elements property.
+         * <p/>
+         * <p/>
+         * For example, to add a new item, do as follows:
+         * <p/>
+         * <pre>
+         * getElements().add(newItem);
+         * </pre>
+         * <p/>
+         * <p/>
+         * <p/>
+         * Objects of the following type(s) are allowed in the list
+         * {@link Element }
+         */
+        public List<Element> getElements() {
+            if (elements == null) {
+                elements = new ArrayList<Element>();
+            }
+            return this.elements;
+        }
+
+        /**
+         * Gets a map that contains attributes that aren't bound to any typed
+         * property on this class.
+         * <p/>
+         * <p/>
+         * the map is keyed by the name of the attribute and the value is the
+         * string value of the attribute.
+         * <p/>
+         * the map returned by this method is live, and you can add new
+         * attribute by updating the map directly. Because of this design,
+         * there's no setter.
+         *
+         * @return always non-null
+         */
+        public Map<QName, String> getOtherAttributes() {
+            return otherAttributes;
+        }
+
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java
index 0702bc8..4006c0e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java
@@ -1,552 +1,552 @@
-/**
- * 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.was.v6.xmi;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-/**
- * <p/>
- * Java class for Documentation complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Documentation">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="contact" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="exporter" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="exporterVersion" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="longDescription" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="shortDescription" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="notice" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="owner" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="contact" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="exporter" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="exporterVersion" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="longDescription" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="notice" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="owner" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="shortDescription" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Documentation", propOrder = {"contacts", "exporters",
-    "exporterVersions", "longDescriptions", "shortDescriptions", "notices",
-    "owners"})
-public class Documentation {
-
-    @XmlElement(name = "contact")
-    protected List<String> contacts;
-    @XmlElement(name = "exporter")
-    protected List<String> exporters;
-    @XmlElement(name = "exporterVersion")
-    protected List<String> exporterVersions;
-    @XmlElement(name = "longDescription")
-    protected List<String> longDescriptions;
-    @XmlElement(name = "shortDescription")
-    protected List<String> shortDescriptions;
-    @XmlElement(name = "notice")
-    protected List<String> notices;
-    @XmlElement(name = "owner")
-    protected List<String> owners;
-    @XmlAttribute
-    protected String contact;
-    @XmlAttribute
-    protected String exporter;
-    @XmlAttribute
-    protected String exporterVersion;
-    @XmlAttribute
-    protected String longDescription;
-    @XmlAttribute
-    protected String notice;
-    @XmlAttribute
-    protected String owner;
-    @XmlAttribute
-    protected String shortDescription;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the contacts 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 contacts property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getContacts().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getContacts() {
-        if (contacts == null) {
-            contacts = new ArrayList<String>();
-        }
-        return this.contacts;
-    }
-
-    /**
-     * Gets the value of the exporters 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 exporters property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExporters().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getExporters() {
-        if (exporters == null) {
-            exporters = new ArrayList<String>();
-        }
-        return this.exporters;
-    }
-
-    /**
-     * Gets the value of the exporterVersions 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 exporterVersions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExporterVersions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getExporterVersions() {
-        if (exporterVersions == null) {
-            exporterVersions = new ArrayList<String>();
-        }
-        return this.exporterVersions;
-    }
-
-    /**
-     * Gets the value of the longDescriptions 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 longDescriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getLongDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getLongDescriptions() {
-        if (longDescriptions == null) {
-            longDescriptions = new ArrayList<String>();
-        }
-        return this.longDescriptions;
-    }
-
-    /**
-     * Gets the value of the shortDescriptions 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 shortDescriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getShortDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getShortDescriptions() {
-        if (shortDescriptions == null) {
-            shortDescriptions = new ArrayList<String>();
-        }
-        return this.shortDescriptions;
-    }
-
-    /**
-     * Gets the value of the notices 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 notices property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getNotices().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getNotices() {
-        if (notices == null) {
-            notices = new ArrayList<String>();
-        }
-        return this.notices;
-    }
-
-    /**
-     * Gets the value of the owners 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 owners property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getOwners().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getOwners() {
-        if (owners == null) {
-            owners = new ArrayList<String>();
-        }
-        return this.owners;
-    }
-
-    /**
-     * Gets the value of the contact property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getContact() {
-        return contact;
-    }
-
-    /**
-     * Sets the value of the contact property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setContact(final String value) {
-        this.contact = value;
-    }
-
-    /**
-     * Gets the value of the exporter property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getExporter() {
-        return exporter;
-    }
-
-    /**
-     * Sets the value of the exporter property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setExporter(final String value) {
-        this.exporter = value;
-    }
-
-    /**
-     * Gets the value of the exporterVersion property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getExporterVersion() {
-        return exporterVersion;
-    }
-
-    /**
-     * Sets the value of the exporterVersion property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setExporterVersion(final String value) {
-        this.exporterVersion = value;
-    }
-
-    /**
-     * Gets the value of the longDescription property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLongDescription() {
-        return longDescription;
-    }
-
-    /**
-     * Sets the value of the longDescription property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLongDescription(final String value) {
-        this.longDescription = value;
-    }
-
-    /**
-     * Gets the value of the notice property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getNotice() {
-        return notice;
-    }
-
-    /**
-     * Sets the value of the notice property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setNotice(final String value) {
-        this.notice = value;
-    }
-
-    /**
-     * Gets the value of the owner property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getOwner() {
-        return owner;
-    }
-
-    /**
-     * Sets the value of the owner property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setOwner(final String value) {
-        this.owner = value;
-    }
-
-    /**
-     * Gets the value of the shortDescription property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    /**
-     * Sets the value of the shortDescription property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setShortDescription(final String value) {
-        this.shortDescription = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.xmi;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+/**
+ * <p/>
+ * Java class for Documentation complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Documentation">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="contact" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="exporter" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="exporterVersion" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="longDescription" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="shortDescription" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="notice" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="owner" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="contact" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="exporter" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="exporterVersion" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="longDescription" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="notice" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="owner" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="shortDescription" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Documentation", propOrder = {"contacts", "exporters",
+    "exporterVersions", "longDescriptions", "shortDescriptions", "notices",
+    "owners"})
+public class Documentation {
+
+    @XmlElement(name = "contact")
+    protected List<String> contacts;
+    @XmlElement(name = "exporter")
+    protected List<String> exporters;
+    @XmlElement(name = "exporterVersion")
+    protected List<String> exporterVersions;
+    @XmlElement(name = "longDescription")
+    protected List<String> longDescriptions;
+    @XmlElement(name = "shortDescription")
+    protected List<String> shortDescriptions;
+    @XmlElement(name = "notice")
+    protected List<String> notices;
+    @XmlElement(name = "owner")
+    protected List<String> owners;
+    @XmlAttribute
+    protected String contact;
+    @XmlAttribute
+    protected String exporter;
+    @XmlAttribute
+    protected String exporterVersion;
+    @XmlAttribute
+    protected String longDescription;
+    @XmlAttribute
+    protected String notice;
+    @XmlAttribute
+    protected String owner;
+    @XmlAttribute
+    protected String shortDescription;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the contacts 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 contacts property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getContacts().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getContacts() {
+        if (contacts == null) {
+            contacts = new ArrayList<String>();
+        }
+        return this.contacts;
+    }
+
+    /**
+     * Gets the value of the exporters 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 exporters property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExporters().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getExporters() {
+        if (exporters == null) {
+            exporters = new ArrayList<String>();
+        }
+        return this.exporters;
+    }
+
+    /**
+     * Gets the value of the exporterVersions 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 exporterVersions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExporterVersions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getExporterVersions() {
+        if (exporterVersions == null) {
+            exporterVersions = new ArrayList<String>();
+        }
+        return this.exporterVersions;
+    }
+
+    /**
+     * Gets the value of the longDescriptions 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 longDescriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getLongDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getLongDescriptions() {
+        if (longDescriptions == null) {
+            longDescriptions = new ArrayList<String>();
+        }
+        return this.longDescriptions;
+    }
+
+    /**
+     * Gets the value of the shortDescriptions 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 shortDescriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getShortDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getShortDescriptions() {
+        if (shortDescriptions == null) {
+            shortDescriptions = new ArrayList<String>();
+        }
+        return this.shortDescriptions;
+    }
+
+    /**
+     * Gets the value of the notices 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 notices property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getNotices().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getNotices() {
+        if (notices == null) {
+            notices = new ArrayList<String>();
+        }
+        return this.notices;
+    }
+
+    /**
+     * Gets the value of the owners 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 owners property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getOwners().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getOwners() {
+        if (owners == null) {
+            owners = new ArrayList<String>();
+        }
+        return this.owners;
+    }
+
+    /**
+     * Gets the value of the contact property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getContact() {
+        return contact;
+    }
+
+    /**
+     * Sets the value of the contact property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setContact(final String value) {
+        this.contact = value;
+    }
+
+    /**
+     * Gets the value of the exporter property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getExporter() {
+        return exporter;
+    }
+
+    /**
+     * Sets the value of the exporter property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setExporter(final String value) {
+        this.exporter = value;
+    }
+
+    /**
+     * Gets the value of the exporterVersion property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getExporterVersion() {
+        return exporterVersion;
+    }
+
+    /**
+     * Sets the value of the exporterVersion property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setExporterVersion(final String value) {
+        this.exporterVersion = value;
+    }
+
+    /**
+     * Gets the value of the longDescription property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLongDescription() {
+        return longDescription;
+    }
+
+    /**
+     * Sets the value of the longDescription property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLongDescription(final String value) {
+        this.longDescription = value;
+    }
+
+    /**
+     * Gets the value of the notice property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getNotice() {
+        return notice;
+    }
+
+    /**
+     * Sets the value of the notice property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setNotice(final String value) {
+        this.notice = value;
+    }
+
+    /**
+     * Gets the value of the owner property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getOwner() {
+        return owner;
+    }
+
+    /**
+     * Sets the value of the owner property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setOwner(final String value) {
+        this.owner = value;
+    }
+
+    /**
+     * Gets the value of the shortDescription property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getShortDescription() {
+        return shortDescription;
+    }
+
+    /**
+     * Sets the value of the shortDescription property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setShortDescription(final String value) {
+        this.shortDescription = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java
index c4df16a..0999699 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java
@@ -1,254 +1,254 @@
-/**
- * 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.was.v6.xmi;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-/**
- * <p/>
- * Java class for Extension complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Extension">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;any/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="extender" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="extenderID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Extension", propOrder = {"elements"})
-public class Extension {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> elements;
-    @XmlAttribute
-    protected String extender;
-    @XmlAttribute
-    protected String extenderID;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the elements 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 elements property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getElements().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getElements() {
-        if (elements == null) {
-            elements = new ArrayList<Object>();
-        }
-        return this.elements;
-    }
-
-    /**
-     * Gets the value of the extender property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getExtender() {
-        return extender;
-    }
-
-    /**
-     * Sets the value of the extender property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setExtender(final String value) {
-        this.extender = value;
-    }
-
-    /**
-     * Gets the value of the extenderID property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getExtenderID() {
-        return extenderID;
-    }
-
-    /**
-     * Sets the value of the extenderID property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setExtenderID(final String value) {
-        this.extenderID = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.xmi;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+/**
+ * <p/>
+ * Java class for Extension complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Extension">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;any/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="extender" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="extenderID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Extension", propOrder = {"elements"})
+public class Extension {
+
+    @XmlAnyElement(lax = true)
+    protected List<Object> elements;
+    @XmlAttribute
+    protected String extender;
+    @XmlAttribute
+    protected String extenderID;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the elements 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 elements property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getElements().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Element }
+     * {@link Object }
+     */
+    public List<Object> getElements() {
+        if (elements == null) {
+            elements = new ArrayList<Object>();
+        }
+        return this.elements;
+    }
+
+    /**
+     * Gets the value of the extender property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getExtender() {
+        return extender;
+    }
+
+    /**
+     * Sets the value of the extender property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setExtender(final String value) {
+        this.extender = value;
+    }
+
+    /**
+     * Gets the value of the extenderID property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getExtenderID() {
+        return extenderID;
+    }
+
+    /**
+     * Sets the value of the extenderID property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setExtenderID(final String value) {
+        this.extenderID = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Import.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Import.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Import.java
index f3983cd..5330cbf 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Import.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Import.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.xmi;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for Import complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Import">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.omg.org/XMI}PackageReference">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Import")
-public class Import extends PackageReference {
-
-}
+/**
+ * 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.was.v6.xmi;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for Import complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Import">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.omg.org/XMI}PackageReference">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Import")
+public class Import extends PackageReference {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/MetaModel.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/MetaModel.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/MetaModel.java
index 70c3db3..ffb1e99 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/MetaModel.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/MetaModel.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.xmi;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for MetaModel complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MetaModel">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.omg.org/XMI}PackageReference">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MetaModel")
-public class MetaModel extends PackageReference {
-
-}
+/**
+ * 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.was.v6.xmi;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for MetaModel complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MetaModel">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.omg.org/XMI}PackageReference">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MetaModel")
+public class MetaModel extends PackageReference {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Model.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Model.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Model.java
index e3518d8..16e4e60 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Model.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Model.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.xmi;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for Model complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Model">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.omg.org/XMI}PackageReference">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Model")
-public class Model extends PackageReference {
-
-}
+/**
+ * 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.was.v6.xmi;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for Model complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Model">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.omg.org/XMI}PackageReference">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Model")
+public class Model extends PackageReference {
+
+}


[24/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java
index 00f3eb2..ab706a3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java
@@ -1,313 +1,313 @@
-/**
- * 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.was.v6.java;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for Block complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Block">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="contents" type="{java.xmi}Block"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Block", propOrder = {"contents", "extensions"})
-public class Block {
-
-    protected List<Block> contents;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected String source;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the contents 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 contents property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getContents().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Block }
-     */
-    public List<Block> getContents() {
-        if (contents == null) {
-            contents = new ArrayList<Block>();
-        }
-        return this.contents;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * 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 source property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getSource() {
-        return source;
-    }
-
-    /**
-     * Sets the value of the source property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setSource(final String value) {
-        this.source = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.java;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for Block complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Block">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="contents" type="{java.xmi}Block"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Block", propOrder = {"contents", "extensions"})
+public class Block {
+
+    protected List<Block> contents;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String source;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the contents 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 contents property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getContents().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Block }
+     */
+    public List<Block> getContents() {
+        if (contents == null) {
+            contents = new ArrayList<Block>();
+        }
+        return this.contents;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * 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 source property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Sets the value of the source property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setSource(final String value) {
+        this.source = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Comment.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Comment.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Comment.java
index 309a555..5a9b5d3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Comment.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Comment.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for Comment complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Comment">
- *   &lt;complexContent>
- *     &lt;extension base="{java.xmi}Block">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Comment")
-public class Comment extends Block {
-
-}
+/**
+ * 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for Comment complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Comment">
+ *   &lt;complexContent>
+ *     &lt;extension base="{java.xmi}Block">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Comment")
+public class Comment extends Block {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Field.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Field.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Field.java
index 3e820d7..7fa1d05 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Field.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Field.java
@@ -1,188 +1,188 @@
-/**
- * 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.was.v6.java;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.ecore.ETypedElement;
-
-/**
- * <p/>
- * Java class for Field complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Field">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ETypedElement">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="initializer" type="{java.xmi}Block"/>
- *       &lt;/choice>
- *       &lt;attribute name="final" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="javaVisibility" type="{java.xmi}JavaVisibilityKind" />
- *       &lt;attribute name="static" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="transient" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="volatile" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Field", propOrder = {"initializers"})
-public class Field extends ETypedElement {
-
-    @XmlElement(name = "initializer")
-    protected List<Block> initializers;
-    @XmlAttribute(name = "final")
-    protected Boolean isFinal;
-    @XmlAttribute
-    protected JavaVisibilityEnum javaVisibility;
-    @XmlAttribute(name = "static")
-    protected Boolean isStatic;
-    @XmlAttribute(name = "transient")
-    protected Boolean isTransient;
-    @XmlAttribute(name = "volatile")
-    protected Boolean isVolatile;
-
-    /**
-     * Gets the value of the initializers 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 initializers property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getInitializers().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Block }
-     */
-    public List<Block> getInitializers() {
-        if (initializers == null) {
-            initializers = new ArrayList<Block>();
-        }
-        return this.initializers;
-    }
-
-    /**
-     * Gets the value of the isFinal property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsFinal() {
-        return isFinal;
-    }
-
-    /**
-     * Sets the value of the isFinal property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsFinal(final Boolean value) {
-        this.isFinal = value;
-    }
-
-    /**
-     * Gets the value of the javaVisibility property.
-     *
-     * @return possible object is {@link JavaVisibilityEnum }
-     */
-    public JavaVisibilityEnum getJavaVisibility() {
-        return javaVisibility;
-    }
-
-    /**
-     * Sets the value of the javaVisibility property.
-     *
-     * @param value allowed object is {@link JavaVisibilityEnum }
-     */
-    public void setJavaVisibility(final JavaVisibilityEnum value) {
-        this.javaVisibility = value;
-    }
-
-    /**
-     * Gets the value of the isStatic property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsStatic() {
-        return isStatic;
-    }
-
-    /**
-     * Sets the value of the isStatic property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsStatic(final Boolean value) {
-        this.isStatic = value;
-    }
-
-    /**
-     * Gets the value of the isTransient property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsTransient() {
-        return isTransient;
-    }
-
-    /**
-     * Sets the value of the isTransient property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsTransient(final Boolean value) {
-        this.isTransient = value;
-    }
-
-    /**
-     * Gets the value of the isVolatile property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsVolatile() {
-        return isVolatile;
-    }
-
-    /**
-     * Sets the value of the isVolatile property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsVolatile(final Boolean value) {
-        this.isVolatile = 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.was.v6.java;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.ecore.ETypedElement;
+
+/**
+ * <p/>
+ * Java class for Field complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Field">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ETypedElement">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="initializer" type="{java.xmi}Block"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="final" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="javaVisibility" type="{java.xmi}JavaVisibilityKind" />
+ *       &lt;attribute name="static" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="transient" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="volatile" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Field", propOrder = {"initializers"})
+public class Field extends ETypedElement {
+
+    @XmlElement(name = "initializer")
+    protected List<Block> initializers;
+    @XmlAttribute(name = "final")
+    protected Boolean isFinal;
+    @XmlAttribute
+    protected JavaVisibilityEnum javaVisibility;
+    @XmlAttribute(name = "static")
+    protected Boolean isStatic;
+    @XmlAttribute(name = "transient")
+    protected Boolean isTransient;
+    @XmlAttribute(name = "volatile")
+    protected Boolean isVolatile;
+
+    /**
+     * Gets the value of the initializers 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 initializers property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getInitializers().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Block }
+     */
+    public List<Block> getInitializers() {
+        if (initializers == null) {
+            initializers = new ArrayList<Block>();
+        }
+        return this.initializers;
+    }
+
+    /**
+     * Gets the value of the isFinal property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsFinal() {
+        return isFinal;
+    }
+
+    /**
+     * Sets the value of the isFinal property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsFinal(final Boolean value) {
+        this.isFinal = value;
+    }
+
+    /**
+     * Gets the value of the javaVisibility property.
+     *
+     * @return possible object is {@link JavaVisibilityEnum }
+     */
+    public JavaVisibilityEnum getJavaVisibility() {
+        return javaVisibility;
+    }
+
+    /**
+     * Sets the value of the javaVisibility property.
+     *
+     * @param value allowed object is {@link JavaVisibilityEnum }
+     */
+    public void setJavaVisibility(final JavaVisibilityEnum value) {
+        this.javaVisibility = value;
+    }
+
+    /**
+     * Gets the value of the isStatic property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsStatic() {
+        return isStatic;
+    }
+
+    /**
+     * Sets the value of the isStatic property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsStatic(final Boolean value) {
+        this.isStatic = value;
+    }
+
+    /**
+     * Gets the value of the isTransient property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsTransient() {
+        return isTransient;
+    }
+
+    /**
+     * Sets the value of the isTransient property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsTransient(final Boolean value) {
+        this.isTransient = value;
+    }
+
+    /**
+     * Gets the value of the isVolatile property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsVolatile() {
+        return isVolatile;
+    }
+
+    /**
+     * Sets the value of the isVolatile property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsVolatile(final Boolean value) {
+        this.isVolatile = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java
index 9c07691..08a817f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java
@@ -1,314 +1,314 @@
-/**
- * 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.was.v6.java;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for Initializer complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Initializer">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="source" type="{java.xmi}Block"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="isStatic" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Initializer", propOrder = {"sources", "extensions"})
-public class Initializer {
-
-    @XmlElement(name = "source")
-    protected List<Block> sources;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected Boolean isStatic;
-    @XmlAttribute
-    protected String source;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the sources 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 sources property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getSources().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Block }
-     */
-    public List<Block> getSources() {
-        if (sources == null) {
-            sources = new ArrayList<Block>();
-        }
-        return this.sources;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the isStatic property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsStatic() {
-        return isStatic;
-    }
-
-    /**
-     * Sets the value of the isStatic property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsStatic(final Boolean value) {
-        this.isStatic = value;
-    }
-
-    /**
-     * Gets the value of the source property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getSource() {
-        return source;
-    }
-
-    /**
-     * Sets the value of the source property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setSource(final String value) {
-        this.source = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.java;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for Initializer complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Initializer">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="source" type="{java.xmi}Block"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="isStatic" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Initializer", propOrder = {"sources", "extensions"})
+public class Initializer {
+
+    @XmlElement(name = "source")
+    protected List<Block> sources;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected Boolean isStatic;
+    @XmlAttribute
+    protected String source;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the sources 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 sources property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getSources().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Block }
+     */
+    public List<Block> getSources() {
+        if (sources == null) {
+            sources = new ArrayList<Block>();
+        }
+        return this.sources;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the isStatic property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsStatic() {
+        return isStatic;
+    }
+
+    /**
+     * Sets the value of the isStatic property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsStatic(final Boolean value) {
+        this.isStatic = value;
+    }
+
+    /**
+     * Gets the value of the source property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Sets the value of the source property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setSource(final String value) {
+        this.source = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaClass.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaClass.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaClass.java
index 73df2a7..7a7b787 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaClass.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaClass.java
@@ -1,514 +1,514 @@
-/**
- * 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.was.v6.java;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.ecore.EClass;
-
-/**
- * <p/>
- * Java class for JavaClass complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="JavaClass">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EClass">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="implementsInterfaces" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="classImport" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="packageImports" type="{java.xmi}JavaPackage"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="fields" type="{java.xmi}Field"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="methods" type="{java.xmi}Method"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="initializers" type="{java.xmi}Initializer"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="declaredClasses" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="declaringClass" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="events" type="{java.xmi}JavaEvent"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="classImport" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="declaredClasses" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="declaringClass" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="final" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="implementsInterfaces" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="kind" type="{java.xmi}TypeKind" />
- *       &lt;attribute name="packageImports" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="public" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JavaClass", propOrder = {"javaClassImplementsInterfaces",
-    "javaClassImports", "javaPackageImports", "fields", "methods",
-    "initializers", "javaDeclaredClasses", "javaDeclaringClasses", "events"})
-public class JavaClass extends EClass {
-
-    @XmlElement(name = "implementsInterfaces")
-    protected List<JavaClass> javaClassImplementsInterfaces;
-    @XmlElement(name = "classImport")
-    protected List<JavaClass> javaClassImports;
-    @XmlElement(name = "packageImports")
-    protected List<JavaPackage> javaPackageImports;
-    protected List<Field> fields;
-    protected List<Method> methods;
-    protected List<Initializer> initializers;
-    @XmlElement(name = "declaredClasses")
-    protected List<JavaClass> javaDeclaredClasses;
-    @XmlElement(name = "declaringClass")
-    protected List<JavaClass> javaDeclaringClasses;
-    protected List<JavaEvent> events;
-    @XmlAttribute
-    protected String classImport;
-    @XmlAttribute
-    protected String declaredClasses;
-    @XmlAttribute
-    protected String declaringClass;
-    @XmlAttribute(name = "final")
-    protected Boolean isFinal;
-    @XmlAttribute
-    protected String implementsInterfaces;
-    @XmlAttribute
-    protected TypeKind kind;
-    @XmlAttribute
-    protected String packageImports;
-    @XmlAttribute(name = "public")
-    protected Boolean isPublic;
-
-    /**
-     * Gets the value of the javaClassImplementsInterfaces 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 javaClassImplementsInterfaces property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getJavaClassImplementsInterfaces().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getJavaClassImplementsInterfaces() {
-        if (javaClassImplementsInterfaces == null) {
-            javaClassImplementsInterfaces = new ArrayList<JavaClass>();
-        }
-        return this.javaClassImplementsInterfaces;
-    }
-
-    /**
-     * Gets the value of the javaClassImports 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 javaClassImports property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getJavaClassImports().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getJavaClassImports() {
-        if (javaClassImports == null) {
-            javaClassImports = new ArrayList<JavaClass>();
-        }
-        return this.javaClassImports;
-    }
-
-    /**
-     * Gets the value of the javaPackageImports 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 javaPackageImports property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getJavaPackageImports().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaPackage }
-     */
-    public List<JavaPackage> getJavaPackageImports() {
-        if (javaPackageImports == null) {
-            javaPackageImports = new ArrayList<JavaPackage>();
-        }
-        return this.javaPackageImports;
-    }
-
-    /**
-     * Gets the value of the fields 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 fields property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getFields().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Field }
-     */
-    public List<Field> getFields() {
-        if (fields == null) {
-            fields = new ArrayList<Field>();
-        }
-        return this.fields;
-    }
-
-    /**
-     * Gets the value of the methods 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 methods property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMethods().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Method }
-     */
-    public List<Method> getMethods() {
-        if (methods == null) {
-            methods = new ArrayList<Method>();
-        }
-        return this.methods;
-    }
-
-    /**
-     * Gets the value of the initializers 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 initializers property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getInitializers().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Initializer }
-     */
-    public List<Initializer> getInitializers() {
-        if (initializers == null) {
-            initializers = new ArrayList<Initializer>();
-        }
-        return this.initializers;
-    }
-
-    /**
-     * Gets the value of the javaDeclaredClasses 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 javaDeclaredClasses property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getJavaDeclaredClasses().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getJavaDeclaredClasses() {
-        if (javaDeclaredClasses == null) {
-            javaDeclaredClasses = new ArrayList<JavaClass>();
-        }
-        return this.javaDeclaredClasses;
-    }
-
-    /**
-     * Gets the value of the javaDeclaringClasses 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 javaDeclaringClasses property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getJavaDeclaringClasses().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getJavaDeclaringClasses() {
-        if (javaDeclaringClasses == null) {
-            javaDeclaringClasses = new ArrayList<JavaClass>();
-        }
-        return this.javaDeclaringClasses;
-    }
-
-    /**
-     * Gets the value of the events 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 events property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEvents().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaEvent }
-     */
-    public List<JavaEvent> getEvents() {
-        if (events == null) {
-            events = new ArrayList<JavaEvent>();
-        }
-        return this.events;
-    }
-
-    /**
-     * Gets the value of the classImport property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getClassImport() {
-        return classImport;
-    }
-
-    /**
-     * Sets the value of the classImport property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setClassImport(final String value) {
-        this.classImport = value;
-    }
-
-    /**
-     * Gets the value of the declaredClasses property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDeclaredClasses() {
-        return declaredClasses;
-    }
-
-    /**
-     * Sets the value of the declaredClasses property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDeclaredClasses(final String value) {
-        this.declaredClasses = value;
-    }
-
-    /**
-     * Gets the value of the declaringClass property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDeclaringClass() {
-        return declaringClass;
-    }
-
-    /**
-     * Sets the value of the declaringClass property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDeclaringClass(final String value) {
-        this.declaringClass = value;
-    }
-
-    /**
-     * Gets the value of the isFinal property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsFinal() {
-        return isFinal;
-    }
-
-    /**
-     * Sets the value of the isFinal property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsFinal(final Boolean value) {
-        this.isFinal = value;
-    }
-
-    /**
-     * Gets the value of the implementsInterfaces property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getImplementsInterfaces() {
-        return implementsInterfaces;
-    }
-
-    /**
-     * Sets the value of the implementsInterfaces property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setImplementsInterfaces(final String value) {
-        this.implementsInterfaces = value;
-    }
-
-    /**
-     * Gets the value of the kind property.
-     *
-     * @return possible object is {@link TypeKind }
-     */
-    public TypeKind getKind() {
-        return kind;
-    }
-
-    /**
-     * Sets the value of the kind property.
-     *
-     * @param value allowed object is {@link TypeKind }
-     */
-    public void setKind(final TypeKind value) {
-        this.kind = value;
-    }
-
-    /**
-     * Gets the value of the packageImports property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getPackageImports() {
-        return packageImports;
-    }
-
-    /**
-     * Sets the value of the packageImports property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setPackageImports(final String value) {
-        this.packageImports = value;
-    }
-
-    /**
-     * Gets the value of the isPublic property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsPublic() {
-        return isPublic;
-    }
-
-    /**
-     * Sets the value of the isPublic property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsPublic(final Boolean value) {
-        this.isPublic = 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.was.v6.java;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.ecore.EClass;
+
+/**
+ * <p/>
+ * Java class for JavaClass complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="JavaClass">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EClass">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="implementsInterfaces" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="classImport" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="packageImports" type="{java.xmi}JavaPackage"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="fields" type="{java.xmi}Field"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="methods" type="{java.xmi}Method"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="initializers" type="{java.xmi}Initializer"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="declaredClasses" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="declaringClass" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="events" type="{java.xmi}JavaEvent"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="classImport" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="declaredClasses" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="declaringClass" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="final" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="implementsInterfaces" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="kind" type="{java.xmi}TypeKind" />
+ *       &lt;attribute name="packageImports" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="public" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "JavaClass", propOrder = {"javaClassImplementsInterfaces",
+    "javaClassImports", "javaPackageImports", "fields", "methods",
+    "initializers", "javaDeclaredClasses", "javaDeclaringClasses", "events"})
+public class JavaClass extends EClass {
+
+    @XmlElement(name = "implementsInterfaces")
+    protected List<JavaClass> javaClassImplementsInterfaces;
+    @XmlElement(name = "classImport")
+    protected List<JavaClass> javaClassImports;
+    @XmlElement(name = "packageImports")
+    protected List<JavaPackage> javaPackageImports;
+    protected List<Field> fields;
+    protected List<Method> methods;
+    protected List<Initializer> initializers;
+    @XmlElement(name = "declaredClasses")
+    protected List<JavaClass> javaDeclaredClasses;
+    @XmlElement(name = "declaringClass")
+    protected List<JavaClass> javaDeclaringClasses;
+    protected List<JavaEvent> events;
+    @XmlAttribute
+    protected String classImport;
+    @XmlAttribute
+    protected String declaredClasses;
+    @XmlAttribute
+    protected String declaringClass;
+    @XmlAttribute(name = "final")
+    protected Boolean isFinal;
+    @XmlAttribute
+    protected String implementsInterfaces;
+    @XmlAttribute
+    protected TypeKind kind;
+    @XmlAttribute
+    protected String packageImports;
+    @XmlAttribute(name = "public")
+    protected Boolean isPublic;
+
+    /**
+     * Gets the value of the javaClassImplementsInterfaces 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 javaClassImplementsInterfaces property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getJavaClassImplementsInterfaces().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getJavaClassImplementsInterfaces() {
+        if (javaClassImplementsInterfaces == null) {
+            javaClassImplementsInterfaces = new ArrayList<JavaClass>();
+        }
+        return this.javaClassImplementsInterfaces;
+    }
+
+    /**
+     * Gets the value of the javaClassImports 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 javaClassImports property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getJavaClassImports().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getJavaClassImports() {
+        if (javaClassImports == null) {
+            javaClassImports = new ArrayList<JavaClass>();
+        }
+        return this.javaClassImports;
+    }
+
+    /**
+     * Gets the value of the javaPackageImports 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 javaPackageImports property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getJavaPackageImports().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaPackage }
+     */
+    public List<JavaPackage> getJavaPackageImports() {
+        if (javaPackageImports == null) {
+            javaPackageImports = new ArrayList<JavaPackage>();
+        }
+        return this.javaPackageImports;
+    }
+
+    /**
+     * Gets the value of the fields 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 fields property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getFields().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Field }
+     */
+    public List<Field> getFields() {
+        if (fields == null) {
+            fields = new ArrayList<Field>();
+        }
+        return this.fields;
+    }
+
+    /**
+     * Gets the value of the methods 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 methods property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMethods().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Method }
+     */
+    public List<Method> getMethods() {
+        if (methods == null) {
+            methods = new ArrayList<Method>();
+        }
+        return this.methods;
+    }
+
+    /**
+     * Gets the value of the initializers 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 initializers property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getInitializers().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Initializer }
+     */
+    public List<Initializer> getInitializers() {
+        if (initializers == null) {
+            initializers = new ArrayList<Initializer>();
+        }
+        return this.initializers;
+    }
+
+    /**
+     * Gets the value of the javaDeclaredClasses 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 javaDeclaredClasses property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getJavaDeclaredClasses().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getJavaDeclaredClasses() {
+        if (javaDeclaredClasses == null) {
+            javaDeclaredClasses = new ArrayList<JavaClass>();
+        }
+        return this.javaDeclaredClasses;
+    }
+
+    /**
+     * Gets the value of the javaDeclaringClasses 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 javaDeclaringClasses property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getJavaDeclaringClasses().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getJavaDeclaringClasses() {
+        if (javaDeclaringClasses == null) {
+            javaDeclaringClasses = new ArrayList<JavaClass>();
+        }
+        return this.javaDeclaringClasses;
+    }
+
+    /**
+     * Gets the value of the events 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 events property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEvents().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaEvent }
+     */
+    public List<JavaEvent> getEvents() {
+        if (events == null) {
+            events = new ArrayList<JavaEvent>();
+        }
+        return this.events;
+    }
+
+    /**
+     * Gets the value of the classImport property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getClassImport() {
+        return classImport;
+    }
+
+    /**
+     * Sets the value of the classImport property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setClassImport(final String value) {
+        this.classImport = value;
+    }
+
+    /**
+     * Gets the value of the declaredClasses property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDeclaredClasses() {
+        return declaredClasses;
+    }
+
+    /**
+     * Sets the value of the declaredClasses property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDeclaredClasses(final String value) {
+        this.declaredClasses = value;
+    }
+
+    /**
+     * Gets the value of the declaringClass property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDeclaringClass() {
+        return declaringClass;
+    }
+
+    /**
+     * Sets the value of the declaringClass property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDeclaringClass(final String value) {
+        this.declaringClass = value;
+    }
+
+    /**
+     * Gets the value of the isFinal property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsFinal() {
+        return isFinal;
+    }
+
+    /**
+     * Sets the value of the isFinal property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsFinal(final Boolean value) {
+        this.isFinal = value;
+    }
+
+    /**
+     * Gets the value of the implementsInterfaces property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getImplementsInterfaces() {
+        return implementsInterfaces;
+    }
+
+    /**
+     * Sets the value of the implementsInterfaces property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setImplementsInterfaces(final String value) {
+        this.implementsInterfaces = value;
+    }
+
+    /**
+     * Gets the value of the kind property.
+     *
+     * @return possible object is {@link TypeKind }
+     */
+    public TypeKind getKind() {
+        return kind;
+    }
+
+    /**
+     * Sets the value of the kind property.
+     *
+     * @param value allowed object is {@link TypeKind }
+     */
+    public void setKind(final TypeKind value) {
+        this.kind = value;
+    }
+
+    /**
+     * Gets the value of the packageImports property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getPackageImports() {
+        return packageImports;
+    }
+
+    /**
+     * Sets the value of the packageImports property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setPackageImports(final String value) {
+        this.packageImports = value;
+    }
+
+    /**
+     * Gets the value of the isPublic property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsPublic() {
+        return isPublic;
+    }
+
+    /**
+     * Sets the value of the isPublic property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsPublic(final Boolean value) {
+        this.isPublic = value;
+    }
+
+}


[44/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/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/6e2a4f7c/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/6e2a4f7c/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 c74f743..4522f8d 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 java.util.ArrayList;
-import java.util.List;
-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;
-
-
-/**
- * @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 java.util.ArrayList;
+import java.util.List;
+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;
+
+
+/**
+ * @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/6e2a4f7c/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 18211a3..2a2ecd8 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 java.util.ArrayList;
-import java.util.List;
-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;
-
-
-/**
- * @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 java.util.ArrayList;
+import java.util.List;
+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;
+
+
+/**
+ * @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/6e2a4f7c/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);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyClass.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyClass.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyClass.java
index 10a25e3..d02c411 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyClass.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyClass.java
@@ -1,75 +1,75 @@
-/**
- * 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.XmlType;
-
-
-/**
- * @Target({METHOD, FIELD}) @Retention(RUNTIME)
- * public @interface MapKeyClass {
- * Class value();
- * }
- * <p/>
- * <p/>
- * <p/>
- * <p>Java class for map-key-class complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="map-key-class">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="class" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "map-key-class")
-public class MapKeyClass {
-
-    @XmlAttribute(name = "class", required = true)
-    protected String clazz;
-
-    /**
-     * Gets the value of the clazz property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getClazz() {
-        return clazz;
-    }
-
-    /**
-     * Sets the value of the clazz property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setClazz(final String value) {
-        this.clazz = 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.XmlType;
+
+
+/**
+ * @Target({METHOD, FIELD}) @Retention(RUNTIME)
+ * public @interface MapKeyClass {
+ * Class value();
+ * }
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p>Java class for map-key-class complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="map-key-class">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="class" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "map-key-class")
+public class MapKeyClass {
+
+    @XmlAttribute(name = "class", required = true)
+    protected String clazz;
+
+    /**
+     * Gets the value of the clazz property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getClazz() {
+        return clazz;
+    }
+
+    /**
+     * Sets the value of the clazz property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setClazz(final String value) {
+        this.clazz = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyColumn.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyColumn.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyColumn.java
index 2d02b3f..8655213 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyColumn.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyColumn.java
@@ -1,291 +1,291 @@
-/**
- * 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.XmlType;
-
-
-/**
- * @Target({METHOD, FIELD}) @Retention(RUNTIME)
- * public @interface MapKeyColumn {
- * String name() default "";
- * boolean unique() default false;
- * boolean nullable() default false;
- * boolean insertable() default true;
- * boolean updatable() default true;
- * String columnDefinition() default "";
- * String table() default "";
- * int length() default 255;
- * int precision() default 0; // decimal precision
- * int scale() default 0; // decimal scale
- * }
- * <p/>
- * <p/>
- * <p/>
- * <p>Java class for map-key-column complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="map-key-column">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="unique" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="nullable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="insertable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="updatable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="column-definition" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="table" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="length" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       &lt;attribute name="precision" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       &lt;attribute name="scale" type="{http://www.w3.org/2001/XMLSchema}int" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "map-key-column")
-public class MapKeyColumn {
-
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected Boolean unique;
-    @XmlAttribute
-    protected Boolean nullable;
-    @XmlAttribute
-    protected Boolean insertable;
-    @XmlAttribute
-    protected Boolean updatable;
-    @XmlAttribute(name = "column-definition")
-    protected String columnDefinition;
-    @XmlAttribute
-    protected String table;
-    @XmlAttribute
-    protected Integer length;
-    @XmlAttribute
-    protected Integer precision;
-    @XmlAttribute
-    protected Integer scale;
-
-    /**
-     * 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 unique property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isUnique() {
-        return unique;
-    }
-
-    /**
-     * Sets the value of the unique property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setUnique(final Boolean value) {
-        this.unique = value;
-    }
-
-    /**
-     * Gets the value of the nullable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isNullable() {
-        return nullable;
-    }
-
-    /**
-     * Sets the value of the nullable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setNullable(final Boolean value) {
-        this.nullable = value;
-    }
-
-    /**
-     * Gets the value of the insertable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isInsertable() {
-        return insertable;
-    }
-
-    /**
-     * Sets the value of the insertable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setInsertable(final Boolean value) {
-        this.insertable = value;
-    }
-
-    /**
-     * Gets the value of the updatable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isUpdatable() {
-        return updatable;
-    }
-
-    /**
-     * Sets the value of the updatable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setUpdatable(final Boolean value) {
-        this.updatable = value;
-    }
-
-    /**
-     * Gets the value of the columnDefinition property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getColumnDefinition() {
-        return columnDefinition;
-    }
-
-    /**
-     * Sets the value of the columnDefinition property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setColumnDefinition(final String value) {
-        this.columnDefinition = value;
-    }
-
-    /**
-     * Gets the value of the table property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getTable() {
-        return table;
-    }
-
-    /**
-     * Sets the value of the table property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setTable(final String value) {
-        this.table = value;
-    }
-
-    /**
-     * Gets the value of the length property.
-     *
-     * @return possible object is
-     * {@link Integer }
-     */
-    public Integer getLength() {
-        return length;
-    }
-
-    /**
-     * Sets the value of the length property.
-     *
-     * @param value allowed object is
-     *              {@link Integer }
-     */
-    public void setLength(final Integer value) {
-        this.length = value;
-    }
-
-    /**
-     * Gets the value of the precision property.
-     *
-     * @return possible object is
-     * {@link Integer }
-     */
-    public Integer getPrecision() {
-        return precision;
-    }
-
-    /**
-     * Sets the value of the precision property.
-     *
-     * @param value allowed object is
-     *              {@link Integer }
-     */
-    public void setPrecision(final Integer value) {
-        this.precision = value;
-    }
-
-    /**
-     * Gets the value of the scale property.
-     *
-     * @return possible object is
-     * {@link Integer }
-     */
-    public Integer getScale() {
-        return scale;
-    }
-
-    /**
-     * Sets the value of the scale property.
-     *
-     * @param value allowed object is
-     *              {@link Integer }
-     */
-    public void setScale(final Integer value) {
-        this.scale = 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.XmlType;
+
+
+/**
+ * @Target({METHOD, FIELD}) @Retention(RUNTIME)
+ * public @interface MapKeyColumn {
+ * String name() default "";
+ * boolean unique() default false;
+ * boolean nullable() default false;
+ * boolean insertable() default true;
+ * boolean updatable() default true;
+ * String columnDefinition() default "";
+ * String table() default "";
+ * int length() default 255;
+ * int precision() default 0; // decimal precision
+ * int scale() default 0; // decimal scale
+ * }
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p>Java class for map-key-column complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="map-key-column">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="unique" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="nullable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="insertable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="updatable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="column-definition" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="table" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="length" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="precision" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="scale" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "map-key-column")
+public class MapKeyColumn {
+
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected Boolean unique;
+    @XmlAttribute
+    protected Boolean nullable;
+    @XmlAttribute
+    protected Boolean insertable;
+    @XmlAttribute
+    protected Boolean updatable;
+    @XmlAttribute(name = "column-definition")
+    protected String columnDefinition;
+    @XmlAttribute
+    protected String table;
+    @XmlAttribute
+    protected Integer length;
+    @XmlAttribute
+    protected Integer precision;
+    @XmlAttribute
+    protected Integer scale;
+
+    /**
+     * 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 unique property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isUnique() {
+        return unique;
+    }
+
+    /**
+     * Sets the value of the unique property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setUnique(final Boolean value) {
+        this.unique = value;
+    }
+
+    /**
+     * Gets the value of the nullable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isNullable() {
+        return nullable;
+    }
+
+    /**
+     * Sets the value of the nullable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setNullable(final Boolean value) {
+        this.nullable = value;
+    }
+
+    /**
+     * Gets the value of the insertable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isInsertable() {
+        return insertable;
+    }
+
+    /**
+     * Sets the value of the insertable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setInsertable(final Boolean value) {
+        this.insertable = value;
+    }
+
+    /**
+     * Gets the value of the updatable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isUpdatable() {
+        return updatable;
+    }
+
+    /**
+     * Sets the value of the updatable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setUpdatable(final Boolean value) {
+        this.updatable = value;
+    }
+
+    /**
+     * Gets the value of the columnDefinition property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getColumnDefinition() {
+        return columnDefinition;
+    }
+
+    /**
+     * Sets the value of the columnDefinition property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setColumnDefinition(final String value) {
+        this.columnDefinition = value;
+    }
+
+    /**
+     * Gets the value of the table property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getTable() {
+        return table;
+    }
+
+    /**
+     * Sets the value of the table property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setTable(final String value) {
+        this.table = value;
+    }
+
+    /**
+     * Gets the value of the length property.
+     *
+     * @return possible object is
+     * {@link Integer }
+     */
+    public Integer getLength() {
+        return length;
+    }
+
+    /**
+     * Sets the value of the length property.
+     *
+     * @param value allowed object is
+     *              {@link Integer }
+     */
+    public void setLength(final Integer value) {
+        this.length = value;
+    }
+
+    /**
+     * Gets the value of the precision property.
+     *
+     * @return possible object is
+     * {@link Integer }
+     */
+    public Integer getPrecision() {
+        return precision;
+    }
+
+    /**
+     * Sets the value of the precision property.
+     *
+     * @param value allowed object is
+     *              {@link Integer }
+     */
+    public void setPrecision(final Integer value) {
+        this.precision = value;
+    }
+
+    /**
+     * Gets the value of the scale property.
+     *
+     * @return possible object is
+     * {@link Integer }
+     */
+    public Integer getScale() {
+        return scale;
+    }
+
+    /**
+     * Sets the value of the scale property.
+     *
+     * @param value allowed object is
+     *              {@link Integer }
+     */
+    public void setScale(final Integer value) {
+        this.scale = value;
+    }
+
+}


[06/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/MoviesImpl.java
----------------------------------------------------------------------
diff --git a/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/MoviesImpl.java b/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/MoviesImpl.java
index d13f845..22b32f4 100644
--- a/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/MoviesImpl.java
+++ b/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/MoviesImpl.java
@@ -1,50 +1,50 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.logic;
-
-//START SNIPPET: code
-
-import org.superbiz.model.Movie;
-
-import javax.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Query;
-import java.util.List;
-
-@Stateful(name = "Movies")
-public class MoviesImpl implements Movies {
-
-    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
-    private EntityManager entityManager;
-
-    public void addMovie(Movie movie) throws Exception {
-        entityManager.persist(movie);
-    }
-
-    public void deleteMovie(Movie movie) throws Exception {
-        entityManager.remove(movie);
-    }
-
-    public List<Movie> getMovies() throws Exception {
-        Query query = entityManager.createQuery("SELECT m from Movie as m");
-        return query.getResultList();
-    }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.logic;
+
+//START SNIPPET: code
+
+import org.superbiz.model.Movie;
+
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
+import java.util.List;
+
+@Stateful(name = "Movies")
+public class MoviesImpl implements Movies {
+
+    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
+    private EntityManager entityManager;
+
+    public void addMovie(Movie movie) throws Exception {
+        entityManager.persist(movie);
+    }
+
+    public void deleteMovie(Movie movie) throws Exception {
+        entityManager.remove(movie);
+    }
+
+    public List<Movie> getMovies() throws Exception {
+        Query query = entityManager.createQuery("SELECT m from Movie as m");
+        return query.getResultList();
+    }
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java
----------------------------------------------------------------------
diff --git a/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java b/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java
index db6d1b5..3d79988 100644
--- a/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java
+++ b/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java
@@ -1,64 +1,64 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.logic;
-
-import junit.framework.TestCase;
-import org.superbiz.model.Movie;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.List;
-import java.util.Properties;
-
-//START SNIPPET: code
-
-public class MoviesTest extends TestCase {
-
-    public void test() throws Exception {
-        Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-
-        p.put("openejb.deployments.classpath.ear", "true");
-
-        p.put("movieDatabase", "new://Resource?type=DataSource");
-        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-        p.put("movieDatabaseUnmanaged", "new://Resource?type=DataSource");
-        p.put("movieDatabaseUnmanaged.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabaseUnmanaged.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-        p.put("movieDatabaseUnmanaged.JtaManaged", "false");
-
-        Context context = new InitialContext(p);
-
-        Movies movies = (Movies) context.lookup("MoviesLocal");
-
-        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
-        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
-
-        List<Movie> list = movies.getMovies();
-        assertEquals("List.size()", 3, list.size());
-
-        for (Movie movie : list) {
-            movies.deleteMovie(movie);
-        }
-
-        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.logic;
+
+import junit.framework.TestCase;
+import org.superbiz.model.Movie;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.List;
+import java.util.Properties;
+
+//START SNIPPET: code
+
+public class MoviesTest extends TestCase {
+
+    public void test() throws Exception {
+        Properties p = new Properties();
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
+
+        p.put("openejb.deployments.classpath.ear", "true");
+
+        p.put("movieDatabase", "new://Resource?type=DataSource");
+        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+        p.put("movieDatabaseUnmanaged", "new://Resource?type=DataSource");
+        p.put("movieDatabaseUnmanaged.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabaseUnmanaged.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+        p.put("movieDatabaseUnmanaged.JtaManaged", "false");
+
+        Context context = new InitialContext(p);
+
+        Movies movies = (Movies) context.lookup("MoviesLocal");
+
+        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
+        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+        List<Movie> list = movies.getMovies();
+        assertEquals("List.size()", 3, list.size());
+
+        for (Movie movie : list) {
+            movies.deleteMovie(movie);
+        }
+
+        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ear-testing/business-model/src/main/java/org/superbiz/model/Movie.java
----------------------------------------------------------------------
diff --git a/examples/ear-testing/business-model/src/main/java/org/superbiz/model/Movie.java b/examples/ear-testing/business-model/src/main/java/org/superbiz/model/Movie.java
index 99f397f..02c8126 100644
--- a/examples/ear-testing/business-model/src/main/java/org/superbiz/model/Movie.java
+++ b/examples/ear-testing/business-model/src/main/java/org/superbiz/model/Movie.java
@@ -1,62 +1,62 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.model;
-//START SNIPPET: code
-
-import javax.persistence.Entity;
-
-@Entity
-public class Movie {
-
-    private String director;
-    private String title;
-    private int year;
-
-    public Movie() {
-    }
-
-    public Movie(String director, String title, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.model;
+//START SNIPPET: code
+
+import javax.persistence.Entity;
+
+@Entity
+public class Movie {
+
+    private String director;
+    private String title;
+    private int year;
+
+    public Movie() {
+    }
+
+    public Movie(String director, String title, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java
index 811808a..5377c6b 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java
@@ -1,52 +1,52 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.annotation.Resource;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.sql.DataSource;
-
-@Stateless
-@LocalBean
-public class AnnotatedEJB implements AnnotatedEJBLocal, AnnotatedEJBRemote {
-
-    @Resource
-    private DataSource ds;
-
-    private String name = "foo";
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public DataSource getDs() {
-        return ds;
-    }
-
-    public void setDs(DataSource ds) {
-        this.ds = ds;
-    }
-
-    public String toString() {
-        return "AnnotatedEJB[name=" + name + "]";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.annotation.Resource;
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.sql.DataSource;
+
+@Stateless
+@LocalBean
+public class AnnotatedEJB implements AnnotatedEJBLocal, AnnotatedEJBRemote {
+
+    @Resource
+    private DataSource ds;
+
+    private String name = "foo";
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public DataSource getDs() {
+        return ds;
+    }
+
+    public void setDs(DataSource ds) {
+        this.ds = ds;
+    }
+
+    public String toString() {
+        return "AnnotatedEJB[name=" + name + "]";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java
index 0bf9326..8c0d16b 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.ejb.Local;
-import javax.sql.DataSource;
-
-@Local
-public interface AnnotatedEJBLocal {
-
-    String getName();
-
-    void setName(String name);
-
-    DataSource getDs();
-
-    void setDs(DataSource ds);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.ejb.Local;
+import javax.sql.DataSource;
+
+@Local
+public interface AnnotatedEJBLocal {
+
+    String getName();
+
+    void setName(String name);
+
+    DataSource getDs();
+
+    void setDs(DataSource ds);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java
index 3b58d9f..2b627a0 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java
@@ -1,27 +1,27 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.ejb.Remote;
-
-@Remote
-public interface AnnotatedEJBRemote {
-
-    String getName();
-
-    void setName(String name);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface AnnotatedEJBRemote {
+
+    String getName();
+
+    void setName(String name);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java
index ca8facf..8c42ace 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java
@@ -1,87 +1,87 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
-import java.io.IOException;
-
-public class AnnotatedServlet extends HttpServlet {
-
-    @EJB
-    private AnnotatedEJBLocal localEJB;
-
-    @EJB
-    private AnnotatedEJBRemote remoteEJB;
-
-    @EJB
-    private AnnotatedEJB localbeanEJB;
-
-    @Resource
-    private DataSource ds;
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.setContentType("text/plain");
-        ServletOutputStream out = response.getOutputStream();
-
-        out.println("LocalBean EJB");
-        out.println("@EJB=" + localbeanEJB);
-        if (localbeanEJB != null) {
-            out.println("@EJB.getName()=" + localbeanEJB.getName());
-            out.println("@EJB.getDs()=" + localbeanEJB.getDs());
-        }
-        out.println("JNDI=" + lookupField("localbeanEJB"));
-        out.println();
-
-        out.println("Local EJB");
-        out.println("@EJB=" + localEJB);
-        if (localEJB != null) {
-            out.println("@EJB.getName()=" + localEJB.getName());
-            out.println("@EJB.getDs()=" + localEJB.getDs());
-        }
-        out.println("JNDI=" + lookupField("localEJB"));
-        out.println();
-
-        out.println("Remote EJB");
-        out.println("@EJB=" + remoteEJB);
-        if (localEJB != null) {
-            out.println("@EJB.getName()=" + remoteEJB.getName());
-        }
-        out.println("JNDI=" + lookupField("remoteEJB"));
-        out.println();
-
-        out.println("DataSource");
-        out.println("@Resource=" + ds);
-        out.println("JNDI=" + lookupField("ds"));
-    }
-
-    private Object lookupField(String name) {
-        try {
-            return new InitialContext().lookup("java:comp/env/" + getClass().getName() + "/" + name);
-        } catch (NamingException e) {
-            return null;
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
+import java.io.IOException;
+
+public class AnnotatedServlet extends HttpServlet {
+
+    @EJB
+    private AnnotatedEJBLocal localEJB;
+
+    @EJB
+    private AnnotatedEJBRemote remoteEJB;
+
+    @EJB
+    private AnnotatedEJB localbeanEJB;
+
+    @Resource
+    private DataSource ds;
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/plain");
+        ServletOutputStream out = response.getOutputStream();
+
+        out.println("LocalBean EJB");
+        out.println("@EJB=" + localbeanEJB);
+        if (localbeanEJB != null) {
+            out.println("@EJB.getName()=" + localbeanEJB.getName());
+            out.println("@EJB.getDs()=" + localbeanEJB.getDs());
+        }
+        out.println("JNDI=" + lookupField("localbeanEJB"));
+        out.println();
+
+        out.println("Local EJB");
+        out.println("@EJB=" + localEJB);
+        if (localEJB != null) {
+            out.println("@EJB.getName()=" + localEJB.getName());
+            out.println("@EJB.getDs()=" + localEJB.getDs());
+        }
+        out.println("JNDI=" + lookupField("localEJB"));
+        out.println();
+
+        out.println("Remote EJB");
+        out.println("@EJB=" + remoteEJB);
+        if (localEJB != null) {
+            out.println("@EJB.getName()=" + remoteEJB.getName());
+        }
+        out.println("JNDI=" + lookupField("remoteEJB"));
+        out.println();
+
+        out.println("DataSource");
+        out.println("@Resource=" + ds);
+        out.println("JNDI=" + lookupField("ds"));
+    }
+
+    private Object lookupField(String name) {
+        try {
+            return new InitialContext().lookup("java:comp/env/" + getClass().getName() + "/" + name);
+        } catch (NamingException e) {
+            return null;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java
index 040353a..ebad6f5 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.handler.MessageContext;
-
-public class ClientHandler implements Handler {
-
-    public boolean handleMessage(MessageContext messageContext) {
-        WebserviceServlet.write("    ClientHandler handleMessage");
-        return true;
-    }
-
-    public void close(MessageContext messageContext) {
-        WebserviceServlet.write("    ClientHandler close");
-    }
-
-    public boolean handleFault(MessageContext messageContext) {
-        WebserviceServlet.write("    ClientHandler handleFault");
-        return true;
-    }
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+
+public class ClientHandler implements Handler {
+
+    public boolean handleMessage(MessageContext messageContext) {
+        WebserviceServlet.write("    ClientHandler handleMessage");
+        return true;
+    }
+
+    public void close(MessageContext messageContext) {
+        WebserviceServlet.write("    ClientHandler close");
+    }
+
+    public boolean handleFault(MessageContext messageContext) {
+        WebserviceServlet.write("    ClientHandler handleFault");
+        return true;
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java
index 6d9545c..a4824e9 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.jws.WebService;
-
-@WebService(targetNamespace = "http://examples.org/wsdl")
-public interface HelloEjb {
-
-    String hello(String name);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://examples.org/wsdl")
+public interface HelloEjb {
+
+    String hello(String name);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java
index 759d210..3bb1429 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java
@@ -1,40 +1,40 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.ejb.Stateless;
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-
-@WebService(
-        portName = "HelloEjbPort",
-        serviceName = "HelloEjbService",
-        targetNamespace = "http://examples.org/wsdl",
-        endpointInterface = "org.superbiz.servlet.HelloEjb"
-)
-@HandlerChain(file = "server-handlers.xml")
-@Stateless
-public class HelloEjbService implements HelloEjb {
-
-    public String hello(String name) {
-        WebserviceServlet.write("                HelloEjbService hello(" + name + ")");
-        if (name == null) {
-            name = "World";
-        }
-        return "Hello " + name + " from EJB Webservice!";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.ejb.Stateless;
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+
+@WebService(
+        portName = "HelloEjbPort",
+        serviceName = "HelloEjbService",
+        targetNamespace = "http://examples.org/wsdl",
+        endpointInterface = "org.superbiz.servlet.HelloEjb"
+)
+@HandlerChain(file = "server-handlers.xml")
+@Stateless
+public class HelloEjbService implements HelloEjb {
+
+    public String hello(String name) {
+        WebserviceServlet.write("                HelloEjbService hello(" + name + ")");
+        if (name == null) {
+            name = "World";
+        }
+        return "Hello " + name + " from EJB Webservice!";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java
index 23b48af..e84bc44 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.jws.WebService;
-
-@WebService(targetNamespace = "http://examples.org/wsdl")
-public interface HelloPojo {
-
-    String hello(String name);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://examples.org/wsdl")
+public interface HelloPojo {
+
+    String hello(String name);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java
index 622f315..97fbb87 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-
-@WebService(
-        portName = "HelloPojoPort",
-        serviceName = "HelloPojoService",
-        targetNamespace = "http://examples.org/wsdl",
-        endpointInterface = "org.superbiz.servlet.HelloPojo"
-)
-@HandlerChain(file = "server-handlers.xml")
-public class HelloPojoService implements HelloPojo {
-
-    public String hello(String name) {
-        WebserviceServlet.write("                HelloPojoService hello(" + name + ")");
-        if (name == null) {
-            name = "World";
-        }
-        return "Hello " + name + " from Pojo Webservice!";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+
+@WebService(
+        portName = "HelloPojoPort",
+        serviceName = "HelloPojoService",
+        targetNamespace = "http://examples.org/wsdl",
+        endpointInterface = "org.superbiz.servlet.HelloPojo"
+)
+@HandlerChain(file = "server-handlers.xml")
+public class HelloPojoService implements HelloPojo {
+
+    public String hello(String name) {
+        WebserviceServlet.write("                HelloPojoService hello(" + name + ")");
+        if (name == null) {
+            name = "World";
+        }
+        return "Hello " + name + " from Pojo Webservice!";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java
index 7482814..73232b5 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java
@@ -1,84 +1,84 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameClassPair;
-import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.TreeMap;
-
-public class JndiServlet extends HttpServlet {
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.setContentType("text/plain");
-        ServletOutputStream out = response.getOutputStream();
-
-        Map<String, Object> bindings = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
-        try {
-            Context context = (Context) new InitialContext().lookup("java:comp/");
-            addBindings("", bindings, context);
-        } catch (NamingException e) {
-            throw new ServletException(e);
-        }
-
-        out.println("JNDI Context:");
-        for (Map.Entry<String, Object> entry : bindings.entrySet()) {
-            if (entry.getValue() != null) {
-                out.println("  " + entry.getKey() + "=" + entry.getValue());
-            } else {
-                out.println("  " + entry.getKey());
-            }
-        }
-    }
-
-    private void addBindings(String path, Map<String, Object> bindings, Context context) {
-        try {
-            for (NameClassPair pair : Collections.list(context.list(""))) {
-                String name = pair.getName();
-                String className = pair.getClassName();
-                if ("org.apache.naming.resources.FileDirContext$FileResource".equals(className)) {
-                    bindings.put(path + name, "<file>");
-                } else {
-                    try {
-                        Object value = context.lookup(name);
-                        if (value instanceof Context) {
-                            Context nextedContext = (Context) value;
-                            bindings.put(path + name, "");
-                            addBindings(path + name + "/", bindings, nextedContext);
-                        } else {
-                            bindings.put(path + name, value);
-                        }
-                    } catch (NamingException e) {
-                        // lookup failed
-                        bindings.put(path + name, "ERROR: " + e.getMessage());
-                    }
-                }
-            }
-        } catch (NamingException e) {
-            bindings.put(path, "ERROR: list bindings threw an exception: " + e.getMessage());
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameClassPair;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class JndiServlet extends HttpServlet {
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/plain");
+        ServletOutputStream out = response.getOutputStream();
+
+        Map<String, Object> bindings = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+        try {
+            Context context = (Context) new InitialContext().lookup("java:comp/");
+            addBindings("", bindings, context);
+        } catch (NamingException e) {
+            throw new ServletException(e);
+        }
+
+        out.println("JNDI Context:");
+        for (Map.Entry<String, Object> entry : bindings.entrySet()) {
+            if (entry.getValue() != null) {
+                out.println("  " + entry.getKey() + "=" + entry.getValue());
+            } else {
+                out.println("  " + entry.getKey());
+            }
+        }
+    }
+
+    private void addBindings(String path, Map<String, Object> bindings, Context context) {
+        try {
+            for (NameClassPair pair : Collections.list(context.list(""))) {
+                String name = pair.getName();
+                String className = pair.getClassName();
+                if ("org.apache.naming.resources.FileDirContext$FileResource".equals(className)) {
+                    bindings.put(path + name, "<file>");
+                } else {
+                    try {
+                        Object value = context.lookup(name);
+                        if (value instanceof Context) {
+                            Context nextedContext = (Context) value;
+                            bindings.put(path + name, "");
+                            addBindings(path + name + "/", bindings, nextedContext);
+                        } else {
+                            bindings.put(path + name, value);
+                        }
+                    } catch (NamingException e) {
+                        // lookup failed
+                        bindings.put(path + name, "ERROR: " + e.getMessage());
+                    }
+                }
+            }
+        } catch (NamingException e) {
+            bindings.put(path, "ERROR: list bindings threw an exception: " + e.getMessage());
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java
index 284efbb..9b08497 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java
@@ -1,51 +1,51 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-public class JpaBean {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private int id;
-
-    @Column(name = "name")
-    private String name;
-
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String toString() {
-        return "[JpaBean id=" + id + ", name=" + name + "]";
-    }
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class JpaBean {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private int id;
+
+    @Column(name = "name")
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String toString() {
+        return "[JpaBean id=" + id + ", name=" + name + "]";
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java
index 92419ac..0ec6d48 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java
@@ -1,72 +1,72 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.Query;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public class JpaServlet extends HttpServlet {
-
-    @PersistenceUnit(name = "jpa-example")
-    private EntityManagerFactory emf;
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.setContentType("text/plain");
-        ServletOutputStream out = response.getOutputStream();
-
-        out.println("@PersistenceUnit=" + emf);
-
-        EntityManager em = emf.createEntityManager();
-        EntityTransaction transaction = em.getTransaction();
-        transaction.begin();
-
-        JpaBean jpaBean = new JpaBean();
-        jpaBean.setName("JpaBean");
-        em.persist(jpaBean);
-
-        transaction.commit();
-        transaction.begin();
-
-        Query query = em.createQuery("SELECT j FROM JpaBean j WHERE j.name='JpaBean'");
-        jpaBean = (JpaBean) query.getSingleResult();
-        out.println("Loaded " + jpaBean);
-
-        em.remove(jpaBean);
-
-        transaction.commit();
-        transaction.begin();
-
-        query = em.createQuery("SELECT count(j) FROM JpaBean j WHERE j.name='JpaBean'");
-        int count = ((Number) query.getSingleResult()).intValue();
-        if (count == 0) {
-            out.println("Removed " + jpaBean);
-        } else {
-            out.println("ERROR: unable to remove" + jpaBean);
-        }
-
-        transaction.commit();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.PersistenceUnit;
+import javax.persistence.Query;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class JpaServlet extends HttpServlet {
+
+    @PersistenceUnit(name = "jpa-example")
+    private EntityManagerFactory emf;
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/plain");
+        ServletOutputStream out = response.getOutputStream();
+
+        out.println("@PersistenceUnit=" + emf);
+
+        EntityManager em = emf.createEntityManager();
+        EntityTransaction transaction = em.getTransaction();
+        transaction.begin();
+
+        JpaBean jpaBean = new JpaBean();
+        jpaBean.setName("JpaBean");
+        em.persist(jpaBean);
+
+        transaction.commit();
+        transaction.begin();
+
+        Query query = em.createQuery("SELECT j FROM JpaBean j WHERE j.name='JpaBean'");
+        jpaBean = (JpaBean) query.getSingleResult();
+        out.println("Loaded " + jpaBean);
+
+        em.remove(jpaBean);
+
+        transaction.commit();
+        transaction.begin();
+
+        query = em.createQuery("SELECT count(j) FROM JpaBean j WHERE j.name='JpaBean'");
+        int count = ((Number) query.getSingleResult()).intValue();
+        if (count == 0) {
+            out.println("Removed " + jpaBean);
+        } else {
+            out.println("ERROR: unable to remove" + jpaBean);
+        }
+
+        transaction.commit();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java
index 8a57be2..6fffc4f 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java
@@ -1,34 +1,34 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-public class ResourceBean {
-
-    private String value;
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String toString() {
-        return "[ResourceBean " + 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+public class ResourceBean {
+
+    private String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String toString() {
+        return "[ResourceBean " + value + "]";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java
index 6fd3f46..7f1dbfd 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java
@@ -1,92 +1,92 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.ejb.EJB;
-import javax.ejb.EJBAccessException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.security.Principal;
-
-public class RunAsServlet extends HttpServlet {
-
-    @EJB
-    private SecureEJBLocal secureEJBLocal;
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.setContentType("text/plain");
-        ServletOutputStream out = response.getOutputStream();
-
-        out.println("Servlet");
-        Principal principal = request.getUserPrincipal();
-        if (principal != null) {
-            out.println("Servlet.getUserPrincipal()=" + principal + " [" + principal.getName() + "]");
-        } else {
-            out.println("Servlet.getUserPrincipal()=<null>");
-        }
-        out.println("Servlet.isCallerInRole(\"user\")=" + request.isUserInRole("user"));
-        out.println("Servlet.isCallerInRole(\"manager\")=" + request.isUserInRole("manager"));
-        out.println("Servlet.isCallerInRole(\"fake\")=" + request.isUserInRole("fake"));
-        out.println();
-
-        out.println("@EJB=" + secureEJBLocal);
-        if (secureEJBLocal != null) {
-            principal = secureEJBLocal.getCallerPrincipal();
-            if (principal != null) {
-                out.println("@EJB.getCallerPrincipal()=" + principal + " [" + principal.getName() + "]");
-            } else {
-                out.println("@EJB.getCallerPrincipal()=<null>");
-            }
-            out.println("@EJB.isCallerInRole(\"user\")=" + secureEJBLocal.isCallerInRole("user"));
-            out.println("@EJB.isCallerInRole(\"manager\")=" + secureEJBLocal.isCallerInRole("manager"));
-            out.println("@EJB.isCallerInRole(\"fake\")=" + secureEJBLocal.isCallerInRole("fake"));
-
-            try {
-                secureEJBLocal.allowUserMethod();
-                out.println("@EJB.allowUserMethod() ALLOWED");
-            } catch (EJBAccessException e) {
-                out.println("@EJB.allowUserMethod() DENIED");
-            }
-
-            try {
-                secureEJBLocal.allowManagerMethod();
-                out.println("@EJB.allowManagerMethod() ALLOWED");
-            } catch (EJBAccessException e) {
-                out.println("@EJB.allowManagerMethod() DENIED");
-            }
-
-            try {
-                secureEJBLocal.allowFakeMethod();
-                out.println("@EJB.allowFakeMethod() ALLOWED");
-            } catch (EJBAccessException e) {
-                out.println("@EJB.allowFakeMethod() DENIED");
-            }
-
-            try {
-                secureEJBLocal.denyAllMethod();
-                out.println("@EJB.denyAllMethod() ALLOWED");
-            } catch (EJBAccessException e) {
-                out.println("@EJB.denyAllMethod() DENIED");
-            }
-        }
-        out.println();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.ejb.EJB;
+import javax.ejb.EJBAccessException;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.security.Principal;
+
+public class RunAsServlet extends HttpServlet {
+
+    @EJB
+    private SecureEJBLocal secureEJBLocal;
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/plain");
+        ServletOutputStream out = response.getOutputStream();
+
+        out.println("Servlet");
+        Principal principal = request.getUserPrincipal();
+        if (principal != null) {
+            out.println("Servlet.getUserPrincipal()=" + principal + " [" + principal.getName() + "]");
+        } else {
+            out.println("Servlet.getUserPrincipal()=<null>");
+        }
+        out.println("Servlet.isCallerInRole(\"user\")=" + request.isUserInRole("user"));
+        out.println("Servlet.isCallerInRole(\"manager\")=" + request.isUserInRole("manager"));
+        out.println("Servlet.isCallerInRole(\"fake\")=" + request.isUserInRole("fake"));
+        out.println();
+
+        out.println("@EJB=" + secureEJBLocal);
+        if (secureEJBLocal != null) {
+            principal = secureEJBLocal.getCallerPrincipal();
+            if (principal != null) {
+                out.println("@EJB.getCallerPrincipal()=" + principal + " [" + principal.getName() + "]");
+            } else {
+                out.println("@EJB.getCallerPrincipal()=<null>");
+            }
+            out.println("@EJB.isCallerInRole(\"user\")=" + secureEJBLocal.isCallerInRole("user"));
+            out.println("@EJB.isCallerInRole(\"manager\")=" + secureEJBLocal.isCallerInRole("manager"));
+            out.println("@EJB.isCallerInRole(\"fake\")=" + secureEJBLocal.isCallerInRole("fake"));
+
+            try {
+                secureEJBLocal.allowUserMethod();
+                out.println("@EJB.allowUserMethod() ALLOWED");
+            } catch (EJBAccessException e) {
+                out.println("@EJB.allowUserMethod() DENIED");
+            }
+
+            try {
+                secureEJBLocal.allowManagerMethod();
+                out.println("@EJB.allowManagerMethod() ALLOWED");
+            } catch (EJBAccessException e) {
+                out.println("@EJB.allowManagerMethod() DENIED");
+            }
+
+            try {
+                secureEJBLocal.allowFakeMethod();
+                out.println("@EJB.allowFakeMethod() ALLOWED");
+            } catch (EJBAccessException e) {
+                out.println("@EJB.allowFakeMethod() DENIED");
+            }
+
+            try {
+                secureEJBLocal.denyAllMethod();
+                out.println("@EJB.denyAllMethod() ALLOWED");
+            } catch (EJBAccessException e) {
+                out.println("@EJB.denyAllMethod() DENIED");
+            }
+        }
+        out.println();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java
index 3684dab..f6dd599 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java
@@ -1,61 +1,61 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.annotation.Resource;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import java.security.Principal;
-
-@Stateless
-@DeclareRoles({"user", "manager", "fake"})
-public class SecureEJB implements SecureEJBLocal {
-
-    @Resource
-    private SessionContext context;
-
-    public Principal getCallerPrincipal() {
-        return context.getCallerPrincipal();
-    }
-
-    public boolean isCallerInRole(String role) {
-        return context.isCallerInRole(role);
-    }
-
-    @RolesAllowed("user")
-    public void allowUserMethod() {
-    }
-
-    @RolesAllowed("manager")
-    public void allowManagerMethod() {
-    }
-
-    @RolesAllowed("fake")
-    public void allowFakeMethod() {
-    }
-
-    @DenyAll
-    public void denyAllMethod() {
-    }
-
-    public String toString() {
-        return "SecureEJB[userName=" + getCallerPrincipal() + "]";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.annotation.Resource;
+import javax.annotation.security.DeclareRoles;
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import java.security.Principal;
+
+@Stateless
+@DeclareRoles({"user", "manager", "fake"})
+public class SecureEJB implements SecureEJBLocal {
+
+    @Resource
+    private SessionContext context;
+
+    public Principal getCallerPrincipal() {
+        return context.getCallerPrincipal();
+    }
+
+    public boolean isCallerInRole(String role) {
+        return context.isCallerInRole(role);
+    }
+
+    @RolesAllowed("user")
+    public void allowUserMethod() {
+    }
+
+    @RolesAllowed("manager")
+    public void allowManagerMethod() {
+    }
+
+    @RolesAllowed("fake")
+    public void allowFakeMethod() {
+    }
+
+    @DenyAll
+    public void denyAllMethod() {
+    }
+
+    public String toString() {
+        return "SecureEJB[userName=" + getCallerPrincipal() + "]";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java b/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java
index d253617..a2dcad2 100644
--- a/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java
+++ b/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java
@@ -1,36 +1,36 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.servlet;
-
-import javax.ejb.Local;
-import java.security.Principal;
-
-@Local
-public interface SecureEJBLocal {
-
-    Principal getCallerPrincipal();
-
-    boolean isCallerInRole(String role);
-
-    void allowUserMethod();
-
-    void allowManagerMethod();
-
-    void allowFakeMethod();
-
-    void denyAllMethod();
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.servlet;
+
+import javax.ejb.Local;
+import java.security.Principal;
+
+@Local
+public interface SecureEJBLocal {
+
+    Principal getCallerPrincipal();
+
+    boolean isCallerInRole(String role);
+
+    void allowUserMethod();
+
+    void allowManagerMethod();
+
+    void allowFakeMethod();
+
+    void denyAllMethod();
+}


[50/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStream.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStream.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStream.java
index 81f8335..c3e59b1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStream.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStream.java
@@ -1,109 +1,109 @@
-/*
- * 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.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Log the output to Slf4j
- */
-
-public class Slf4jLogStream implements LogStream {
-    private final Logger log;
-
-    public Slf4jLogStream(final LogCategory logCategory) {
-        log = LoggerFactory.getLogger(logCategory.getName());
-    }
-
-    @Override
-    public boolean isFatalEnabled() {
-        return log.isErrorEnabled();
-    }
-
-    @Override
-    public void fatal(final String message) {
-        log.error(message);
-    }
-
-    @Override
-    public void fatal(final String message, final Throwable t) {
-        log.error(message, t);
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        return log.isErrorEnabled();
-    }
-
-    @Override
-    public void error(final String message) {
-        log.error(message);
-    }
-
-    @Override
-    public void error(final String message, final Throwable t) {
-        log.error(message, t);
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        return log.isWarnEnabled();
-    }
-
-    @Override
-    public void warn(final String message) {
-        log.warn(message);
-    }
-
-    @Override
-    public void warn(final String message, final Throwable t) {
-        log.warn(message, t);
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        return log.isInfoEnabled();
-    }
-
-    @Override
-    public void info(final String message) {
-        log.info(message);
-    }
-
-    @Override
-    public void info(final String message, final Throwable t) {
-        log.info(message, t);
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return log.isDebugEnabled();
-    }
-
-    @Override
-    public void debug(final String message) {
-        log.debug(message);
-    }
-
-    @Override
-    public void debug(final String message, final Throwable t) {
-        log.debug(message, t);
-    }
-
-}
+/*
+ * 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.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Log the output to Slf4j
+ */
+
+public class Slf4jLogStream implements LogStream {
+    private final Logger log;
+
+    public Slf4jLogStream(final LogCategory logCategory) {
+        log = LoggerFactory.getLogger(logCategory.getName());
+    }
+
+    @Override
+    public boolean isFatalEnabled() {
+        return log.isErrorEnabled();
+    }
+
+    @Override
+    public void fatal(final String message) {
+        log.error(message);
+    }
+
+    @Override
+    public void fatal(final String message, final Throwable t) {
+        log.error(message, t);
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return log.isErrorEnabled();
+    }
+
+    @Override
+    public void error(final String message) {
+        log.error(message);
+    }
+
+    @Override
+    public void error(final String message, final Throwable t) {
+        log.error(message, t);
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return log.isWarnEnabled();
+    }
+
+    @Override
+    public void warn(final String message) {
+        log.warn(message);
+    }
+
+    @Override
+    public void warn(final String message, final Throwable t) {
+        log.warn(message, t);
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return log.isInfoEnabled();
+    }
+
+    @Override
+    public void info(final String message) {
+        log.info(message);
+    }
+
+    @Override
+    public void info(final String message, final Throwable t) {
+        log.info(message, t);
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return log.isDebugEnabled();
+    }
+
+    @Override
+    public void debug(final String message) {
+        log.debug(message);
+    }
+
+    @Override
+    public void debug(final String message, final Throwable t) {
+        log.debug(message, t);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java
index a1b3f4d..a96407b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java
@@ -1,40 +1,40 @@
-/*
- * 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.util;
-
-/**
- * Simple Slf4jLogStream, not much configuration needed, as slf4j is just a facade
- */
-
-public class Slf4jLogStreamFactory implements LogStreamFactory {
-    @Override
-    public LogStream createLogStream(final LogCategory logCategory) {
-        return new Slf4jLogStream(logCategory);
-    }
-
-    public Slf4jLogStreamFactory() {
-        System.setProperty("openjpa.Log", "slf4j");
-        System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Slf4jLogger");
-        System.setProperty("openwebbeans.logging.factory", "org.apache.openejb.cdi.logging.Slf4jLoggerFactory");
-
-        // no need to configure internals:
-        // by default we are using JUL
-        // if the user set log4j he wants to configure it himself
-        // so let him doing
-    }
-}
+/*
+ * 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.util;
+
+/**
+ * Simple Slf4jLogStream, not much configuration needed, as slf4j is just a facade
+ */
+
+public class Slf4jLogStreamFactory implements LogStreamFactory {
+    @Override
+    public LogStream createLogStream(final LogCategory logCategory) {
+        return new Slf4jLogStream(logCategory);
+    }
+
+    public Slf4jLogStreamFactory() {
+        System.setProperty("openjpa.Log", "slf4j");
+        System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Slf4jLogger");
+        System.setProperty("openwebbeans.logging.factory", "org.apache.openejb.cdi.logging.Slf4jLoggerFactory");
+
+        // no need to configure internals:
+        // by default we are using JUL
+        // if the user set log4j he wants to configure it himself
+        // so let him doing
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml b/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml
index 7dd3541..7e42c45 100644
--- a/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml
+++ b/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml
@@ -1,21 +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.
--->
-
-<!-- $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$ -->
+
 <ejb-jar/>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/resources/META-INF/openejb-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/META-INF/openejb-jar.xml b/container/openejb-core/src/main/resources/META-INF/openejb-jar.xml
index bd1c42e..4d1746a 100644
--- a/container/openejb-core/src/main/resources/META-INF/openejb-jar.xml
+++ b/container/openejb-core/src/main/resources/META-INF/openejb-jar.xml
@@ -1,26 +1,26 @@
-<?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>
-  <properties>
-     openejb.deploymentId.format = {ejbName}
-     openejb.jndiname.format = {deploymentId}{interfaceType.openejbLegacyName}
-  </properties>
-</openejb-jar>
+<?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>
+  <properties>
+     openejb.deploymentId.format = {ejbName}
+     openejb.jndiname.format = {deploymentId}{interfaceType.openejbLegacyName}
+  </properties>
+</openejb-jar>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples
index 6b65463..ed3e20c 100644
--- a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples
+++ b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples
@@ -1,51 +1,51 @@
-Usage: openejb validate [options] JARFILES...
-
-Example: Multiple jar files
-
- openejb validate myapp\fooEjbs.jar myapp\barEjbs.jar
-
- Validates the beans in the fooEjbs.jar first, then validates the 
- beans in the barEjbs.jar.  Wildcards can be used as well.
-
- openejb validate myapp\*.jar
-
-Example: -v 
-
- openejb validate -v myapp\myEjbs.jar
-
- Validates the beans in the jar, outputting just the minumum details
- on each failure.
-
-Example: -vv 
-
- openejb validate -vv myapp\myEjbs.jar
-
- Validates the beans in the jar, outputting one line summaries of 
- each failure. This is the default output level.
-
-Example: -vvv 
-
- openejb validate -vv myapp\myEjbs.jar
-
- Validates the beans in the jar, outputting verbose details on each
- failure, usually with details on how to correct the failures.
-
-Example: -nowarn
-
- openejb validate -nowarn myapp\myEjbs.jar
- 
- Outputs only the failures and errors, no warnings.
-
-Example: -xml
-
- openejb validate -xml myapp\myEjbs.jar
- 
- Outputs the validation information in XML format.
- 
-Example: Combinations of options 
-
- openejb validate -vv -nowarn C:\foo\bar.jar D:\my\beans\*.jar
- openejb validate -vvv /foo/bar.jar
- openejb validate -xml /home/dblevins/mybeans/*.jar
-
-Bug Reports to <us...@tomee.apache.org>
+Usage: openejb validate [options] JARFILES...
+
+Example: Multiple jar files
+
+ openejb validate myapp\fooEjbs.jar myapp\barEjbs.jar
+
+ Validates the beans in the fooEjbs.jar first, then validates the 
+ beans in the barEjbs.jar.  Wildcards can be used as well.
+
+ openejb validate myapp\*.jar
+
+Example: -v 
+
+ openejb validate -v myapp\myEjbs.jar
+
+ Validates the beans in the jar, outputting just the minumum details
+ on each failure.
+
+Example: -vv 
+
+ openejb validate -vv myapp\myEjbs.jar
+
+ Validates the beans in the jar, outputting one line summaries of 
+ each failure. This is the default output level.
+
+Example: -vvv 
+
+ openejb validate -vv myapp\myEjbs.jar
+
+ Validates the beans in the jar, outputting verbose details on each
+ failure, usually with details on how to correct the failures.
+
+Example: -nowarn
+
+ openejb validate -nowarn myapp\myEjbs.jar
+ 
+ Outputs only the failures and errors, no warnings.
+
+Example: -xml
+
+ openejb validate -xml myapp\myEjbs.jar
+ 
+ Outputs the validation information in XML format.
+ 
+Example: Combinations of options 
+
+ openejb validate -vv -nowarn C:\foo\bar.jar D:\my\beans\*.jar
+ openejb validate -vvv /foo/bar.jar
+ openejb validate -xml /home/dblevins/mybeans/*.jar
+
+Bug Reports to <us...@tomee.apache.org>


[26/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java
index bef74bc..e6063f9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java
@@ -1,336 +1,336 @@
-/**
- * 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.was.v6.ejbbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.commonbnd.Property;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for CMPConnectionFactoryBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="CMPConnectionFactoryBinding">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="properties" type="{commonbnd.xmi}Property"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="loginConfigurationName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="resAuth" type="{ejbbnd.xmi}CMPResAuthType" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CMPConnectionFactoryBinding", propOrder = {"properties",
-    "extensions"})
-public class CMPConnectionFactoryBinding {
-
-    protected List<Property> properties;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String jndiName;
-    @XmlAttribute
-    protected String loginConfigurationName;
-    @XmlAttribute
-    protected CMPResAuthEnum resAuth;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the properties 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 properties property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getProperties().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Property }
-     */
-    public List<Property> getProperties() {
-        if (properties == null) {
-            properties = new ArrayList<Property>();
-        }
-        return this.properties;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the jndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJndiName() {
-        return jndiName;
-    }
-
-    /**
-     * Sets the value of the jndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJndiName(final String value) {
-        this.jndiName = value;
-    }
-
-    /**
-     * Gets the value of the loginConfigurationName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLoginConfigurationName() {
-        return loginConfigurationName;
-    }
-
-    /**
-     * Sets the value of the loginConfigurationName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLoginConfigurationName(final String value) {
-        this.loginConfigurationName = value;
-    }
-
-    /**
-     * Gets the value of the resAuth property.
-     *
-     * @return possible object is {@link CMPResAuthEnum }
-     */
-    public CMPResAuthEnum getResAuth() {
-        return resAuth;
-    }
-
-    /**
-     * Sets the value of the resAuth property.
-     *
-     * @param value allowed object is {@link CMPResAuthEnum }
-     */
-    public void setResAuth(final CMPResAuthEnum value) {
-        this.resAuth = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejbbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.commonbnd.Property;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for CMPConnectionFactoryBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="CMPConnectionFactoryBinding">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="properties" type="{commonbnd.xmi}Property"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="loginConfigurationName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="resAuth" type="{ejbbnd.xmi}CMPResAuthType" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CMPConnectionFactoryBinding", propOrder = {"properties",
+    "extensions"})
+public class CMPConnectionFactoryBinding {
+
+    protected List<Property> properties;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String jndiName;
+    @XmlAttribute
+    protected String loginConfigurationName;
+    @XmlAttribute
+    protected CMPResAuthEnum resAuth;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the properties 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 properties property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getProperties().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Property }
+     */
+    public List<Property> getProperties() {
+        if (properties == null) {
+            properties = new ArrayList<Property>();
+        }
+        return this.properties;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the jndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJndiName() {
+        return jndiName;
+    }
+
+    /**
+     * Sets the value of the jndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJndiName(final String value) {
+        this.jndiName = value;
+    }
+
+    /**
+     * Gets the value of the loginConfigurationName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLoginConfigurationName() {
+        return loginConfigurationName;
+    }
+
+    /**
+     * Sets the value of the loginConfigurationName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLoginConfigurationName(final String value) {
+        this.loginConfigurationName = value;
+    }
+
+    /**
+     * Gets the value of the resAuth property.
+     *
+     * @return possible object is {@link CMPResAuthEnum }
+     */
+    public CMPResAuthEnum getResAuth() {
+        return resAuth;
+    }
+
+    /**
+     * Sets the value of the resAuth property.
+     *
+     * @param value allowed object is {@link CMPResAuthEnum }
+     */
+    public void setResAuth(final CMPResAuthEnum value) {
+        this.resAuth = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPResAuthEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPResAuthEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPResAuthEnum.java
index eae3532..6fb5a79 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPResAuthEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPResAuthEnum.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.was.v6.ejbbnd;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for CMPResAuthType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="CMPResAuthType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Per_Connection_Factory"/>
- *     &lt;enumeration value="Container"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum CMPResAuthEnum {
-
-    @XmlEnumValue("Per_Connection_Factory")
-    PER_CONNECTION_FACTORY("Per_Connection_Factory"), @XmlEnumValue("Container")
-    CONTAINER("Container");
-    private final String value;
-
-    CMPResAuthEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static CMPResAuthEnum fromValue(final String v) {
-        for (final CMPResAuthEnum c : CMPResAuthEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejbbnd;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for CMPResAuthType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="CMPResAuthType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Per_Connection_Factory"/>
+ *     &lt;enumeration value="Container"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum CMPResAuthEnum {
+
+    @XmlEnumValue("Per_Connection_Factory")
+    PER_CONNECTION_FACTORY("Per_Connection_Factory"), @XmlEnumValue("Container")
+    CONTAINER("Container");
+    private final String value;
+
+    CMPResAuthEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static CMPResAuthEnum fromValue(final String v) {
+        for (final CMPResAuthEnum c : CMPResAuthEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java
index 5d7a5b6..b8e138b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java
@@ -1,415 +1,415 @@
-/**
- * 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.was.v6.ejbbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.commonbnd.ResourceRefBinding;
-import org.apache.openejb.jee.was.v6.ejb.EJBJar;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for EJBJarBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EJBJarBinding">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="defaultDatasource" type="{commonbnd.xmi}ResourceRefBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="ejbJar" type="{ejb.xmi}EJBJar"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="ejbBindings" type="{ejbbnd.xmi}EnterpriseBeanBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="defaultCMPConnectionFactory" type="{ejbbnd.xmi}CMPConnectionFactoryBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="currentBackendId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="ejbJar" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EJBJarBinding", propOrder = {"defaultDatasources", "ejbJars",
-    "ejbBindings", "defaultCMPConnectionFactories", "extensions"})
-public class EJBJarBinding {
-
-    @XmlElement(name = "defaultDatasource")
-    protected List<ResourceRefBinding> defaultDatasources;
-    @XmlElement(name = "ejbJar")
-    protected List<EJBJar> ejbJars;
-    protected List<EnterpriseBeanBinding> ejbBindings;
-    @XmlElement(name = "defaultCMPConnectionFactory")
-    protected List<CMPConnectionFactoryBinding> defaultCMPConnectionFactories;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String currentBackendId;
-    @XmlAttribute
-    protected String ejbJar;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the defaultDatasources 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 defaultDatasources property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDefaultDatasources().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceRefBinding }
-     */
-    public List<ResourceRefBinding> getDefaultDatasources() {
-        if (defaultDatasources == null) {
-            defaultDatasources = new ArrayList<ResourceRefBinding>();
-        }
-        return this.defaultDatasources;
-    }
-
-    /**
-     * Gets the value of the ejbJars 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 ejbJars property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEjbJars().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link EJBJar }
-     */
-    public List<EJBJar> getEjbJars() {
-        if (ejbJars == null) {
-            ejbJars = new ArrayList<EJBJar>();
-        }
-        return this.ejbJars;
-    }
-
-    /**
-     * Gets the value of the ejbBindings 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 ejbBindings property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEjbBindings().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EnterpriseBeanBinding }
-     */
-    public List<EnterpriseBeanBinding> getEjbBindings() {
-        if (ejbBindings == null) {
-            ejbBindings = new ArrayList<EnterpriseBeanBinding>();
-        }
-        return this.ejbBindings;
-    }
-
-    /**
-     * Gets the value of the defaultCMPConnectionFactories 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 defaultCMPConnectionFactories property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDefaultCMPConnectionFactories().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CMPConnectionFactoryBinding }
-     */
-    public List<CMPConnectionFactoryBinding> getDefaultCMPConnectionFactories() {
-        if (defaultCMPConnectionFactories == null) {
-            defaultCMPConnectionFactories = new ArrayList<CMPConnectionFactoryBinding>();
-        }
-        return this.defaultCMPConnectionFactories;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the currentBackendId property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getCurrentBackendId() {
-        return currentBackendId;
-    }
-
-    /**
-     * Sets the value of the currentBackendId property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setCurrentBackendId(final String value) {
-        this.currentBackendId = value;
-    }
-
-    /**
-     * Gets the value of the ejbJar property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEjbJar() {
-        return ejbJar;
-    }
-
-    /**
-     * Sets the value of the ejbJar property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEjbJar(final String value) {
-        this.ejbJar = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejbbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.commonbnd.ResourceRefBinding;
+import org.apache.openejb.jee.was.v6.ejb.EJBJar;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for EJBJarBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EJBJarBinding">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="defaultDatasource" type="{commonbnd.xmi}ResourceRefBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="ejbJar" type="{ejb.xmi}EJBJar"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="ejbBindings" type="{ejbbnd.xmi}EnterpriseBeanBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="defaultCMPConnectionFactory" type="{ejbbnd.xmi}CMPConnectionFactoryBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="currentBackendId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ejbJar" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EJBJarBinding", propOrder = {"defaultDatasources", "ejbJars",
+    "ejbBindings", "defaultCMPConnectionFactories", "extensions"})
+public class EJBJarBinding {
+
+    @XmlElement(name = "defaultDatasource")
+    protected List<ResourceRefBinding> defaultDatasources;
+    @XmlElement(name = "ejbJar")
+    protected List<EJBJar> ejbJars;
+    protected List<EnterpriseBeanBinding> ejbBindings;
+    @XmlElement(name = "defaultCMPConnectionFactory")
+    protected List<CMPConnectionFactoryBinding> defaultCMPConnectionFactories;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String currentBackendId;
+    @XmlAttribute
+    protected String ejbJar;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the defaultDatasources 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 defaultDatasources property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDefaultDatasources().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceRefBinding }
+     */
+    public List<ResourceRefBinding> getDefaultDatasources() {
+        if (defaultDatasources == null) {
+            defaultDatasources = new ArrayList<ResourceRefBinding>();
+        }
+        return this.defaultDatasources;
+    }
+
+    /**
+     * Gets the value of the ejbJars 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 ejbJars property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEjbJars().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link EJBJar }
+     */
+    public List<EJBJar> getEjbJars() {
+        if (ejbJars == null) {
+            ejbJars = new ArrayList<EJBJar>();
+        }
+        return this.ejbJars;
+    }
+
+    /**
+     * Gets the value of the ejbBindings 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 ejbBindings property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEjbBindings().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EnterpriseBeanBinding }
+     */
+    public List<EnterpriseBeanBinding> getEjbBindings() {
+        if (ejbBindings == null) {
+            ejbBindings = new ArrayList<EnterpriseBeanBinding>();
+        }
+        return this.ejbBindings;
+    }
+
+    /**
+     * Gets the value of the defaultCMPConnectionFactories 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 defaultCMPConnectionFactories property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDefaultCMPConnectionFactories().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CMPConnectionFactoryBinding }
+     */
+    public List<CMPConnectionFactoryBinding> getDefaultCMPConnectionFactories() {
+        if (defaultCMPConnectionFactories == null) {
+            defaultCMPConnectionFactories = new ArrayList<CMPConnectionFactoryBinding>();
+        }
+        return this.defaultCMPConnectionFactories;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the currentBackendId property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getCurrentBackendId() {
+        return currentBackendId;
+    }
+
+    /**
+     * Sets the value of the currentBackendId property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setCurrentBackendId(final String value) {
+        this.currentBackendId = value;
+    }
+
+    /**
+     * Gets the value of the ejbJar property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEjbJar() {
+        return ejbJar;
+    }
+
+    /**
+     * Sets the value of the ejbJar property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEjbJar(final String value) {
+        this.ejbJar = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}


[42/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java
index 089790a..c9b911d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java
@@ -1,300 +1,300 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 The display-name type contains a short name that is intended
- * to be displayed by tools. It is used by display-name elements. The
- * display name need not be unique.
- * <p/>
- * Example:
- * <p/>
- * ...
- * <p/>
- * <pre>
- * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;display-name xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en"&gt;
- *
- * 					Employee Self Service
- *
- * 				&lt;/display-name&gt;
- * </pre>
- * <p/>
- * <p/>
- * The value of the xml:lang attribute is "en" (English) by default.
- * <p/>
- * <p/>
- * <p/>
- * Java class for DisplayName complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="DisplayName">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="lang" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DisplayName", propOrder = {"extensions"})
-public class DisplayName {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String lang;
-    @XmlAttribute
-    protected String value;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the lang property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLang() {
-        return lang;
-    }
-
-    /**
-     * Sets the value of the lang property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLang(final String value) {
-        this.lang = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setValue(final String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 The display-name type contains a short name that is intended
+ * to be displayed by tools. It is used by display-name elements. The
+ * display name need not be unique.
+ * <p/>
+ * Example:
+ * <p/>
+ * ...
+ * <p/>
+ * <pre>
+ * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;display-name xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en"&gt;
+ *
+ * 					Employee Self Service
+ *
+ * 				&lt;/display-name&gt;
+ * </pre>
+ * <p/>
+ * <p/>
+ * The value of the xml:lang attribute is "en" (English) by default.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for DisplayName complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="DisplayName">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="lang" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DisplayName", propOrder = {"extensions"})
+public class DisplayName {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String lang;
+    @XmlAttribute
+    protected String value;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the lang property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLang() {
+        return lang;
+    }
+
+    /**
+     * Sets the value of the lang property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLang(final String value) {
+        this.lang = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EJBLocalRef.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EJBLocalRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EJBLocalRef.java
index 59546fc..b5a6c4f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EJBLocalRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EJBLocalRef.java
@@ -1,99 +1,99 @@
-/**
- * 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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @since J2EE1.3 The ejb-local-refType is used by ejb-local-ref elements for
- * the declaration of a reference to an enterprise bean's local home. The
- * declaration consists of:
- * <p/>
- * - an optional description - the EJB reference name used in the code of
- * the Deployment Component that's referencing the enterprise bean - the
- * expected type of the referenced enterprise bean - the expected local
- * home and local interfaces of the referenced enterprise bean - optional
- * ejb-link information, used to specify the referenced enterprise bean
- * <p/>
- * <p/>
- * <p/>
- * Java class for EJBLocalRef complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EJBLocalRef">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}EjbRef">
- *       &lt;attribute name="local" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="localHome" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EJBLocalRef")
-public class EJBLocalRef extends EjbRef {
-
-    @XmlAttribute
-    protected String local;
-    @XmlAttribute
-    protected String localHome;
-
-    /**
-     * Gets the value of the local property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLocal() {
-        return local;
-    }
-
-    /**
-     * Sets the value of the local property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLocal(final String value) {
-        this.local = value;
-    }
-
-    /**
-     * Gets the value of the localHome property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLocalHome() {
-        return localHome;
-    }
-
-    /**
-     * Sets the value of the localHome property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLocalHome(final String value) {
-        this.localHome = 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @since J2EE1.3 The ejb-local-refType is used by ejb-local-ref elements for
+ * the declaration of a reference to an enterprise bean's local home. The
+ * declaration consists of:
+ * <p/>
+ * - an optional description - the EJB reference name used in the code of
+ * the Deployment Component that's referencing the enterprise bean - the
+ * expected type of the referenced enterprise bean - the expected local
+ * home and local interfaces of the referenced enterprise bean - optional
+ * ejb-link information, used to specify the referenced enterprise bean
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for EJBLocalRef complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EJBLocalRef">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}EjbRef">
+ *       &lt;attribute name="local" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="localHome" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EJBLocalRef")
+public class EJBLocalRef extends EjbRef {
+
+    @XmlAttribute
+    protected String local;
+    @XmlAttribute
+    protected String localHome;
+
+    /**
+     * Gets the value of the local property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLocal() {
+        return local;
+    }
+
+    /**
+     * Sets the value of the local property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLocal(final String value) {
+        this.local = value;
+    }
+
+    /**
+     * Gets the value of the localHome property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLocalHome() {
+        return localHome;
+    }
+
+    /**
+     * Sets the value of the localHome property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLocalHome(final String value) {
+        this.localHome = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java
index 6b1f7ee..f66ddbd 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java
@@ -1,408 +1,408 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The ejb-refType is used by ejb-ref elements for the declaration of a
- * reference to an enterprise bean's home. The declaration consists of:
- * <p/>
- * - an optional description - the EJB reference name used in the code of the
- * Deployment Component that's referencing the enterprise bean - the expected
- * type of the referenced enterprise bean - the expected home and remote
- * interfaces of the referenced enterprise bean - optional ejb-link information,
- * used to specify the referenced enterprise bean
- * <p/>
- * <p/>
- * <p/>
- * Java class for EjbRef complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EjbRef">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="home" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="remote" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="type" type="{common.xmi}EjbRefType" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EjbRef", propOrder = {"descriptions", "extensions"})
-public class EjbRef {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String home;
-    @XmlAttribute
-    protected String link;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected String remote;
-    @XmlAttribute(name = "type")
-    protected EjbRefEnum ejbRefType;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the home property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHome() {
-        return home;
-    }
-
-    /**
-     * Sets the value of the home property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHome(final String value) {
-        this.home = value;
-    }
-
-    /**
-     * Gets the value of the link property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLink() {
-        return link;
-    }
-
-    /**
-     * Sets the value of the link property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLink(final String value) {
-        this.link = 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 remote property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getRemote() {
-        return remote;
-    }
-
-    /**
-     * Sets the value of the remote property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setRemote(final String value) {
-        this.remote = value;
-    }
-
-    /**
-     * Gets the value of the ejbRefType property.
-     *
-     * @return possible object is {@link EjbRefEnum }
-     */
-    public EjbRefEnum getEjbRefType() {
-        return ejbRefType;
-    }
-
-    /**
-     * Sets the value of the ejbRefType property.
-     *
-     * @param value allowed object is {@link EjbRefEnum }
-     */
-    public void setEjbRefType(final EjbRefEnum value) {
-        this.ejbRefType = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The ejb-refType is used by ejb-ref elements for the declaration of a
+ * reference to an enterprise bean's home. The declaration consists of:
+ * <p/>
+ * - an optional description - the EJB reference name used in the code of the
+ * Deployment Component that's referencing the enterprise bean - the expected
+ * type of the referenced enterprise bean - the expected home and remote
+ * interfaces of the referenced enterprise bean - optional ejb-link information,
+ * used to specify the referenced enterprise bean
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for EjbRef complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EjbRef">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="home" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="remote" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{common.xmi}EjbRefType" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EjbRef", propOrder = {"descriptions", "extensions"})
+public class EjbRef {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String home;
+    @XmlAttribute
+    protected String link;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String remote;
+    @XmlAttribute(name = "type")
+    protected EjbRefEnum ejbRefType;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the home property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHome() {
+        return home;
+    }
+
+    /**
+     * Sets the value of the home property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHome(final String value) {
+        this.home = value;
+    }
+
+    /**
+     * Gets the value of the link property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLink() {
+        return link;
+    }
+
+    /**
+     * Sets the value of the link property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLink(final String value) {
+        this.link = 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 remote property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getRemote() {
+        return remote;
+    }
+
+    /**
+     * Sets the value of the remote property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setRemote(final String value) {
+        this.remote = value;
+    }
+
+    /**
+     * Gets the value of the ejbRefType property.
+     *
+     * @return possible object is {@link EjbRefEnum }
+     */
+    public EjbRefEnum getEjbRefType() {
+        return ejbRefType;
+    }
+
+    /**
+     * Sets the value of the ejbRefType property.
+     *
+     * @param value allowed object is {@link EjbRefEnum }
+     */
+    public void setEjbRefType(final EjbRefEnum value) {
+        this.ejbRefType = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRefEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRefEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRefEnum.java
index 0afa577..b62fb86 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRefEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRefEnum.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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for EjbRefType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="EjbRefType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Session"/>
- *     &lt;enumeration value="Entity"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum EjbRefEnum {
-
-    @XmlEnumValue("Session")
-    SESSION("Session"), @XmlEnumValue("Entity")
-    ENTITY("Entity");
-    private final String value;
-
-    EjbRefEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EjbRefEnum fromValue(final String v) {
-        for (final EjbRefEnum c : EjbRefEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for EjbRefType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="EjbRefType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Session"/>
+ *     &lt;enumeration value="Entity"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum EjbRefEnum {
+
+    @XmlEnumValue("Session")
+    SESSION("Session"), @XmlEnumValue("Entity")
+    ENTITY("Entity");
+    private final String value;
+
+    EjbRefEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static EjbRefEnum fromValue(final String v) {
+        for (final EjbRefEnum c : EjbRefEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java
index 3acb70e..e5a8484 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java
@@ -1,364 +1,364 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The env-entryType is used to declare an application's environment entry. The
- * declaration consists of an optional description, the name of the environment
- * entry, and an optional value. If a value is not specified, one must be
- * supplied during deployment.
- * <p/>
- * It is used by env-entry elements.
- * <p/>
- * <p/>
- * <p/>
- * Java class for EnvEntry complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EnvEntry">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="type" type="{common.xmi}EnvEntryType" />
- *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EnvEntry", propOrder = {"descriptions", "extensions"})
-public class EnvEntry {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute(name = "type")
-    protected EnvEntryEnum envEntryType;
-    @XmlAttribute
-    protected String value;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = 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 envEntryType property.
-     *
-     * @return possible object is {@link EnvEntryEnum }
-     */
-    public EnvEntryEnum getEnvEntryType() {
-        return envEntryType;
-    }
-
-    /**
-     * Sets the value of the envEntryType property.
-     *
-     * @param value allowed object is {@link EnvEntryEnum }
-     */
-    public void setEnvEntryType(final EnvEntryEnum value) {
-        this.envEntryType = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setValue(final String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The env-entryType is used to declare an application's environment entry. The
+ * declaration consists of an optional description, the name of the environment
+ * entry, and an optional value. If a value is not specified, one must be
+ * supplied during deployment.
+ * <p/>
+ * It is used by env-entry elements.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for EnvEntry complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EnvEntry">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{common.xmi}EnvEntryType" />
+ *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EnvEntry", propOrder = {"descriptions", "extensions"})
+public class EnvEntry {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute(name = "type")
+    protected EnvEntryEnum envEntryType;
+    @XmlAttribute
+    protected String value;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = 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 envEntryType property.
+     *
+     * @return possible object is {@link EnvEntryEnum }
+     */
+    public EnvEntryEnum getEnvEntryType() {
+        return envEntryType;
+    }
+
+    /**
+     * Sets the value of the envEntryType property.
+     *
+     * @param value allowed object is {@link EnvEntryEnum }
+     */
+    public void setEnvEntryType(final EnvEntryEnum value) {
+        this.envEntryType = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntryEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntryEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntryEnum.java
index 77da3dd..714e3be 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntryEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntryEnum.java
@@ -1,79 +1,79 @@
-/**
- * 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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for EnvEntryType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="EnvEntryType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="String"/>
- *     &lt;enumeration value="Integer"/>
- *     &lt;enumeration value="Boolean"/>
- *     &lt;enumeration value="Double"/>
- *     &lt;enumeration value="Byte"/>
- *     &lt;enumeration value="Short"/>
- *     &lt;enumeration value="Long"/>
- *     &lt;enumeration value="Float"/>
- *     &lt;enumeration value="Character"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum EnvEntryEnum {
-
-    @XmlEnumValue("String")
-    STRING("String"), @XmlEnumValue("Integer")
-    INTEGER("Integer"), @XmlEnumValue("Boolean")
-    BOOLEAN("Boolean"), @XmlEnumValue("Double")
-    DOUBLE("Double"), @XmlEnumValue("Byte")
-    BYTE("Byte"), @XmlEnumValue("Short")
-    SHORT("Short"), @XmlEnumValue("Long")
-    LONG("Long"), @XmlEnumValue("Float")
-    FLOAT("Float"), @XmlEnumValue("Character")
-    CHARACTER("Character");
-    private final String value;
-
-    EnvEntryEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EnvEntryEnum fromValue(final String v) {
-        for (final EnvEntryEnum c : EnvEntryEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for EnvEntryType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="EnvEntryType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="String"/>
+ *     &lt;enumeration value="Integer"/>
+ *     &lt;enumeration value="Boolean"/>
+ *     &lt;enumeration value="Double"/>
+ *     &lt;enumeration value="Byte"/>
+ *     &lt;enumeration value="Short"/>
+ *     &lt;enumeration value="Long"/>
+ *     &lt;enumeration value="Float"/>
+ *     &lt;enumeration value="Character"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum EnvEntryEnum {
+
+    @XmlEnumValue("String")
+    STRING("String"), @XmlEnumValue("Integer")
+    INTEGER("Integer"), @XmlEnumValue("Boolean")
+    BOOLEAN("Boolean"), @XmlEnumValue("Double")
+    DOUBLE("Double"), @XmlEnumValue("Byte")
+    BYTE("Byte"), @XmlEnumValue("Short")
+    SHORT("Short"), @XmlEnumValue("Long")
+    LONG("Long"), @XmlEnumValue("Float")
+    FLOAT("Float"), @XmlEnumValue("Character")
+    CHARACTER("Character");
+    private final String value;
+
+    EnvEntryEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static EnvEntryEnum fromValue(final String v) {
+        for (final EnvEntryEnum c : EnvEntryEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}


[04/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java b/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java
index 2d40541..1bc65eb 100644
--- a/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java
+++ b/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java
@@ -1,76 +1,76 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.jpa;
-//START SNIPPET: code
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class Movie {
-
-    @Id
-    @GeneratedValue
-    private long id;
-
-    private String director;
-    private String title;
-    private int year;
-
-    public Movie() {
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Movie(String director, String title, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.jpa;
+//START SNIPPET: code
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Movie {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    private String director;
+    private String title;
+    private int year;
+
+    public Movie() {
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Movie(String director, String title, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movies.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movies.java b/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movies.java
index be34072..71847c3 100644
--- a/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movies.java
+++ b/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movies.java
@@ -1,48 +1,48 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.jpa;
-
-//START SNIPPET: code
-
-import javax.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Query;
-import java.util.List;
-
-@Stateful
-public class Movies {
-
-    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
-    private EntityManager entityManager;
-
-    public void addMovie(Movie movie) throws Exception {
-        entityManager.persist(movie);
-    }
-
-    public void deleteMovie(Movie movie) throws Exception {
-        entityManager.remove(movie);
-    }
-
-    public List<Movie> getMovies() throws Exception {
-        Query query = entityManager.createQuery("SELECT m from Movie as m");
-        return query.getResultList();
-    }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.jpa;
+
+//START SNIPPET: code
+
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
+import java.util.List;
+
+@Stateful
+public class Movies {
+
+    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
+    private EntityManager entityManager;
+
+    public void addMovie(Movie movie) throws Exception {
+        entityManager.persist(movie);
+    }
+
+    public void deleteMovie(Movie movie) throws Exception {
+        entityManager.remove(movie);
+    }
+
+    public List<Movie> getMovies() throws Exception {
+        Query query = entityManager.createQuery("SELECT m from Movie as m");
+        return query.getResultList();
+    }
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-entitymanager/src/test/java/org/superbiz/injection/jpa/MoviesTest.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-entitymanager/src/test/java/org/superbiz/injection/jpa/MoviesTest.java b/examples/injection-of-entitymanager/src/test/java/org/superbiz/injection/jpa/MoviesTest.java
index bdb36b7..a5fa5c6 100644
--- a/examples/injection-of-entitymanager/src/test/java/org/superbiz/injection/jpa/MoviesTest.java
+++ b/examples/injection-of-entitymanager/src/test/java/org/superbiz/injection/jpa/MoviesTest.java
@@ -1,57 +1,57 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.jpa;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.List;
-import java.util.Properties;
-
-//START SNIPPET: code
-public class MoviesTest extends TestCase {
-
-    public void test() throws Exception {
-
-        final Properties p = new Properties();
-        p.put("movieDatabase", "new://Resource?type=DataSource");
-        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-        EJBContainer container = EJBContainer.createEJBContainer(p);
-        final Context context = container.getContext();
-
-        Movies movies = (Movies) context.lookup("java:global/injection-of-entitymanager/Movies");
-
-        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
-        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
-
-        List<Movie> list = movies.getMovies();
-        assertEquals("List.size()", 3, list.size());
-
-        for (Movie movie : list) {
-            movies.deleteMovie(movie);
-        }
-
-        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
-
-        container.close();
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.jpa;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.List;
+import java.util.Properties;
+
+//START SNIPPET: code
+public class MoviesTest extends TestCase {
+
+    public void test() throws Exception {
+
+        final Properties p = new Properties();
+        p.put("movieDatabase", "new://Resource?type=DataSource");
+        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+        EJBContainer container = EJBContainer.createEJBContainer(p);
+        final Context context = container.getContext();
+
+        Movies movies = (Movies) context.lookup("java:global/injection-of-entitymanager/Movies");
+
+        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
+        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+        List<Movie> list = movies.getMovies();
+        assertEquals("List.size()", 3, list.size());
+
+        for (Movie movie : list) {
+            movies.deleteMovie(movie);
+        }
+
+        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+
+        container.close();
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Configuration.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Configuration.java b/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Configuration.java
index 49fcf1d..ea49a4a 100644
--- a/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Configuration.java
+++ b/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Configuration.java
@@ -1,63 +1,63 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.enventry;
-
-import javax.annotation.Resource;
-import javax.ejb.Singleton;
-import java.util.Date;
-
-/**
- * This example demostrates the use of the injection of environment entries
- * using <b>Resource</b> annotation.
- * <p/>
- * "EJB Core Contracts and Requirements" specification section 16.4.1.1.
- *
- * @version $Rev$ $Date$
- */
-//START SNIPPET: code
-@Singleton
-public class Configuration {
-
-    @Resource
-    private String color;
-
-    @Resource
-    private Shape shape;
-
-    @Resource
-    private Class strategy;
-
-    @Resource(name = "date")
-    private long date;
-
-    public String getColor() {
-        return color;
-    }
-
-    public Shape getShape() {
-        return shape;
-    }
-
-    public Class getStrategy() {
-        return strategy;
-    }
-
-    public Date getDate() {
-        return new Date(date);
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.enventry;
+
+import javax.annotation.Resource;
+import javax.ejb.Singleton;
+import java.util.Date;
+
+/**
+ * This example demostrates the use of the injection of environment entries
+ * using <b>Resource</b> annotation.
+ * <p/>
+ * "EJB Core Contracts and Requirements" specification section 16.4.1.1.
+ *
+ * @version $Rev$ $Date$
+ */
+//START SNIPPET: code
+@Singleton
+public class Configuration {
+
+    @Resource
+    private String color;
+
+    @Resource
+    private Shape shape;
+
+    @Resource
+    private Class strategy;
+
+    @Resource(name = "date")
+    private long date;
+
+    public String getColor() {
+        return color;
+    }
+
+    public Shape getShape() {
+        return shape;
+    }
+
+    public Class getStrategy() {
+        return strategy;
+    }
+
+    public Date getDate() {
+        return new Date(date);
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java b/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java
index d65a82c..000cfc4 100644
--- a/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java
+++ b/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java
@@ -1,27 +1,27 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.enventry;
-
-/**
- * Exists to show that any class object can be injected and does
- * not need to be loaded directly in app code.
- *
- * @version $Revision$ $Date$
- */
-public class Widget {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.enventry;
+
+/**
+ * Exists to show that any class object can be injected and does
+ * not need to be loaded directly in app code.
+ *
+ * @version $Revision$ $Date$
+ */
+public class Widget {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java b/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java
index eb1d2f4..e43209d 100644
--- a/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java
+++ b/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java
@@ -1,45 +1,45 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.enventry;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.Date;
-
-//START SNIPPET: code
-public class ConfigurationTest extends TestCase {
-
-    public void test() throws Exception {
-        final Context context = EJBContainer.createEJBContainer().getContext();
-
-        final Configuration configuration = (Configuration) context.lookup("java:global/injection-of-env-entry/Configuration");
-
-        assertEquals("orange", configuration.getColor());
-
-        assertEquals(Shape.TRIANGLE, configuration.getShape());
-
-        assertEquals(Widget.class, configuration.getStrategy());
-
-        assertEquals(new Date(123456789), configuration.getDate());
-    }
-}
-//END SNIPPET: code
- 
-
-
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.enventry;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.Date;
+
+//START SNIPPET: code
+public class ConfigurationTest extends TestCase {
+
+    public void test() throws Exception {
+        final Context context = EJBContainer.createEJBContainer().getContext();
+
+        final Configuration configuration = (Configuration) context.lookup("java:global/injection-of-env-entry/Configuration");
+
+        assertEquals("orange", configuration.getColor());
+
+        assertEquals(Shape.TRIANGLE, configuration.getShape());
+
+        assertEquals(Widget.class, configuration.getStrategy());
+
+        assertEquals(new Date(123456789), configuration.getDate());
+    }
+}
+//END SNIPPET: code
+ 
+
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java
index 324f2d8..8781872 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ClassLevelInterceptorOne {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ClassLevelInterceptorOne {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java
index e09fb34..28dfd8e 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ClassLevelInterceptorSuperClassOne {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ClassLevelInterceptorSuperClassOne {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java
index 35f0d4e..d8d62ae 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ClassLevelInterceptorSuperClassTwo extends SuperClassOfClassLevelInterceptor {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ClassLevelInterceptorSuperClassTwo extends SuperClassOfClassLevelInterceptor {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java
index f8c7bf9..39f8837 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ClassLevelInterceptorTwo {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ClassLevelInterceptorTwo {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java
index adfc493..818baf0 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.annotation.PostConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DefaultInterceptorOne {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-
-    @PostConstruct
-    protected void postConstructInterceptor(InvocationContext ic) throws Exception {
-        Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.annotation.PostConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DefaultInterceptorOne {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+
+    @PostConstruct
+    protected void postConstructInterceptor(InvocationContext ic) throws Exception {
+        Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java
index 6390771..3f2b72a 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DefaultInterceptorTwo {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DefaultInterceptorTwo {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java
index 14b34bc..5a5138c 100644
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java
@@ -1,30 +1,30 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface FullyIntercepted {
-
-    List<String> businessMethod();
-
-    List<String> methodWithDefaultInterceptorsExcluded();
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import java.util.List;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface FullyIntercepted {
+
+    List<String> businessMethod();
+
+    List<String> methodWithDefaultInterceptorsExcluded();
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java
index 2dca44c..68192d7 100644
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java
@@ -1,53 +1,53 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- */
-@Stateless
-@Local
-@Interceptors({ClassLevelInterceptorOne.class, ClassLevelInterceptorTwo.class})
-public class FullyInterceptedBean extends FullyInterceptedSuperClass implements FullyIntercepted {
-
-    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
-    public List<String> businessMethod() {
-        List<String> list = new ArrayList<String>();
-        list.add("businessMethod");
-        return list;
-    }
-
-    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
-    public List<String> methodWithDefaultInterceptorsExcluded() {
-        List<String> list = new ArrayList<String>();
-        list.add("methodWithDefaultInterceptorsExcluded");
-        return list;
-    }
-
-    @AroundInvoke
-    protected Object beanClassBusinessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, "beanClassBusinessMethodInterceptor");
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Stateless
+@Local
+@Interceptors({ClassLevelInterceptorOne.class, ClassLevelInterceptorTwo.class})
+public class FullyInterceptedBean extends FullyInterceptedSuperClass implements FullyIntercepted {
+
+    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
+    public List<String> businessMethod() {
+        List<String> list = new ArrayList<String>();
+        list.add("businessMethod");
+        return list;
+    }
+
+    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
+    public List<String> methodWithDefaultInterceptorsExcluded() {
+        List<String> list = new ArrayList<String>();
+        list.add("methodWithDefaultInterceptorsExcluded");
+        return list;
+    }
+
+    @AroundInvoke
+    protected Object beanClassBusinessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, "beanClassBusinessMethodInterceptor");
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java
index c4a4bd6..0153210 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java
@@ -1,27 +1,27 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.Interceptors;
-
-/**
- * @version $Rev$ $Date$
- */
-@Interceptors({ClassLevelInterceptorSuperClassOne.class, ClassLevelInterceptorSuperClassTwo.class})
-public class FullyInterceptedSuperClass {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.Interceptors;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Interceptors({ClassLevelInterceptorSuperClassOne.class, ClassLevelInterceptorSuperClassTwo.class})
+public class FullyInterceptedSuperClass {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java
index fdd2059..dd601cd 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java
@@ -1,31 +1,31 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MethodLevelInterceptorOne {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MethodLevelInterceptorOne {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java
index f0e595e..c7e7841 100644
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import java.io.Serializable;
-import java.util.List;
-
-public interface MethodLevelInterceptorOnlyIntf<T extends Serializable> {
-
-    public List<T> makePersistent(T entity);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import java.io.Serializable;
+import java.util.List;
+
+public interface MethodLevelInterceptorOnlyIntf<T extends Serializable> {
+
+    public List<T> makePersistent(T entity);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java
index bde8c10..61b1136 100644
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java
@@ -1,24 +1,24 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import java.util.List;
-
-public interface MethodLevelInterceptorOnlyParent extends MethodLevelInterceptorOnlyIntf<String> {
-
-    public List<String> makePersistent(String entity);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import java.util.List;
+
+public interface MethodLevelInterceptorOnlyParent extends MethodLevelInterceptorOnlyIntf<String> {
+
+    public List<String> makePersistent(String entity);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java
index c5a2086..92cd641 100644
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java
@@ -1,35 +1,35 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.interceptor.Interceptors;
-import java.util.ArrayList;
-import java.util.List;
-
-@Local(MethodLevelInterceptorOnlyParent.class)
-@Stateless
-public class MethodLevelInterceptorOnlySLSBean implements MethodLevelInterceptorOnlyParent {
-
-    @Interceptors(MethodLevelInterceptorOne.class)
-    public List<String> makePersistent(String entity) {
-        List<String> list = new ArrayList<String>();
-        list.add("makePersistent");
-        return list;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.interceptor.Interceptors;
+import java.util.ArrayList;
+import java.util.List;
+
+@Local(MethodLevelInterceptorOnlyParent.class)
+@Stateless
+public class MethodLevelInterceptorOnlySLSBean implements MethodLevelInterceptorOnlyParent {
+
+    @Interceptors(MethodLevelInterceptorOne.class)
+    public List<String> makePersistent(String entity) {
+        List<String> list = new ArrayList<String>();
+        list.add("makePersistent");
+        return list;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java
index 1569f58..df58bf6 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java
@@ -1,31 +1,31 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MethodLevelInterceptorTwo {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MethodLevelInterceptorTwo {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java
index 2a028dd..a2dc9ad 100644
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java
@@ -1,45 +1,45 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.ejb.Stateless;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- */
-@Stateless
-@Interceptors({ClassLevelInterceptorOne.class, ClassLevelInterceptorTwo.class})
-public class SecondStatelessInterceptedBean implements SecondStatelessInterceptedLocal {
-
-    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
-    public List<String> methodWithDefaultInterceptorsExcluded() {
-        List<String> list = new ArrayList<String>();
-        list.add("methodWithDefaultInterceptorsExcluded");
-        return list;
-
-    }
-
-    @AroundInvoke
-    protected Object beanClassBusinessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.ejb.Stateless;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Stateless
+@Interceptors({ClassLevelInterceptorOne.class, ClassLevelInterceptorTwo.class})
+public class SecondStatelessInterceptedBean implements SecondStatelessInterceptedLocal {
+
+    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
+    public List<String> methodWithDefaultInterceptorsExcluded() {
+        List<String> list = new ArrayList<String>();
+        list.add("methodWithDefaultInterceptorsExcluded");
+        return list;
+
+    }
+
+    @AroundInvoke
+    protected Object beanClassBusinessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java
index b85aaa5..45db243 100644
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java
@@ -1,27 +1,27 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface SecondStatelessInterceptedLocal {
-
-    List<String> methodWithDefaultInterceptorsExcluded();
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import java.util.List;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface SecondStatelessInterceptedLocal {
+
+    List<String> methodWithDefaultInterceptorsExcluded();
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java
index f80daa6..79d1088 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.annotation.PostConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SuperClassOfClassLevelInterceptor {
-
-    @AroundInvoke
-    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-
-    @PostConstruct
-    protected void postConstructInterceptor(InvocationContext ic) throws Exception {
-        Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.annotation.PostConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class SuperClassOfClassLevelInterceptor {
+
+    @AroundInvoke
+    protected Object businessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+
+    @PostConstruct
+    protected void postConstructInterceptor(InvocationContext ic) throws Exception {
+        Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java
index 84ed7e1..acf2614 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java
@@ -1,55 +1,55 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import javax.ejb.Stateless;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- */
-@Stateless
-@Interceptors({ClassLevelInterceptorOne.class, ClassLevelInterceptorTwo.class})
-@ExcludeDefaultInterceptors
-public class ThirdSLSBean implements ThirdSLSBeanLocal {
-
-    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
-    public List<String> businessMethod() {
-        List<String> list = new ArrayList<String>();
-        list.add("businessMethod");
-        return list;
-    }
-
-    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
-    @ExcludeClassInterceptors
-    public List<String> anotherBusinessMethod() {
-        List<String> list = new ArrayList<String>();
-        list.add("anotherBusinessMethod");
-        return list;
-    }
-
-    @AroundInvoke
-    protected Object beanClassBusinessMethodInterceptor(InvocationContext ic) throws Exception {
-        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import javax.ejb.Stateless;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.ExcludeClassInterceptors;
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Stateless
+@Interceptors({ClassLevelInterceptorOne.class, ClassLevelInterceptorTwo.class})
+@ExcludeDefaultInterceptors
+public class ThirdSLSBean implements ThirdSLSBeanLocal {
+
+    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
+    public List<String> businessMethod() {
+        List<String> list = new ArrayList<String>();
+        list.add("businessMethod");
+        return list;
+    }
+
+    @Interceptors({MethodLevelInterceptorOne.class, MethodLevelInterceptorTwo.class})
+    @ExcludeClassInterceptors
+    public List<String> anotherBusinessMethod() {
+        List<String> list = new ArrayList<String>();
+        list.add("anotherBusinessMethod");
+        return list;
+    }
+
+    @AroundInvoke
+    protected Object beanClassBusinessMethodInterceptor(InvocationContext ic) throws Exception {
+        return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java
----------------------------------------------------------------------
diff --git a/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java b/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java
index f903f41..0dd9fe6 100755
--- a/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java
+++ b/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java
@@ -1,29 +1,29 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.interceptors;
-
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface ThirdSLSBeanLocal {
-
-    List<String> businessMethod();
-
-    List<String> anotherBusinessMethod();
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.interceptors;
+
+import java.util.List;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface ThirdSLSBeanLocal {
+
+    List<String> businessMethod();
+
+    List<String> anotherBusinessMethod();
+}


[51/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
removing ^M (windows eol)


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6e2a4f7c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6e2a4f7c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6e2a4f7c

Branch: refs/heads/master
Commit: 6e2a4f7c4191149d1b9e90ef39a7ac25052823fb
Parents: eb7a8fc
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Mon Nov 23 14:38:43 2015 -0500
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Mon Nov 23 14:38:43 2015 -0500

----------------------------------------------------------------------
 .../openejb/testng/PropertiesBuilder.java       |    94 +-
 .../apache/openejb/util/CollectionsUtil.java    |    60 +-
 .../org/apache/openejb/util/LogStreamAsync.java |   446 +-
 .../org/apache/openejb/util/OpenEjbVersion.java |   178 +-
 .../org/apache/openejb/util/OutputScanner.java  |   206 +-
 .../main/java/org/apache/openejb/util/Pipe.java |   150 +-
 .../org/apache/openejb/util/Slf4jLogStream.java |   218 +-
 .../openejb/util/Slf4jLogStreamFactory.java     |    80 +-
 .../src/main/resources/META-INF/ejb-jar.xml     |    40 +-
 .../src/main/resources/META-INF/openejb-jar.xml |    52 +-
 .../org.apache.openejb.cli/validate.examples    |   102 +-
 .../openejb/config/rules/Messages_hi.properties |  1712 +-
 .../PersistenceUnitLinkResolverTest.java        |    88 +-
 .../openejb/activemq/KahaDBSupportTest.java     |    88 +-
 .../openejb/config/AnnotationDeployerTest.java  |  1100 +-
 .../config/rules/CheckAnnotationTest.java       |   174 +-
 .../config/rules/CheckCdiEnabledTest.java       |    86 +-
 .../config/rules/CheckDependsOnTest.java        |   152 +-
 .../rules/CheckIncorrectPropertyNameTest.java   |    98 +-
 .../config/rules/CheckMissingClassTest.java     |   368 +-
 .../config/rules/CheckNoBusinessMethodTest.java |   396 +-
 .../config/rules/CheckNoCreateMethodsTest.java  |   560 +-
 .../rules/CheckPersistenceContextUsageTest.java |   198 +-
 .../rules/CheckPersistenceUnitUsageTest.java    |   192 +-
 .../config/rules/CheckWrongClassTypeTest.java   |    82 +-
 .../openejb/config/rules/InvokeMethod.java      |   402 +-
 .../org/apache/openejb/config/rules/Key.java    |    64 +-
 .../org/apache/openejb/config/rules/Keys.java   |    62 +-
 .../rules/MistakenResourceRefUsageTest.java     |   110 +-
 .../openejb/config/rules/ValidationRunner.java  |   176 +-
 .../PermitAllWithDenyAllOnClassTest.java        |   176 +-
 .../org/apache/openejb/jpa/JTAPuAndBmtTest.java |   308 +-
 .../apache/openejb/junit/PreDestroyTest.java    |   164 +-
 .../openejb/resource/URLAsResourceTest.java     |   142 +-
 .../resource/jdbc/DynamicDataSourceTest.java    |   658 +-
 .../jdbc/driver/AlternateDriverJarTest.java     |   264 +-
 .../apache/openejb/test/annotated/Green.java    |    66 +-
 .../org/apache/openejb/test/annotated/Red.java  |    64 +-
 .../apache/openejb/test/annotated/Yellow.java   |    80 +-
 .../openejb/util/BeanTypeComparisonTest.java    |    70 +-
 .../openejb/util/CollectionsUtilTest.java       |    68 +-
 .../resources/META-INF/jpa-test-mappings.xml    |    42 +-
 .../resources/META-INF/org.acme/service-jar.xml |    42 +-
 .../META-INF/org.router/service-jar.xml         |    56 +-
 .../cmp/itest-2.2/itest-2.2-openejb-jar.xml     |    40 +-
 .../itest-2.2/itest-2.2-pojo-openejb-jar.xml    |   528 +-
 .../itest-2.2/itest-2.2-sun-cmp-mappings.xml    |    40 +-
 .../cmp/itest-2.2/itest-2.2-sun-ejb-jar.xml     |    38 +-
 .../apache/openejb/jee/jpa/CollectionTable.java |   386 +-
 .../openejb/jee/jpa/ElementCollection.java      |  1154 +-
 .../apache/openejb/jee/jpa/LockModeType.java    |   130 +-
 .../org/apache/openejb/jee/jpa/MapKeyClass.java |   150 +-
 .../apache/openejb/jee/jpa/MapKeyColumn.java    |   582 +-
 .../openejb/jee/jpa/MapKeyJoinColumn.java       |   486 +-
 .../org/apache/openejb/jee/jpa/OrderColumn.java |   342 +-
 .../common/CompatibilityDescriptionGroup.java   |   260 +-
 .../openejb/jee/was/v6/common/Description.java  |   586 +-
 .../jee/was/v6/common/DescriptionGroup.java     |   680 +-
 .../openejb/jee/was/v6/common/DisplayName.java  |   600 +-
 .../openejb/jee/was/v6/common/EJBLocalRef.java  |   198 +-
 .../openejb/jee/was/v6/common/EjbRef.java       |   816 +-
 .../openejb/jee/was/v6/common/EjbRefEnum.java   |   130 +-
 .../openejb/jee/was/v6/common/EnvEntry.java     |   728 +-
 .../openejb/jee/was/v6/common/EnvEntryEnum.java |   158 +-
 .../openejb/jee/was/v6/common/IconType.java     |   618 +-
 .../openejb/jee/was/v6/common/Identity.java     |   638 +-
 .../jee/was/v6/common/JNDIEnvRefsGroup.java     |   558 +-
 .../openejb/jee/was/v6/common/Listener.java     |   222 +-
 .../jee/was/v6/common/MessageDestination.java   |   184 +-
 .../was/v6/common/MessageDestinationRef.java    |   786 +-
 .../v6/common/MessageDestinationUsageEnum.java  |   136 +-
 .../jee/was/v6/common/ObjectFactory.java        |   950 +-
 .../openejb/jee/was/v6/common/ParamValue.java   |   678 +-
 .../apache/openejb/jee/was/v6/common/QName.java |   642 +-
 .../openejb/jee/was/v6/common/ResAuthEnum.java  |   132 +-
 .../jee/was/v6/common/ResSharingScopeEnum.java  |   130 +-
 .../jee/was/v6/common/ResourceEnvRef.java       |   792 +-
 .../openejb/jee/was/v6/common/ResourceRef.java  |   834 +-
 .../was/v6/common/RunAsSpecifiedIdentity.java   |   172 +-
 .../jee/was/v6/common/SecurityIdentity.java     |   598 +-
 .../openejb/jee/was/v6/common/SecurityRole.java |   678 +-
 .../jee/was/v6/common/SecurityRoleRef.java      |   684 +-
 .../jee/was/v6/common/UseCallerIdentity.java    |    98 +-
 .../openejb/jee/was/v6/common/package-info.java |    36 +-
 .../jee/was/v6/commonbnd/AbstractAuthData.java  |   488 +-
 .../jee/was/v6/commonbnd/BasicAuthData.java     |   184 +-
 .../jee/was/v6/commonbnd/EjbRefBinding.java     |   630 +-
 .../commonbnd/MessageDestinationRefBinding.java |   634 +-
 .../jee/was/v6/commonbnd/ObjectFactory.java     |   372 +-
 .../openejb/jee/was/v6/commonbnd/Property.java  |   602 +-
 .../was/v6/commonbnd/ResourceEnvRefBinding.java |   634 +-
 .../was/v6/commonbnd/ResourceRefBinding.java    |   804 +-
 .../jee/was/v6/commonbnd/package-info.java      |    36 +-
 .../openejb/jee/was/v6/ecore/EAnnotation.java   |   378 +-
 .../openejb/jee/was/v6/ecore/EAttribute.java    |   134 +-
 .../apache/openejb/jee/was/v6/ecore/EClass.java |   422 +-
 .../openejb/jee/was/v6/ecore/EClassifier.java   |   134 +-
 .../openejb/jee/was/v6/ecore/EDataType.java     |   134 +-
 .../apache/openejb/jee/was/v6/ecore/EEnum.java  |   158 +-
 .../openejb/jee/was/v6/ecore/EEnumLiteral.java  |   134 +-
 .../openejb/jee/was/v6/ecore/EFactory.java      |    88 +-
 .../openejb/jee/was/v6/ecore/EModelElement.java |   158 +-
 .../openejb/jee/was/v6/ecore/ENamedElement.java |   134 +-
 .../openejb/jee/was/v6/ecore/EObject.java       |   476 +-
 .../openejb/jee/was/v6/ecore/EOperation.java    |   276 +-
 .../openejb/jee/was/v6/ecore/EPackage.java      |   310 +-
 .../openejb/jee/was/v6/ecore/EParameter.java    |    88 +-
 .../openejb/jee/was/v6/ecore/EReference.java    |   290 +-
 .../was/v6/ecore/EStringToStringMapEntry.java   |   560 +-
 .../jee/was/v6/ecore/EStructuralFeature.java    |   344 +-
 .../openejb/jee/was/v6/ecore/ETypedElement.java |   374 +-
 .../openejb/jee/was/v6/ecore/ObjectFactory.java |   774 +-
 .../openejb/jee/was/v6/ecore/package-info.java  |    36 +-
 .../jee/was/v6/ejb/AcknowledgeModeEnum.java     |   130 +-
 .../jee/was/v6/ejb/ActivationConfig.java        |   636 +-
 .../was/v6/ejb/ActivationConfigProperty.java    |   574 +-
 .../jee/was/v6/ejb/AssemblyDescriptor.java      |   828 +-
 .../openejb/jee/was/v6/ejb/CMPAttribute.java    |   216 +-
 .../apache/openejb/jee/was/v6/ejb/CMRField.java |   230 +-
 .../jee/was/v6/ejb/ContainerManagedEntity.java  |   636 +-
 .../openejb/jee/was/v6/ejb/DestinationEnum.java |   130 +-
 .../apache/openejb/jee/was/v6/ejb/EJBJar.java   |   402 +-
 .../jee/was/v6/ejb/EJBMethodCategory.java       |   484 +-
 .../openejb/jee/was/v6/ejb/EJBRelation.java     |   728 +-
 .../jee/was/v6/ejb/EJBRelationshipRole.java     |   946 +-
 .../openejb/jee/was/v6/ejb/EnterpriseBean.java  |   852 +-
 .../apache/openejb/jee/was/v6/ejb/Entity.java   |   328 +-
 .../openejb/jee/was/v6/ejb/ExcludeList.java     |   668 +-
 .../openejb/jee/was/v6/ejb/MessageDriven.java   |   666 +-
 .../was/v6/ejb/MessageDrivenDestination.java    |   574 +-
 .../openejb/jee/was/v6/ejb/MethodElement.java   |  1218 +-
 .../jee/was/v6/ejb/MethodElementEnum.java       |   146 +-
 .../jee/was/v6/ejb/MethodPermission.java        |   822 +-
 .../jee/was/v6/ejb/MethodTransaction.java       |   708 +-
 .../jee/was/v6/ejb/MultiplicityEnum.java        |   130 +-
 .../openejb/jee/was/v6/ejb/ObjectFactory.java   |   968 +-
 .../apache/openejb/jee/was/v6/ejb/Query.java    |   760 +-
 .../openejb/jee/was/v6/ejb/QueryMethod.java     |    88 +-
 .../openejb/jee/was/v6/ejb/Relationships.java   |   666 +-
 .../jee/was/v6/ejb/ReturnTypeMappingEnum.java   |   130 +-
 .../openejb/jee/was/v6/ejb/RoleSource.java      |   710 +-
 .../apache/openejb/jee/was/v6/ejb/Session.java  |   352 +-
 .../openejb/jee/was/v6/ejb/SessionEnum.java     |   130 +-
 .../was/v6/ejb/SubscriptionDurabilityEnum.java  |   130 +-
 .../was/v6/ejb/TransactionAttributeEnum.java    |   146 +-
 .../openejb/jee/was/v6/ejb/TransactionEnum.java |   130 +-
 .../openejb/jee/was/v6/ejb/package-info.java    |    36 +-
 .../v6/ejbbnd/CMPConnectionFactoryBinding.java  |   672 +-
 .../jee/was/v6/ejbbnd/CMPResAuthEnum.java       |   130 +-
 .../jee/was/v6/ejbbnd/EJBJarBinding.java        |   830 +-
 .../was/v6/ejbbnd/EnterpriseBeanBinding.java    |  1142 +-
 .../was/v6/ejbbnd/MessageDrivenBeanBinding.java |   266 +-
 .../jee/was/v6/ejbbnd/ObjectFactory.java        |   256 +-
 .../openejb/jee/was/v6/ejbbnd/package-info.java |    36 +-
 .../openejb/jee/was/v6/java/ArrayType.java      |   276 +-
 .../apache/openejb/jee/was/v6/java/Block.java   |   626 +-
 .../apache/openejb/jee/was/v6/java/Comment.java |    88 +-
 .../apache/openejb/jee/was/v6/java/Field.java   |   376 +-
 .../openejb/jee/was/v6/java/Initializer.java    |   628 +-
 .../openejb/jee/was/v6/java/JavaClass.java      |  1028 +-
 .../openejb/jee/was/v6/java/JavaDataType.java   |    92 +-
 .../openejb/jee/was/v6/java/JavaEvent.java      |    92 +-
 .../openejb/jee/was/v6/java/JavaPackage.java    |    92 +-
 .../openejb/jee/was/v6/java/JavaParameter.java  |   180 +-
 .../jee/was/v6/java/JavaParameterEnum.java      |   108 +-
 .../jee/was/v6/java/JavaVisibilityEnum.java     |   108 +-
 .../apache/openejb/jee/was/v6/java/Method.java  |   680 +-
 .../openejb/jee/was/v6/java/ObjectFactory.java  |   528 +-
 .../openejb/jee/was/v6/java/Statement.java      |    88 +-
 .../openejb/jee/was/v6/java/TypeKind.java       |   108 +-
 .../openejb/jee/was/v6/java/package-info.java   |    36 +-
 .../v6/webservice/clientbnd/ObjectFactory.java  |   134 +-
 .../webservice/clientbnd/ServiceRefBinding.java |   634 +-
 .../v6/webservice/clientbnd/package-info.java   |    36 +-
 .../was/v6/wsclient/ComponentScopedRefs.java    |   592 +-
 .../openejb/jee/was/v6/wsclient/Handler.java    |   532 +-
 .../jee/was/v6/wsclient/ObjectFactory.java      |   290 +-
 .../jee/was/v6/wsclient/PortComponentRef.java   |   646 +-
 .../openejb/jee/was/v6/wsclient/ServiceRef.java |   552 +-
 .../jee/was/v6/wsclient/WebServicesClient.java  |   614 +-
 .../jee/was/v6/wsclient/package-info.java       |    36 +-
 .../org/apache/openejb/jee/was/v6/xmi/Add.java  |   202 +-
 .../org/apache/openejb/jee/was/v6/xmi/Any.java  |   210 +-
 .../apache/openejb/jee/was/v6/xmi/Delete.java   |    88 +-
 .../openejb/jee/was/v6/xmi/Difference.java      |   868 +-
 .../openejb/jee/was/v6/xmi/Documentation.java   |  1104 +-
 .../openejb/jee/was/v6/xmi/Extension.java       |   508 +-
 .../apache/openejb/jee/was/v6/xmi/Import.java   |    88 +-
 .../openejb/jee/was/v6/xmi/MetaModel.java       |    88 +-
 .../apache/openejb/jee/was/v6/xmi/Model.java    |    88 +-
 .../openejb/jee/was/v6/xmi/ObjectFactory.java   |   518 +-
 .../jee/was/v6/xmi/PackageReference.java        |   528 +-
 .../apache/openejb/jee/was/v6/xmi/Replace.java  |   202 +-
 .../org/apache/openejb/jee/was/v6/xmi/XMI.java  |   424 +-
 .../openejb/jee/was/v6/xmi/package-info.java    |    36 +-
 .../resources/application-client-example.xml    |    40 +-
 .../test/resources/connector-1.5-example.xml    |    40 +-
 .../src/test/resources/daytrader-corrected.xml  |    40 +-
 .../src/test/resources/daytrader-original.xml   |    40 +-
 .../src/test/resources/ejb-jar-cmp-example1.xml |    40 +-
 .../src/test/resources/ejb-jar-example2.xml     |    40 +-
 .../resources/geronimo-openejb-converted.xml    |    40 +-
 .../src/test/resources/openejb-jar.xml          |    40 +-
 .../src/test/resources/tld-example.xml          |    40 +-
 .../src/test/resources/web-example.xml          |    40 +-
 .../src/test/resources/wls-ejb-jar.xml          |    40 +-
 .../src/test/resources/wls-v81-ejb-jar.xml      |    40 +-
 .../eclipselink/OpenEJBServerPlatform.java      |   112 +-
 doap_tomee.rdf                                  |    86 +-
 .../org/superbiz/accesstimeout/BusyBee.java     |   132 +-
 .../accesstimeout/api/AwaitBriefly.java         |    64 +-
 .../accesstimeout/api/AwaitForever.java         |    64 +-
 .../superbiz/accesstimeout/api/AwaitNever.java  |    62 +-
 .../org/superbiz/accesstimeout/BusyBeeTest.java |   164 +-
 .../org/superbiz/accesstimeout/BusyBee.java     |   128 +-
 .../org/superbiz/accesstimeout/BusyBeeTest.java |   164 +-
 .../src/main/java/org/superbiz/altdd/Movie.java |   122 +-
 .../main/java/org/superbiz/altdd/Movies.java    |   100 +-
 .../java/org/superbiz/altdd/MoviesTest.java     |   198 +-
 .../java/org/superbiz/applet/Calculator.java    |    50 +-
 .../org/superbiz/applet/CalculatorApplet.java   |   200 +-
 .../org/superbiz/applet/CalculatorImpl.java     |    56 +-
 .../test/java/org/superbiz/JNDILookupTest.java  |    92 +-
 .../main/java/org/superbiz/composed/Movie.java  |   122 +-
 .../main/java/org/superbiz/composed/Movies.java |    62 +-
 .../java/org/superbiz/composed/MoviesImpl.java  |   100 +-
 .../java/org/superbiz/composed/MoviesTest.java  |   200 +-
 .../java/org/superbiz/example/jaxws/Agenda.java |    46 +-
 .../org/superbiz/example/jaxws/LazyAgenda.java  |    52 +-
 .../superbiz/example/jaxws/MeetingPlanner.java  |    50 +-
 .../example/jaxws/MeetingPlannerImpl.java       |    64 +-
 .../example/jaxws/MeetingPlannerTest.java       |   130 +-
 .../appexception/BusinessException.java         |    54 +-
 .../appexception/ThrowBusinessException.java    |    66 +-
 .../ThrowBusinessExceptionImpl.java             |    60 +-
 .../appexception/ValueRequiredException.java    |    48 +-
 .../ThrowBusinessExceptionImplTest.java         |   122 +-
 examples/arquillian-jpa/README.md               |   338 +-
 .../superbiz/arquillian/persistence/User.java   |    86 +-
 .../test/persistence/PersistenceTest.java       |   126 +-
 examples/async-methods/README.md                |   308 +-
 .../java/org/superbiz/async/JobProcessor.java   |   110 +-
 .../org/superbiz/async/JobProcessorTest.java    |   132 +-
 .../designbycontract/OlympicGamesManager.java   |    64 +-
 .../designbycontract/PoleVaultingManager.java   |    52 +-
 .../PoleVaultingManagerBean.java                |    56 +-
 .../org/superbiz/webapp1/ejb/BusinessBean.java  |    58 +-
 .../superbiz/webapp1/messages/ErrorList.java    |    74 +-
 .../webapp1/messages/ErrorResponse.java         |   154 +-
 .../ConstraintViolationExceptionMapper.java     |   122 +-
 .../webapp1/service/WebApp1Service.java         |    78 +-
 .../superbiz/webapp2/messages/ErrorList.java    |    74 +-
 .../webapp2/messages/ErrorResponse.java         |   154 +-
 .../ConstraintViolationExceptionMapper.java     |   122 +-
 .../webapp2/service/WebApp2Service.java         |    78 +-
 .../runner/src/test/java/RedeploymentTest.java  |   174 +-
 .../cdi-alternative-and-stereotypes/README.md   |   252 +-
 .../org/superbiz/cdi/stereotype/Journey.java    |    76 +-
 .../cdi/stereotype/LowCostCompanie.java         |    52 +-
 .../org/superbiz/cdi/stereotype/Society.java    |    46 +-
 .../org/superbiz/cdi/stereotype/Vehicle.java    |    46 +-
 .../org/superbiz/cdi/stereotype/AirOpenEJB.java |    78 +-
 .../java/org/superbiz/cdi/stereotype/Mock.java  |    76 +-
 .../superbiz/cdi/stereotype/StereotypeTest.java |   112 +-
 .../org/superbiz/cdi/stereotype/SuperCar.java   |    54 +-
 examples/cdi-application-scope/README.md        |   266 +-
 .../org/superbiz/cdi/applicationscope/Soup.java |    78 +-
 .../superbiz/cdi/applicationscope/Waiter.java   |    76 +-
 .../cdi/applicationscope/RestaurantTest.java    |   110 +-
 .../java/org/superbiz/cdi/basic/Course.java     |   108 +-
 .../java/org/superbiz/cdi/basic/Faculty.java    |    90 +-
 .../java/org/superbiz/cdi/basic/CourseTest.java |   142 +-
 .../superbiz/cdi/ejbcontext/LogginServlet.java  |    78 +-
 .../superbiz/cdi/ejbcontext/PrinciaplEjb.java   |    64 +-
 .../java/org/superbiz/cdi/events/Notifier.java  |    70 +-
 .../java/org/superbiz/cdi/events/EventTest.java |   146 +-
 .../java/org/superbiz/cdi/events/Observer.java  |    86 +-
 .../org/superbiz/cdi/AccessDeniedException.java |    64 +-
 .../BookForAShowOldStyleInterceptorBinding.java |   106 +-
 .../BookForAShowOneInterceptorApplied.java      |    86 +-
 .../BookForAShowTwoInterceptorsApplied.java     |    90 +-
 ...owInterceptorBindingInheritanceExplored.java |    86 +-
 .../cdi/bookshow/interceptorbinding/Log.java    |    64 +-
 .../interceptorbinding/TimeRestrictAndLog.java  |    78 +-
 .../interceptorbinding/TimeRestricted.java      |    64 +-
 .../BookForAShowLoggingInterceptor.java         |   146 +-
 .../TimeBasedRestrictingInterceptor.java        |   102 +-
 .../tracker/InterceptionOrderTracker.java       |    98 +-
 ...kForAShowOldStyleInterceptorBindingTest.java |   116 +-
 .../BookForAShowOneInterceptorAppliedTest.java  |   116 +-
 .../BookForAShowTwoInterceptorsAppiledTest.java |   140 +-
 ...okShowInterceptorBindingInheritanceTest.java |   116 +-
 .../cdi/produces/disposes/ConsoleHandler.java   |    74 +-
 .../cdi/produces/disposes/DatabaseHandler.java  |    76 +-
 .../cdi/produces/disposes/FileHandler.java      |    76 +-
 .../cdi/produces/disposes/LogFactory.java       |   108 +-
 .../cdi/produces/disposes/LogHandler.java       |    50 +-
 .../superbiz/cdi/produces/disposes/Logger.java  |    50 +-
 .../cdi/produces/disposes/LoggerImpl.java       |    74 +-
 .../cdi/produces/disposes/LoggerTest.java       |   134 +-
 examples/cdi-produces-field/README.md           |   540 +-
 .../cdi/produces/field/ConsoleHandler.java      |    74 +-
 .../cdi/produces/field/DatabaseHandler.java     |    76 +-
 .../cdi/produces/field/FileHandler.java         |    76 +-
 .../superbiz/cdi/produces/field/LogFactory.java |    88 +-
 .../superbiz/cdi/produces/field/LogHandler.java |    50 +-
 .../org/superbiz/cdi/produces/field/Logger.java |    50 +-
 .../superbiz/cdi/produces/field/LoggerImpl.java |    74 +-
 .../src/main/resources/META-INF/beans.xml       |    48 +-
 .../superbiz/cdi/produces/field/LoggerTest.java |   134 +-
 .../src/main/java/org/superbiz/AuthBean.java    |    96 +-
 .../main/java/org/superbiz/SecuredServlet.java  |    64 +-
 .../test/java/org/superbiz/AuthBeanTest.java    |   204 +-
 examples/cdi-request-scope/README.md            |   300 +-
 .../org/superbiz/cdi/requestscope/Chef.java     |    62 +-
 .../org/superbiz/cdi/requestscope/Soup.java     |    78 +-
 .../org/superbiz/cdi/requestscope/Waiter.java   |    74 +-
 .../cdi/requestscope/RestaurantTest.java        |   110 +-
 .../org/superbiz/cdi/session/AnswerBean.java    |    80 +-
 .../org/superbiz/cdi/session/InputServlet.java  |    88 +-
 .../org/superbiz/cdi/session/OutputServlet.java |    84 +-
 .../org/superbiz/cdi/session/SessionBean.java   |    68 +-
 .../test/java/org/superbiz/jaxws/Rot13Test.java |   102 +-
 .../java/org/superbiz/client/SenderTest.java    |   110 +-
 .../main/java/org/superbiz/FriendlyPerson.java  |   252 +-
 .../org/superbiz/FriendlyPersonEjbHome.java     |    58 +-
 .../superbiz/FriendlyPersonEjbLocalHome.java    |    58 +-
 .../superbiz/FriendlyPersonEjbLocalObject.java  |    70 +-
 .../org/superbiz/FriendlyPersonEjbObject.java   |    78 +-
 .../java/org/superbiz/FriendlyPersonLocal.java  |    78 +-
 .../java/org/superbiz/FriendlyPersonRemote.java |    76 +-
 .../java/org/superbiz/FriendlyPersonTest.java   |   360 +-
 .../org/superbiz/cucumber/CucumberTest.java     |    50 +-
 .../org/superbiz/cucumber/HelloStepDef.java     |    84 +-
 .../java/org/superbiz/enventries/Pickup.java    |    70 +-
 .../org/superbiz/enventries/PickupEditor.java   |    90 +-
 .../org/superbiz/enventries/Stratocaster.java   |   152 +-
 .../java/org/superbiz/enventries/Style.java     |    60 +-
 .../superbiz/enventries/StratocasterTest.java   |   126 +-
 .../main/java/org/superbiz/dsdef/Persister.java |    84 +-
 .../dsdef/DataSourceDefinitionTest.java         |   220 +-
 examples/datasource-versioning/README.md        |   772 +-
 .../org/superbiz/AlternateDataSourceTest.java   |   202 +-
 .../src/test/resources/META-INF/resources.xml   |    70 +-
 .../cdi/decorators/AccessDeniedException.java   |    60 +-
 .../org/superbiz/cdi/decorators/Calculator.java |    66 +-
 .../superbiz/cdi/decorators/CalculatorBean.java |    84 +-
 .../cdi/decorators/CalculatorLogging.java       |   120 +-
 .../cdi/decorators/CalculatorSecurity.java      |   130 +-
 .../superbiz/cdi/decorators/CalculatorTest.java |   232 +-
 .../org/superbiz/deltaspike/config/Counter.java |    74 +-
 .../deltaspike/config/MyConfigSource.java       |   158 +-
 .../config/MyConfigSourceProvider.java          |    60 +-
 .../superbiz/deltaspike/config/ConfigTest.java  |   118 +-
 .../exceptionhandling/OSExceptionHandler.java   |    68 +-
 .../exceptionhandling/OSRuntimeException.java   |    42 +-
 .../exceptionhandling/OSValidator.java          |    70 +-
 .../ExceptionHandlingDemoTest.java              |   116 +-
 .../superbiz/deltaspike/CustomProjectStage.java |    60 +-
 .../superbiz/deltaspike/DebugPhaseListener.java |    98 +-
 .../deltaspike/WebappMessageBundle.java         |    76 +-
 .../deltaspike/domain/AbstractDomainObject.java |    86 +-
 .../org/superbiz/deltaspike/domain/Comment.java |   106 +-
 .../superbiz/deltaspike/domain/Feedback.java    |   138 +-
 .../org/superbiz/deltaspike/domain/User.java    |   206 +-
 .../domain/validation/DifferentName.java        |    76 +-
 .../validation/DifferentNameValidator.java      |    66 +-
 .../deltaspike/domain/validation/Full.java      |    52 +-
 .../deltaspike/domain/validation/Name.java      |    94 +-
 .../deltaspike/domain/validation/Partial.java   |    42 +-
 .../domain/validation/UniqueUserName.java       |    42 +-
 .../deltaspike/domain/validation/UserName.java  |    88 +-
 .../startup/ModuleStartupObserver.java          |    76 +-
 .../superbiz/deltaspike/view/FeedbackPage.java  |   148 +-
 .../org/superbiz/deltaspike/view/InfoPage.java  |    72 +-
 .../org/superbiz/deltaspike/view/MenuBean.java  |   122 +-
 .../deltaspike/view/RegistrationPage.java       |   184 +-
 .../superbiz/deltaspike/view/UserHolder.java    |   108 +-
 .../superbiz/deltaspike/view/config/Pages.java  |   110 +-
 .../view/security/LoginAccessDecisionVoter.java |    96 +-
 .../superbiz/deltaspike/view/util/InfoBean.java |   270 +-
 .../deltaspike/test/MockedPageBeanTest.java     |   198 +-
 .../superbiz/deltaspike/test/PageBeanTest.java  |   254 +-
 .../superbiz/deltaspike/i18n/MessageHelper.java |    54 +-
 .../deltaspike/i18n/MessageHelperTest.java      |   112 +-
 .../main/java/org/superbiz/dynamic/User.java    |   122 +-
 .../BoostrapUtility.java                        |   102 +-
 .../DeterminedRouter.java                       |   214 +-
 .../dynamicdatasourcerouting/Person.java        |   106 +-
 .../RoutedPersister.java                        |    74 +-
 .../org/superbiz/dynamic/SocialInterceptor.java |    80 +-
 .../dynamic/mbean/DynamicMBeanHandler.java      |   520 +-
 .../org/superbiz/dynamic/mbean/ObjectName.java  |    78 +-
 .../dynamic/mbean/DynamicMBeanClient.java       |    72 +-
 .../dynamic/mbean/DynamicMBeanClientTest.java   |   216 +-
 .../dynamic/mbean/DynamicRemoteMBeanClient.java |    80 +-
 .../superbiz/dynamic/mbean/simple/Simple.java   |    82 +-
 .../dynamic/mbean/simple/SimpleMBean.java       |    54 +-
 examples/ear-testing/README.md                  |   424 +-
 .../main/java/org/superbiz/logic/Movies.java    |    66 +-
 .../java/org/superbiz/logic/MoviesImpl.java     |   100 +-
 .../java/org/superbiz/logic/MoviesTest.java     |   128 +-
 .../src/main/java/org/superbiz/model/Movie.java |   124 +-
 .../java/org/superbiz/servlet/AnnotatedEJB.java |   104 +-
 .../org/superbiz/servlet/AnnotatedEJBLocal.java |    64 +-
 .../superbiz/servlet/AnnotatedEJBRemote.java    |    54 +-
 .../org/superbiz/servlet/AnnotatedServlet.java  |   174 +-
 .../org/superbiz/servlet/ClientHandler.java     |    72 +-
 .../java/org/superbiz/servlet/HelloEjb.java     |    50 +-
 .../org/superbiz/servlet/HelloEjbService.java   |    80 +-
 .../java/org/superbiz/servlet/HelloPojo.java    |    50 +-
 .../org/superbiz/servlet/HelloPojoService.java  |    76 +-
 .../java/org/superbiz/servlet/JndiServlet.java  |   168 +-
 .../main/java/org/superbiz/servlet/JpaBean.java |   100 +-
 .../java/org/superbiz/servlet/JpaServlet.java   |   144 +-
 .../java/org/superbiz/servlet/ResourceBean.java |    68 +-
 .../java/org/superbiz/servlet/RunAsServlet.java |   184 +-
 .../java/org/superbiz/servlet/SecureEJB.java    |   122 +-
 .../org/superbiz/servlet/SecureEJBLocal.java    |    72 +-
 .../org/superbiz/servlet/SecureServlet.java     |   184 +-
 .../org/superbiz/servlet/ServerHandler.java     |    74 +-
 .../org/superbiz/servlet/WebserviceClient.java  |   158 +-
 .../org/superbiz/servlet/WebserviceServlet.java |   138 +-
 .../main/java/org/superbiz/ws/Calculator.java   |    74 +-
 .../main/java/org/superbiz/hello/HelloBean.java |    66 +-
 .../java/org/superbiz/hello/HelloEjbLocal.java  |    56 +-
 .../org/superbiz/hello/HelloEjbLocalHome.java   |    56 +-
 .../test/java/org/superbiz/hello/HelloTest.java |    84 +-
 .../org/superbiz/injection/jms/Messages.java    |   212 +-
 .../injection/jms/MessagingBeanTest.java        |    84 +-
 .../main/java/org/superbiz/injection/Movie.java |   122 +-
 .../java/org/superbiz/injection/Movies.java     |   212 +-
 .../java/org/superbiz/injection/MoviesTest.java |   108 +-
 .../java/org/superbiz/injection/DataReader.java |   118 +-
 .../java/org/superbiz/injection/DataStore.java  |    78 +-
 .../org/superbiz/injection/DataStoreLocal.java  |    68 +-
 .../org/superbiz/injection/DataStoreRemote.java |    66 +-
 .../superbiz/injection/EjbDependencyTest.java   |    84 +-
 .../java/org/superbiz/injection/jpa/Movie.java  |   152 +-
 .../java/org/superbiz/injection/jpa/Movies.java |    96 +-
 .../org/superbiz/injection/jpa/MoviesTest.java  |   114 +-
 .../injection/enventry/Configuration.java       |   126 +-
 .../org/superbiz/injection/enventry/Widget.java |    54 +-
 .../injection/enventry/ConfigurationTest.java   |    90 +-
 .../interceptors/ClassLevelInterceptorOne.java  |    64 +-
 .../ClassLevelInterceptorSuperClassOne.java     |    64 +-
 .../ClassLevelInterceptorSuperClassTwo.java     |    64 +-
 .../interceptors/ClassLevelInterceptorTwo.java  |    64 +-
 .../interceptors/DefaultInterceptorOne.java     |    74 +-
 .../interceptors/DefaultInterceptorTwo.java     |    64 +-
 .../superbiz/interceptors/FullyIntercepted.java |    60 +-
 .../interceptors/FullyInterceptedBean.java      |   106 +-
 .../FullyInterceptedSuperClass.java             |    54 +-
 .../interceptors/MethodLevelInterceptorOne.java |    62 +-
 .../MethodLevelInterceptorOnlyIntf.java         |    50 +-
 .../MethodLevelInterceptorOnlyParent.java       |    48 +-
 .../MethodLevelInterceptorOnlySLSBean.java      |    70 +-
 .../interceptors/MethodLevelInterceptorTwo.java |    62 +-
 .../SecondStatelessInterceptedBean.java         |    90 +-
 .../SecondStatelessInterceptedLocal.java        |    54 +-
 .../SuperClassOfClassLevelInterceptor.java      |    74 +-
 .../org/superbiz/interceptors/ThirdSLSBean.java |   110 +-
 .../interceptors/ThirdSLSBeanLocal.java         |    58 +-
 .../java/org/superbiz/interceptors/Utils.java   |    76 +-
 .../interceptors/FullyInterceptedTest.java      |   188 +-
 .../MethodLevelInterceptorOnlyTest.java         |   114 +-
 .../SecondStatelessInterceptedTest.java         |   126 +-
 .../superbiz/interceptors/ThirdSLSBeanTest.java |   156 +-
 examples/javamail/README.md                     |   368 +-
 .../java/org/superbiz/rest/EmailService.java    |   144 +-
 .../org/superbiz/rest/EmailServiceTest.java     |    94 +-
 .../java/org/superbiz/eclipselink/Movie.java    |   136 +-
 .../java/org/superbiz/eclipselink/Movies.java   |    90 +-
 .../org/superbiz/eclipselink/MoviesTest.java    |   108 +-
 .../main/java/org/superbiz/jpa/enums/Movie.java |   158 +-
 .../java/org/superbiz/jpa/enums/Movies.java     |   108 +-
 .../java/org/superbiz/jpa/enums/MoviesTest.java |   108 +-
 .../org/superbiz/injection/h3jpa/Movie.java     |   136 +-
 .../org/superbiz/injection/h3jpa/Movies.java    |    90 +-
 .../superbiz/injection/h3jpa/MoviesTest.java    |   106 +-
 .../main/java/org/superbiz/jsf/Calculator.java  |    56 +-
 .../main/java/org/superbiz/jsf/Calculator.java  |    50 +-
 .../java/org/superbiz/jsf/CalculatorImpl.java   |    56 +-
 .../java/org/superbiz/ejblookup/BlueBean.java   |    78 +-
 .../java/org/superbiz/ejblookup/Friend.java     |    68 +-
 .../java/org/superbiz/ejblookup/RedBean.java    |    76 +-
 .../superbiz/ejblookup/EjbDependencyTest.java   |   108 +-
 .../java/org/superbiz/ejblookup/BlueBean.java   |    86 +-
 .../java/org/superbiz/ejblookup/Friend.java     |    74 +-
 .../java/org/superbiz/ejblookup/RedBean.java    |    84 +-
 .../superbiz/ejblookup/EjbDependencyTest.java   |   108 +-
 .../org/superbiz/mbean/GuessHowManyMBean.java   |    96 +-
 .../superbiz/mbean/GuessHowManyMBeanTest.java   |   102 +-
 .../main/java/org/superbiz/moviefun/Movie.java  |   202 +-
 .../java/org/superbiz/moviefun/MoviesBean.java  |   180 +-
 .../moviefun/rest/ApplicationConfig.java        |    64 +-
 .../org/superbiz/moviefun/rest/LoadRest.java    |    82 +-
 .../org/superbiz/moviefun/rest/MoviesRest.java  |   158 +-
 .../org/superbiz/moviefun/MoviesEJBTest.java    |   154 +-
 .../moviefun/MoviesEmbeddedEJBTest.java         |   148 +-
 .../java/org/superbiz/moviefun/MoviesTest.java  |   148 +-
 .../org/superbiz/moviefun/ActionServlet.java    |   276 +-
 .../main/java/org/superbiz/moviefun/Movie.java  |   206 +-
 .../java/org/superbiz/moviefun/MoviesBean.java  |   228 +-
 .../java/org/superbiz/moviefun/Basedir.java     |    68 +-
 .../moviefun/MoviesArquillianHtmlUnitTest.java  |   218 +-
 .../org/superbiz/moviefun/MoviesEJBTest.java    |   156 +-
 .../moviefun/MoviesEmbeddedEJBTest.java         |   148 +-
 .../superbiz/moviefun/MoviesHtmlUnitTest.java   |   206 +-
 .../java/org/superbiz/moviefun/MoviesTest.java  |   148 +-
 .../superbiz/injection/tx/AddInterceptor.java   |    62 +-
 .../injection/tx/DeleteInterceptor.java         |    64 +-
 .../java/org/superbiz/injection/tx/Movie.java   |   122 +-
 .../java/org/superbiz/injection/tx/Movies.java  |   104 +-
 .../org/superbiz/injection/tx/api/Metatype.java |    58 +-
 .../superbiz/injection/tx/api/MovieUnit.java    |    66 +-
 .../org/superbiz/injection/tx/MoviesTest.java   |   284 +-
 .../superbiz/injection/tx/AddInterceptor.java   |    62 +-
 .../injection/tx/DeleteInterceptor.java         |    64 +-
 .../java/org/superbiz/injection/tx/Movie.java   |   122 +-
 .../java/org/superbiz/injection/tx/Movies.java  |   118 +-
 .../org/superbiz/injection/tx/MoviesTest.java   |   284 +-
 .../java/org/superbiz/mtom/AbstractService.java |    52 +-
 .../main/java/org/superbiz/mtom/EjbService.java |    68 +-
 .../java/org/superbiz/mtom/PojoService.java     |    64 +-
 .../main/java/org/superbiz/mtom/Request.java    |    86 +-
 .../main/java/org/superbiz/mtom/Response.java   |    92 +-
 .../main/java/org/superbiz/mtom/Service.java    |    70 +-
 .../org/superbiz/mtom/AbstractServiceTest.java  |    94 +-
 .../java/org/superbiz/mtom/EjbServiceTest.java  |    58 +-
 .../java/org/superbiz/mtom/PojoServiceTest.java |    60 +-
 .../main/java/org/superbiz/model/Person.java    |    86 +-
 .../src/test/java/org/superbiz/JPATest.java     |   118 +-
 .../enricher/jpa/HibernateEnricher.java         |    58 +-
 .../org/superbiz/enricher/jpa/JPAEnrichers.java |    78 +-
 .../superbiz/enricher/jpa/OpenJPAEnricher.java  |    58 +-
 .../org/superbiz/enricher/maven/Enrichers.java  |   122 +-
 .../src/main/java/org/superbiz/SomeEJB.java     |    54 +-
 .../src/main/java/org/superbiz/SomeRest.java    |    64 +-
 .../embedded/remote/EmbeddedRemote.java         |    42 +-
 .../remote/OpenEJBEmbeddedRemoteTest.java       |    96 +-
 .../superbiz/embedded/standalone/Embedded.java  |    42 +-
 .../standalone/OpenEJBEmbeddedTest.java         |   100 +-
 .../superbiz/tomee/embedded/TomEEEmbedded.java  |    42 +-
 .../tomee/embedded/TomEEEmbeddedTest.java       |   100 +-
 .../org/superbiz/tomee/remote/TomEERemote.java  |    42 +-
 .../superbiz/tomee/remote/TomEERemoteTest.java  |   106 +-
 .../arquillian/multiple/MultipleTomEETest.java  |   132 +-
 examples/myfaces-codi-demo/README.md            |   128 +-
 .../jpa/AbstractGenericJpaRepository.java       |   192 +-
 .../myfaces/startup/ExtValLifecycleFactory.java |   242 +-
 .../superbiz/myfaces/view/RegistrationPage.java |   200 +-
 .../org/superbiz/myfaces/view/config/Pages.java |   132 +-
 .../superbiz/myfaces/view/util/InfoBean.java    |   256 +-
 ...cdi.core.api.projectstage.ProjectStageHolder |    34 +-
 .../java/org/superbiz/injection/jpa/Movie.java  |   140 +-
 .../org/superbiz/injection/jpa/MoviesTest.java  |   100 +-
 .../main/java/org/superbiz/ws/pojo/PojoWS.java  |    90 +-
 .../src/main/java/org/superbiz/ws/pojo/WS.java  |    50 +-
 .../src/main/java/jug/client/Client.java        |   168 +-
 .../jug/client/command/api/AbstractCommand.java |   176 +-
 .../java/jug/client/command/api/Command.java    |    68 +-
 .../client/command/impl/BestPollCommand.java    |    62 +-
 .../jug/client/command/impl/ExitCommand.java    |    74 +-
 .../jug/client/command/impl/HelpCommand.java    |   106 +-
 .../jug/client/command/impl/NewPollCommand.java |    66 +-
 .../client/command/impl/PollResultCommand.java  |    80 +-
 .../jug/client/command/impl/PollsCommand.java   |    62 +-
 .../command/impl/QueryAndPostCommand.java       |    96 +-
 .../client/command/impl/ShowPollCommand.java    |    80 +-
 .../command/impl/SwitchClientCommand.java       |    94 +-
 .../jug/client/command/impl/VoteCommand.java    |    90 +-
 .../java/jug/client/util/ClientNameHolder.java  |    60 +-
 .../java/jug/client/util/CommandManager.java    |   148 +-
 .../util/ConfigurableClasspathArchive.java      |   392 +-
 .../src/main/java/jug/dao/SubjectDao.java       |   230 +-
 .../src/main/java/jug/dao/VoteDao.java          |    84 +-
 .../src/test/java/jug/dao/SubjectDaoTest.java   |   198 +-
 .../src/main/java/jug/domain/Result.java        |   134 +-
 .../src/main/java/jug/domain/Subject.java       |   212 +-
 .../src/main/java/jug/domain/Value.java         |    44 +-
 .../src/main/java/jug/domain/Vote.java          |   104 +-
 .../main/java/jug/monitoring/VoteCounter.java   |   120 +-
 .../main/java/jug/rest/PollingApplication.java  |    64 +-
 .../src/main/java/jug/rest/SubjectService.java  |   224 +-
 .../java/jug/routing/DataSourceInitializer.java |    96 +-
 .../main/java/jug/routing/PollingRouter.java    |   158 +-
 .../main/java/jug/routing/RoutingFilter.java    |   144 +-
 .../test/java/jug/rest/SubjectServiceTest.java  |   160 +-
 .../arquillian/SubjectServiceTomEETest.java     |   166 +-
 .../src/main/java/org/superbiz/Manager.java     |    60 +-
 .../main/java/org/superbiz/ManagerFactory.java  |    76 +-
 .../projectstage/BaseTestForProjectStage.java   |   114 +-
 .../projectstage/DevProjectStageTest.java       |    76 +-
 .../ProductionProjectStageTest.java             |    58 +-
 .../projectstage/TestingProjectStageTest.java   |    76 +-
 .../projectstage/util/ProjectStageProducer.java |   156 +-
 .../main/java/org/superbiz/quartz/JobBean.java  |   130 +-
 .../java/org/superbiz/quartz/QuartzMdb.java     |    70 +-
 .../java/org/superbiz/quartz/QuartzMdbTest.java |   134 +-
 .../java/org/superbiz/reloadable/pu/Person.java |   108 +-
 .../superbiz/reloadable/pu/PersonManager.java   |    88 +-
 .../reloadable/pu/CacheActivationTest.java      |   220 +-
 .../superbiz/composed/rest/GreetingService.java |    70 +-
 .../org/superbiz/composed/rest/Messager.java    |    44 +-
 .../composed/rest/GreetingServiceTest.java      |   134 +-
 .../superbiz/composed/rest/GreetingService.java |    58 +-
 .../rest/IllegalArgumentExceptionMapper.java    |    60 +-
 .../composed/rest/GreetingServiceTest.java      |   154 +-
 .../main/java/org/superbiz/rest/Greeting.java   |    48 +-
 .../java/org/superbiz/rest/GreetingService.java |   132 +-
 .../main/java/org/superbiz/rest/Request.java    |    82 +-
 .../main/java/org/superbiz/rest/Response.java   |    82 +-
 .../org/superbiz/rest/GreetingServiceTest.java  |   174 +-
 .../rest/batcher/SampleDataManager.java         |   160 +-
 .../java/org/superbiz/rest/dao/PostDAO.java     |   144 +-
 .../java/org/superbiz/rest/dao/UserDAO.java     |   130 +-
 .../java/org/superbiz/rest/model/Comment.java   |   150 +-
 .../main/java/org/superbiz/rest/model/Post.java |   182 +-
 .../main/java/org/superbiz/rest/model/User.java |   138 +-
 .../org/superbiz/rest/dao/UserServiceTest.java  |   182 +-
 .../jaxrs/jaas/JAASSecuredRestEndpoint.java     |    84 +-
 .../src/main/java/org/superbiz/rest/User.java   |   200 +-
 .../java/org/superbiz/rest/GreetingService.java |    80 +-
 .../main/java/org/superbiz/rest/Request.java    |    82 +-
 .../main/java/org/superbiz/rest/Response.java   |    82 +-
 .../superbiz/schedule/events/SchedulerTest.java |   156 +-
 .../java/org/superbiz/corn/FarmerBrown.java     |   174 +-
 .../java/org/superbiz/corn/FarmerBrownTest.java |    86 +-
 .../org/superbiz/corn/meta/FarmerBrown.java     |   108 +-
 .../org/superbiz/corn/meta/api/BiAnnually.java  |    72 +-
 .../org/superbiz/corn/meta/api/BiMonthly.java   |    72 +-
 .../java/org/superbiz/corn/meta/api/Daily.java  |    72 +-
 .../org/superbiz/corn/meta/api/HarvestTime.java |    80 +-
 .../java/org/superbiz/corn/meta/api/Hourly.java |    72 +-
 .../org/superbiz/corn/meta/api/Metatype.java    |    58 +-
 .../superbiz/corn/meta/api/PlantingTime.java    |    82 +-
 .../org/superbiz/corn/meta/api/Secondly.java    |    72 +-
 .../org/superbiz/corn/meta/FarmerBrownTest.java |    84 +-
 .../java/org/superbiz/corn/FarmerBrown.java     |   122 +-
 .../java/org/superbiz/corn/FarmerBrownTest.java |    84 +-
 .../java/org/superbiz/event/ListenerTest.java   |    92 +-
 .../superbiz/cdi/bookshow/beans/BookShow.java   |    86 +-
 .../cdi/bookshow/interceptorbinding/Log.java    |    64 +-
 .../interceptors/LoggingInterceptor.java        |   136 +-
 .../cdi/bookshow/interceptors/BookShowTest.java |   102 +-
 .../src/main/java/org/superbiz/cmp2/Movie.java  |    78 +-
 .../main/java/org/superbiz/cmp2/MovieBean.java  |    98 +-
 .../src/main/java/org/superbiz/cmp2/Movies.java |    70 +-
 .../test/java/org/superbiz/cmp2/MoviesTest.java |   120 +-
 .../main/java/org/superbiz/mdb/ChatBean.java    |   186 +-
 .../org/superbiz/mdb/ChatRespondCreator.java    |    64 +-
 .../java/org/superbiz/mdb/ChatBeanTest.java     |   168 +-
 .../java/org/superbiz/mdbdesc/ChatBean.java     |   186 +-
 .../java/org/superbiz/mdbdesc/ChatBeanTest.java |   170 +-
 .../main/java/org/superbiz/mdb/ChatBean.java    |   196 +-
 .../java/org/superbiz/mdb/ChatBeanTest.java     |   168 +-
 .../java/org/superbiz/rest/GreetingService.java |    70 +-
 .../org/superbiz/rest/GreetingServiceTest.java  |   106 +-
 examples/simple-singleton/README.md             |   688 +-
 .../superbiz/registry/ComponentRegistry.java    |   106 +-
 .../org/superbiz/registry/PropertyRegistry.java |   124 +-
 .../registry/ComponentRegistryTest.java         |   144 +-
 .../registry/PropertiesRegistryTest.java        |   118 +-
 .../org/superbiz/counter/CallbackCounter.java   |   146 +-
 .../org/superbiz/counter/ExecutionChannel.java  |    82 +-
 .../org/superbiz/counter/ExecutionObserver.java |    46 +-
 .../superbiz/counter/CounterCallbacksTest.java  |   250 +-
 .../main/java/org/superbiz/counter/Counter.java |   108 +-
 .../java/org/superbiz/counter/CounterTest.java  |   108 +-
 .../stateless/basic/CalculatorBean.java         |   126 +-
 .../stateless/basic/ExecutionChannel.java       |    82 +-
 .../stateless/basic/ExecutionObserver.java      |    46 +-
 .../stateless/basic/CalculatorTest.java         |   178 +-
 .../org/superbiz/calculator/CalculatorImpl.java |    74 +-
 .../superbiz/calculator/CalculatorLocal.java    |    60 +-
 .../superbiz/calculator/CalculatorRemote.java   |    62 +-
 .../org/superbiz/calculator/CalculatorTest.java |   144 +-
 .../stateless/basic/CalculatorBean.java         |    96 +-
 .../stateless/basic/CalculatorTest.java         |   214 +-
 .../org/superbiz/calculator/Calculator.java     |    72 +-
 .../org/superbiz/calculator/CalculatorTest.java |   140 +-
 .../org/superbiz/calculator/ws/Calculator.java  |    74 +-
 .../superbiz/calculator/ws/CalculatorWs.java    |    54 +-
 .../superbiz/calculator/ws/CalculatorTest.java  |   124 +-
 .../java/org/superbiz/dynamic/api/Metatype.java |    60 +-
 .../superbiz/dynamic/api/SpringRepository.java  |    72 +-
 .../dynamic/framework/SpringDataProxy.java      |   100 +-
 .../org/superbiz/dynamic/SpringDataProxy.java   |   100 +-
 .../main/java/org/superbiz/struts/AddUser.java  |   160 +-
 .../main/java/org/superbiz/struts/FindUser.java |   142 +-
 .../java/org/superbiz/struts/ListAllUsers.java  |   144 +-
 .../java/org/superbiz/telephone/Telephone.java  |    52 +-
 .../org/superbiz/telephone/TelephoneBean.java   |   114 +-
 .../org/superbiz/telephone/TelephoneTest.java   |   230 +-
 .../java/org/superbiz/testinjection/Movie.java  |   122 +-
 .../java/org/superbiz/testinjection/Movies.java |   100 +-
 .../org/superbiz/testinjection/MoviesTest.java  |   150 +-
 .../org/superbiz/injection/secure/Movie.java    |   122 +-
 .../org/superbiz/injection/secure/Movies.java   |   110 +-
 .../superbiz/injection/secure/MovieTest.java    |   304 +-
 .../org/superbiz/injection/secure/UserInfo.java |    72 +-
 .../org/superbiz/injection/secure/Movie.java    |   122 +-
 .../org/superbiz/injection/secure/Movies.java   |   110 +-
 .../injection/secure/MyLoginProvider.java       |    78 +-
 .../superbiz/injection/secure/MovieTest.java    |   314 +-
 .../superbiz/injection/secure/LoginBean.java    |    78 +-
 .../org/superbiz/injection/secure/Movie.java    |   122 +-
 .../org/superbiz/injection/secure/Movies.java   |   110 +-
 .../superbiz/injection/secure/MovieTest.java    |   322 +-
 .../org/superbiz/injection/secure/Movie.java    |   122 +-
 .../org/superbiz/injection/secure/Movies.java   |   106 +-
 .../injection/secure/api/AddPermission.java     |    72 +-
 .../injection/secure/api/DeletePermission.java  |    72 +-
 .../superbiz/injection/secure/api/Metatype.java |    58 +-
 .../injection/secure/api/MovieUnit.java         |    66 +-
 .../injection/secure/api/ReadPermission.java    |    78 +-
 .../injection/secure/api/RunAsEmployee.java     |    62 +-
 .../injection/secure/api/RunAsManager.java      |    62 +-
 .../superbiz/injection/secure/MovieTest.java    |   316 +-
 .../org/superbiz/injection/secure/Movie.java    |   122 +-
 .../org/superbiz/injection/secure/Movies.java   |   110 +-
 .../superbiz/injection/secure/MovieTest.java    |   334 +-
 .../java/org/superbiz/injection/tx/Movie.java   |   148 +-
 .../java/org/superbiz/injection/tx/Movies.java  |   124 +-
 .../org/superbiz/injection/tx/MoviesTest.java   |   100 +-
 .../java/org/superbiz/injection/tx/Movie.java   |   122 +-
 .../java/org/superbiz/injection/tx/Movies.java  |   100 +-
 .../org/superbiz/injection/tx/MoviesTest.java   |   214 +-
 .../main/java/org/superbiz/dao/PersonDAO.java   |    90 +-
 .../main/java/org/superbiz/domain/Person.java   |   100 +-
 .../java/org/superbiz/init/Initializer.java     |    76 +-
 .../org/superbiz/service/JerseyApplication.java |    62 +-
 .../org/superbiz/service/PersonService.java     |   102 +-
 .../txrollback/CustomRuntimeException.java      |    76 +-
 .../java/org/superbiz/txrollback/Movie.java     |   136 +-
 .../java/org/superbiz/txrollback/Movies.java    |   124 +-
 .../org/superbiz/txrollback/MoviesTest.java     |   442 +-
 .../org/superbiz/troubleshooting/Movie.java     |   136 +-
 .../org/superbiz/troubleshooting/Movies.java    |    92 +-
 .../superbiz/troubleshooting/MoviesTest.java    |   202 +-
 .../org/superbiz/attachment/AttachmentImpl.java |   158 +-
 .../org/superbiz/attachment/AttachmentWs.java   |    70 +-
 .../org/superbiz/attachment/AttachmentTest.java |   184 +-
 .../org/superbiz/calculator/wsh/Calculator.java |    78 +-
 .../superbiz/calculator/wsh/CalculatorWs.java   |    54 +-
 .../org/superbiz/calculator/wsh/Increment.java  |   126 +-
 .../org/superbiz/calculator/wsh/Inflate.java    |   128 +-
 .../superbiz/calculator/wsh/CalculatorTest.java |   126 +-
 .../java/org/superbiz/ws/out/Calculator.java    |    76 +-
 .../java/org/superbiz/ws/out/CalculatorWs.java  |    52 +-
 .../org/superbiz/ws/out/CalculatorTest.java     |   136 +-
 .../java/org/superbiz/inheritance/Item.java     |   138 +-
 .../java/org/superbiz/inheritance/Tower.java    |    98 +-
 .../org/superbiz/inheritance/WakeRiderImpl.java |   112 +-
 .../org/superbiz/inheritance/WakeRiderWs.java   |    70 +-
 .../org/superbiz/inheritance/Wakeboard.java     |    48 +-
 .../superbiz/inheritance/WakeboardBinding.java  |    48 +-
 .../java/org/superbiz/inheritance/Wearable.java |    66 +-
 .../superbiz/inheritance/InheritanceTest.java   |   314 +-
 .../org/superbiz/calculator/CalculatorImpl.java |   100 +-
 .../superbiz/calculator/CalculatorRemote.java   |    56 +-
 .../org/superbiz/calculator/CalculatorWs.java   |    70 +-
 .../org/superbiz/calculator/CalculatorTest.java |   138 +-
 .../keys/generateKeyPair.bat                    |    62 +-
 .../keys/generateServerKey.bat                  |    48 +-
 .../org/superbiz/calculator/CalculatorImpl.java |   104 +-
 .../superbiz/calculator/CalculatorRemote.java   |    56 +-
 .../org/superbiz/calculator/CalculatorWs.java   |    70 +-
 .../CalculatorImplSign-server.properties        |    14 +-
 ...eTokenPlainPasswordEncrypt-server.properties |    14 +-
 .../src/main/resources/META-INF/ejb-jar.xml     |   198 +-
 .../src/main/resources/META-INF/webservices.xml |   132 +-
 .../org/superbiz/calculator/CalculatorTest.java |   636 +-
 .../calculator/CustomPasswordHandler.java       |    88 +-
 .../CalculatorImplSign-client.properties        |    14 +-
 ...eTokenPlainPasswordEncrypt-client.properties |    14 +-
 .../org/superbiz/ws/security/Calculator.java    |    50 +-
 .../superbiz/ws/security/CalculatorBean.java    |    60 +-
 .../ws/security/PasswordCallbackHandler.java    |    88 +-
 .../openejb/itest/legacy/LegacyClientTest.java  |   684 +-
 .../src/main/resources/META-INF/ejb-jar.xml     | 14632 ++++++++---------
 .../maven/plugin/AbstractSynchronizable.java    |   142 +-
 .../test/resources/schema/ComplexAllElement.xsd |    42 +-
 .../test/resources/schema/ComplexAllType.xsd    |    42 +-
 .../resources/schema/ComplexSequenceElement.xsd |    42 +-
 .../resources/schema/ComplexSequenceType.xsd    |    42 +-
 .../test/resources/schema/JaxRpcSpecExample.xsd |    42 +-
 .../src/test/resources/schema/SimpleElement.xsd |    42 +-
 .../src/test/resources/schema/SimpleType.xsd    |    42 +-
 .../resources/schema/SoapArrayByAttribute.xsd   |    42 +-
 .../resources/schema/SoapArrayByRestriction.xsd |    42 +-
 .../client/DirectConnectionStrategy.java        |    66 +-
 .../openejb/client/MulticastPulseClient.java    |  1556 +-
 .../openejb/server/cxf/rs/AutoJAXRSInvoker.java |   140 +-
 .../server/cxf/rs/OpenEJBEJBInvoker.java        |   240 +-
 .../openejb/server/cxf/rs/PojoInvoker.java      |   124 +-
 .../rs/DynamicSubclassEjbDeploymentTest.java    |   266 +-
 .../server/cxf/rs/EJBExceptionMapperTest.java   |   220 +-
 .../server/cxf/rs/EjbDeploymentTest.java        |   252 +-
 .../cxf/rs/PathParamAtClassLevelTest.java       |   150 +-
 .../server/cxf/WSSPassThroughInterceptor.java   |   132 +-
 802 files changed, 78049 insertions(+), 78049 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java
index c1db6b1..572e20d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java
@@ -1,47 +1,47 @@
-/*
- * 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.testng;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class PropertiesBuilder {
-    private final Properties properties = new Properties();
-
-    public PropertiesBuilder p(final String key, final String value) {
-        return property(key, value);
-    }
-
-    public PropertiesBuilder property(final String key, final String value) {
-        properties.setProperty(key, value);
-        return this;
-    }
-
-    public Properties build() {
-        return properties;
-    }
-
-    public Map<String, String> asMap() {
-        final Map<String, String> map = new HashMap<String, String>();
-        for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
-            map.put(String.class.cast(entry.getKey()), String.class.cast(entry.getValue()));
-        }
-        return map;
-    }
-}
+/*
+ * 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.testng;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+public class PropertiesBuilder {
+    private final Properties properties = new Properties();
+
+    public PropertiesBuilder p(final String key, final String value) {
+        return property(key, value);
+    }
+
+    public PropertiesBuilder property(final String key, final String value) {
+        properties.setProperty(key, value);
+        return this;
+    }
+
+    public Properties build() {
+        return properties;
+    }
+
+    public Map<String, String> asMap() {
+        final Map<String, String> map = new HashMap<String, String>();
+        for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
+            map.put(String.class.cast(entry.getKey()), String.class.cast(entry.getValue()));
+        }
+        return map;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/java/org/apache/openejb/util/CollectionsUtil.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/CollectionsUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/util/CollectionsUtil.java
index 8ceff40..2daa42f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/CollectionsUtil.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/CollectionsUtil.java
@@ -1,30 +1,30 @@
-/*
- * 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.util;
-
-import java.util.Collections;
-import java.util.List;
-
-public class CollectionsUtil {
-    public static <T> List<T> safe(final List<T> list) {
-        if (list == null) {
-            return Collections.emptyList();
-        }
-        return list;
-    }
-}
+/*
+ * 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.util;
+
+import java.util.Collections;
+import java.util.List;
+
+public class CollectionsUtil {
+    public static <T> List<T> safe(final List<T> list) {
+        if (list == null) {
+            return Collections.emptyList();
+        }
+        return list;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java b/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
index 19f2d50..6d50e62 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
@@ -1,224 +1,224 @@
-/*
- * 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.util;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class LogStreamAsync implements LogStream, Closeable {
-
-    private static final LinkedBlockingQueue<Message> log = new LinkedBlockingQueue<Message>();
-    private static final Thread t = new Thread(new Consumer(LogStreamAsync.log), "LogStreamAsync.Thread");
-    private static final AtomicBoolean started = new AtomicBoolean(false);
-    private final LogStream ls;
-
-    private enum level {
-        fatal,
-        error,
-        warn,
-        info,
-        debug,
-        quit,
-    }
-
-    public LogStreamAsync(final LogStream ls) {
-        this.ls = ls;
-
-        if (!started.getAndSet(true)) {
-            t.setDaemon(true);
-            t.start();
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        LogStreamAsync.log.clear();
-        try {
-            LogStreamAsync.log.put(new Message(this.ls, level.quit, ""));
-        } catch (final InterruptedException e) {
-            //Ignore
-        }
-    }
-
-    @Override
-    public boolean isFatalEnabled() {
-        return ls.isFatalEnabled();
-    }
-
-    @Override
-    public void fatal(final String message) {
-        this.log(level.fatal, message);
-    }
-
-    @Override
-    public void fatal(final String message, final Throwable t) {
-        this.log(level.fatal, message, t);
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        return ls.isErrorEnabled();
-    }
-
-    @Override
-    public void error(final String message) {
-        this.log(level.error, message);
-    }
-
-    @Override
-    public void error(final String message, final Throwable t) {
-        this.log(level.error, message, t);
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        return ls.isWarnEnabled();
-    }
-
-    @Override
-    public void warn(final String message) {
-        this.log(level.warn, message);
-    }
-
-    @Override
-    public void warn(final String message, final Throwable t) {
-        this.log(level.warn, message, t);
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        return ls.isInfoEnabled();
-    }
-
-    @Override
-    public void info(final String message) {
-        this.log(level.info, message, null);
-    }
-
-    @Override
-    public void info(final String message, final Throwable t) {
-        this.log(level.info, message, null);
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return ls.isDebugEnabled();
-    }
-
-    @Override
-    public void debug(final String message) {
-        this.log(level.debug, message);
-    }
-
-    @Override
-    public void debug(final String message, final Throwable t) {
-        this.log(level.debug, message, t);
-    }
-
-    public void log(final level l, final String s) {
-        this.log(l, s, null);
-    }
-
-    public void log(final level l, final String s, final Throwable t) {
-        try {
-            LogStreamAsync.log.put(new Message(this.ls, l, s, t));
-        } catch (final InterruptedException e) {
-            //Ignore
-        }
-    }
-
-    private static final class Message {
-
-        private final LogStream ls;
-        private final level l;
-        private final String s;
-        private final Throwable t;
-
-        private Message(final LogStream ls, final level l, final String s) {
-            this(ls, l, s, null);
-        }
-
-        private Message(final LogStream ls, final level l, final String s, final Throwable t) {
-            this.ls = ls;
-            this.l = l;
-            this.s = s;
-            this.t = t;
-        }
-    }
-
-    private static final class Consumer implements Runnable {
-
-        private final BlockingQueue<Message> queue;
-
-        private Consumer(final BlockingQueue<Message> queue) {
-            this.queue = queue;
-        }
-
-        public void run() {
-
-            try {
-                Message msg;
-                while (!level.quit.equals((msg = queue.take()).l)) {
-                    final Throwable t = msg.t;
-
-                    if (null != t) {
-                        switch (msg.l) {
-                            case fatal:
-                                msg.ls.fatal(msg.s, t);
-                                break;
-                            case error:
-                                msg.ls.error(msg.s, t);
-                                break;
-                            case warn:
-                                msg.ls.warn(msg.s, t);
-                                break;
-                            case info:
-                                msg.ls.info(msg.s, t);
-                                break;
-                            case debug:
-                                msg.ls.debug(msg.s, t);
-                                break;
-                        }
-                    } else {
-                        switch (msg.l) {
-                            case fatal:
-                                msg.ls.fatal(msg.s);
-                                break;
-                            case error:
-                                msg.ls.error(msg.s);
-                                break;
-                            case warn:
-                                msg.ls.warn(msg.s);
-                                break;
-                            case info:
-                                msg.ls.info(msg.s);
-                                break;
-                            case debug:
-                                msg.ls.debug(msg.s);
-                                break;
-                        }
-                    }
-                }
-            } catch (final InterruptedException e) {
-                //Exit
-            }
-        }
-    }
+/*
+ * 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.util;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class LogStreamAsync implements LogStream, Closeable {
+
+    private static final LinkedBlockingQueue<Message> log = new LinkedBlockingQueue<Message>();
+    private static final Thread t = new Thread(new Consumer(LogStreamAsync.log), "LogStreamAsync.Thread");
+    private static final AtomicBoolean started = new AtomicBoolean(false);
+    private final LogStream ls;
+
+    private enum level {
+        fatal,
+        error,
+        warn,
+        info,
+        debug,
+        quit,
+    }
+
+    public LogStreamAsync(final LogStream ls) {
+        this.ls = ls;
+
+        if (!started.getAndSet(true)) {
+            t.setDaemon(true);
+            t.start();
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        LogStreamAsync.log.clear();
+        try {
+            LogStreamAsync.log.put(new Message(this.ls, level.quit, ""));
+        } catch (final InterruptedException e) {
+            //Ignore
+        }
+    }
+
+    @Override
+    public boolean isFatalEnabled() {
+        return ls.isFatalEnabled();
+    }
+
+    @Override
+    public void fatal(final String message) {
+        this.log(level.fatal, message);
+    }
+
+    @Override
+    public void fatal(final String message, final Throwable t) {
+        this.log(level.fatal, message, t);
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return ls.isErrorEnabled();
+    }
+
+    @Override
+    public void error(final String message) {
+        this.log(level.error, message);
+    }
+
+    @Override
+    public void error(final String message, final Throwable t) {
+        this.log(level.error, message, t);
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return ls.isWarnEnabled();
+    }
+
+    @Override
+    public void warn(final String message) {
+        this.log(level.warn, message);
+    }
+
+    @Override
+    public void warn(final String message, final Throwable t) {
+        this.log(level.warn, message, t);
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return ls.isInfoEnabled();
+    }
+
+    @Override
+    public void info(final String message) {
+        this.log(level.info, message, null);
+    }
+
+    @Override
+    public void info(final String message, final Throwable t) {
+        this.log(level.info, message, null);
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return ls.isDebugEnabled();
+    }
+
+    @Override
+    public void debug(final String message) {
+        this.log(level.debug, message);
+    }
+
+    @Override
+    public void debug(final String message, final Throwable t) {
+        this.log(level.debug, message, t);
+    }
+
+    public void log(final level l, final String s) {
+        this.log(l, s, null);
+    }
+
+    public void log(final level l, final String s, final Throwable t) {
+        try {
+            LogStreamAsync.log.put(new Message(this.ls, l, s, t));
+        } catch (final InterruptedException e) {
+            //Ignore
+        }
+    }
+
+    private static final class Message {
+
+        private final LogStream ls;
+        private final level l;
+        private final String s;
+        private final Throwable t;
+
+        private Message(final LogStream ls, final level l, final String s) {
+            this(ls, l, s, null);
+        }
+
+        private Message(final LogStream ls, final level l, final String s, final Throwable t) {
+            this.ls = ls;
+            this.l = l;
+            this.s = s;
+            this.t = t;
+        }
+    }
+
+    private static final class Consumer implements Runnable {
+
+        private final BlockingQueue<Message> queue;
+
+        private Consumer(final BlockingQueue<Message> queue) {
+            this.queue = queue;
+        }
+
+        public void run() {
+
+            try {
+                Message msg;
+                while (!level.quit.equals((msg = queue.take()).l)) {
+                    final Throwable t = msg.t;
+
+                    if (null != t) {
+                        switch (msg.l) {
+                            case fatal:
+                                msg.ls.fatal(msg.s, t);
+                                break;
+                            case error:
+                                msg.ls.error(msg.s, t);
+                                break;
+                            case warn:
+                                msg.ls.warn(msg.s, t);
+                                break;
+                            case info:
+                                msg.ls.info(msg.s, t);
+                                break;
+                            case debug:
+                                msg.ls.debug(msg.s, t);
+                                break;
+                        }
+                    } else {
+                        switch (msg.l) {
+                            case fatal:
+                                msg.ls.fatal(msg.s);
+                                break;
+                            case error:
+                                msg.ls.error(msg.s);
+                                break;
+                            case warn:
+                                msg.ls.warn(msg.s);
+                                break;
+                            case info:
+                                msg.ls.info(msg.s);
+                                break;
+                            case debug:
+                                msg.ls.debug(msg.s);
+                                break;
+                        }
+                    }
+                }
+            } catch (final InterruptedException e) {
+                //Exit
+            }
+        }
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java b/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
index e728448..c5d109d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
@@ -1,89 +1,89 @@
-/*
- * 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.util;
-
-import org.apache.xbean.finder.ResourceFinder;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Properties;
-
-/**
- * @version $Rev$ $Date$
- */
-public final class OpenEjbVersion {
-
-    private final String copyright;//Copyright 1999-X (C) Apache OpenEJB Project, All Rights Reserved.
-    private final String url; //http://tomee.apache.org
-    private final String version;//${pom.version}
-    private final String date;//@DATE-REPLACED-BY-MAVEN@
-    private final String time;//@TIME-REPLACED-BY-MAVEN@
-    private static OpenEjbVersion openEjbVersion;
-
-    private OpenEjbVersion() {
-        Properties info = new Properties();
-
-        try {
-            final ResourceFinder finder = new ResourceFinder();
-            info = finder.findProperties("openejb-version.properties");
-        } catch (final IOException e) {
-            e.printStackTrace();
-        }
-
-        copyright = info.getProperty("copyright");
-        url = info.getProperty("url");
-        version = info.getProperty("version");
-        date = info.getProperty("date");
-        time = info.getProperty("time");
-
-        System.setProperty("openejb.version", version);
-        System.setProperty("tomee.version", version);
-    }
-
-    public static OpenEjbVersion get() {
-        if (openEjbVersion == null) {
-            openEjbVersion = new OpenEjbVersion();
-        }
-        return openEjbVersion;
-    }
-
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public String getDate() {
-        return date;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void print(final PrintStream out) {
-        out.println("Apache OpenEJB " + getVersion() + "    build: " + getDate() + "-" + getTime());
-        out.println(getUrl());
-    }
-}
+/*
+ * 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.util;
+
+import org.apache.xbean.finder.ResourceFinder;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Properties;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public final class OpenEjbVersion {
+
+    private final String copyright;//Copyright 1999-X (C) Apache OpenEJB Project, All Rights Reserved.
+    private final String url; //http://tomee.apache.org
+    private final String version;//${pom.version}
+    private final String date;//@DATE-REPLACED-BY-MAVEN@
+    private final String time;//@TIME-REPLACED-BY-MAVEN@
+    private static OpenEjbVersion openEjbVersion;
+
+    private OpenEjbVersion() {
+        Properties info = new Properties();
+
+        try {
+            final ResourceFinder finder = new ResourceFinder();
+            info = finder.findProperties("openejb-version.properties");
+        } catch (final IOException e) {
+            e.printStackTrace();
+        }
+
+        copyright = info.getProperty("copyright");
+        url = info.getProperty("url");
+        version = info.getProperty("version");
+        date = info.getProperty("date");
+        time = info.getProperty("time");
+
+        System.setProperty("openejb.version", version);
+        System.setProperty("tomee.version", version);
+    }
+
+    public static OpenEjbVersion get() {
+        if (openEjbVersion == null) {
+            openEjbVersion = new OpenEjbVersion();
+        }
+        return openEjbVersion;
+    }
+
+    public String getCopyright() {
+        return copyright;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void print(final PrintStream out) {
+        out.println("Apache OpenEJB " + getVersion() + "    build: " + getDate() + "-" + getTime());
+        out.println(getUrl());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/java/org/apache/openejb/util/OutputScanner.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/OutputScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/util/OutputScanner.java
index caadffe..8e9bc5d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/OutputScanner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/OutputScanner.java
@@ -1,103 +1,103 @@
-/*
- * 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.util;
-
-import org.codehaus.swizzle.stream.ScanBuffer;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OutputScanner extends FilterOutputStream {
-
-    private final CountDownLatch found = new CountDownLatch(1);
-
-    public OutputScanner(final OutputStream out, final String scanString) {
-        super(null);
-        this.out = new Scan(out, scanString);
-    }
-
-    public class Scan extends FilterOutputStream {
-
-        private final ScanBuffer scan;
-
-        public Scan(final OutputStream out, final String scanString) {
-            super(out);
-            scan = new ScanBuffer(scanString);
-        }
-
-        @Override
-        public void write(final int b) throws IOException {
-            check(b);
-            super.write(b);
-        }
-
-        @Override
-        public void write(final byte[] bytes) throws IOException {
-            for (final byte b : bytes) {
-                check(b);
-            }
-            super.write(bytes);
-        }
-
-        @Override
-        public void write(final byte[] bytes, final int off, final int len) throws IOException {
-            for (int i = off; i < len; i++) {
-                check(bytes[i]);
-            }
-            super.write(bytes, off, len);
-        }
-
-        private void check(final int b) {
-            scan.append(b);
-            if (scan.match()) {
-                // Cut ourselves out of the call chain.
-                //
-                // This works because
-                //  - ScanningOutputStreamFilter.this.out == this
-                //  - this.out != this)
-                //
-                // Our parent is delegating to us and we are delegating
-                // to the actual OutputStream
-                //
-                // To cut ourselves out of the call chain and eliminate
-                // the overhead of checking the ScanBuffer, we set our
-                // parent to not delegate to us and to instead delegate
-                // to the actual OutputStream.
-
-                // Intellij mistakenly shows this grayed out,
-                // however it is very very significant.
-                OutputScanner.this.out = this.out;
-                found.countDown();
-            }
-        }
-    }
-
-
-    public void await() throws InterruptedException {
-        found.await();
-    }
-
-    public boolean await(final long timeout, final TimeUnit unit) throws InterruptedException {
-        return found.await(timeout, unit);
-    }
-}
+/*
+ * 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.util;
+
+import org.codehaus.swizzle.stream.ScanBuffer;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class OutputScanner extends FilterOutputStream {
+
+    private final CountDownLatch found = new CountDownLatch(1);
+
+    public OutputScanner(final OutputStream out, final String scanString) {
+        super(null);
+        this.out = new Scan(out, scanString);
+    }
+
+    public class Scan extends FilterOutputStream {
+
+        private final ScanBuffer scan;
+
+        public Scan(final OutputStream out, final String scanString) {
+            super(out);
+            scan = new ScanBuffer(scanString);
+        }
+
+        @Override
+        public void write(final int b) throws IOException {
+            check(b);
+            super.write(b);
+        }
+
+        @Override
+        public void write(final byte[] bytes) throws IOException {
+            for (final byte b : bytes) {
+                check(b);
+            }
+            super.write(bytes);
+        }
+
+        @Override
+        public void write(final byte[] bytes, final int off, final int len) throws IOException {
+            for (int i = off; i < len; i++) {
+                check(bytes[i]);
+            }
+            super.write(bytes, off, len);
+        }
+
+        private void check(final int b) {
+            scan.append(b);
+            if (scan.match()) {
+                // Cut ourselves out of the call chain.
+                //
+                // This works because
+                //  - ScanningOutputStreamFilter.this.out == this
+                //  - this.out != this)
+                //
+                // Our parent is delegating to us and we are delegating
+                // to the actual OutputStream
+                //
+                // To cut ourselves out of the call chain and eliminate
+                // the overhead of checking the ScanBuffer, we set our
+                // parent to not delegate to us and to instead delegate
+                // to the actual OutputStream.
+
+                // Intellij mistakenly shows this grayed out,
+                // however it is very very significant.
+                OutputScanner.this.out = this.out;
+                found.countDown();
+            }
+        }
+    }
+
+
+    public void await() throws InterruptedException {
+        found.await();
+    }
+
+    public boolean await(final long timeout, final TimeUnit unit) throws InterruptedException {
+        return found.await(timeout, unit);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/java/org/apache/openejb/util/Pipe.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Pipe.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Pipe.java
index 00e4731..6bc42b3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Pipe.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Pipe.java
@@ -1,75 +1,75 @@
-/*
- * 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.util;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public final class Pipe implements Runnable {
-
-    private final InputStream in;
-    private final OutputStream out;
-
-    public Pipe(final InputStream in, final OutputStream out) {
-        this.in = in;
-        this.out = out;
-    }
-
-    public static void pipeOut(final Process process) {
-        pipe(process.getInputStream(), System.out);
-        pipe(process.getErrorStream(), System.err);
-    }
-
-    public static void pipe(final Process process) {
-        pipeOut(process);
-        pipe(System.in, process.getOutputStream());
-    }
-
-    public static void read(final Process process) {
-        pipe(process.getInputStream(), System.out);
-        pipe(process.getErrorStream(), System.err);
-    }
-
-    public static void pipe(final InputStream in, final OutputStream out) {
-        final Thread thread = new Thread(new Pipe(in, out));
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    public void run() {
-        try {
-            int i;
-
-            final byte[] buf = new byte[1];
-
-            while ((i = in.read(buf)) != -1) {
-                out.write(buf, 0, i);
-            }
-        } catch (final Exception e) {
-            final String m = e.getMessage();
-            if(null != m && m.toLowerCase().contains("stream closed")){
-                //This does not need to be noisy
-                return;
-            }
-            e.printStackTrace();
-        }
-    }
-}
+/*
+ * 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.util;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public final class Pipe implements Runnable {
+
+    private final InputStream in;
+    private final OutputStream out;
+
+    public Pipe(final InputStream in, final OutputStream out) {
+        this.in = in;
+        this.out = out;
+    }
+
+    public static void pipeOut(final Process process) {
+        pipe(process.getInputStream(), System.out);
+        pipe(process.getErrorStream(), System.err);
+    }
+
+    public static void pipe(final Process process) {
+        pipeOut(process);
+        pipe(System.in, process.getOutputStream());
+    }
+
+    public static void read(final Process process) {
+        pipe(process.getInputStream(), System.out);
+        pipe(process.getErrorStream(), System.err);
+    }
+
+    public static void pipe(final InputStream in, final OutputStream out) {
+        final Thread thread = new Thread(new Pipe(in, out));
+        thread.setDaemon(true);
+        thread.start();
+    }
+
+    public void run() {
+        try {
+            int i;
+
+            final byte[] buf = new byte[1];
+
+            while ((i = in.read(buf)) != -1) {
+                out.write(buf, 0, i);
+            }
+        } catch (final Exception e) {
+            final String m = e.getMessage();
+            if(null != m && m.toLowerCase().contains("stream closed")){
+                //This does not need to be noisy
+                return;
+            }
+            e.printStackTrace();
+        }
+    }
+}


[10/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/datasource-versioning/README.md
----------------------------------------------------------------------
diff --git a/examples/datasource-versioning/README.md b/examples/datasource-versioning/README.md
index f0adadc..3ddabcc 100644
--- a/examples/datasource-versioning/README.md
+++ b/examples/datasource-versioning/README.md
@@ -1,386 +1,386 @@
-Title: DataSource Versioning
-
-This example shows you how to use versioned DataSources of the same provider using the classpath attribute.
-
-# Configuration
-
-The DataSource configuration can be made several ways and here we layout two common methods in the form of unit tests.
-Before we start, if you take a peek in the project pom.xml and look for the maven-dependency-plugin usage you will see that we pull in
-two completely different driver files for this example.
-
-# AlternateDataSourceTest.java
-This test utilizes the Arquillian testing framework. See [here](http://tomee.apache.org/arquillian-available-adapters.html) for more details.
-
-The example uses src/test/resources/arquillian.xml and src/test/conf/tomee.xml to define the DataSources.
-Note the differing driver version paths, yet still using the same provider (org.apache.derby.jdbc.EmbeddedDriver):
-
-    <tomee>
-
-      <Resource id="DatabaseOne" type="DataSource" classpath="${catalina.base}/../../drivers/derby-10.10.1.1.jar">
-        JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
-        JdbcUrl jdbc:derby:databaseOne;create=true
-        UserName SA
-      </Resource>
-
-      <Resource id="DatabaseTwo" type="DataSource" classpath="${catalina.base}/../../drivers/derby-10.9.1.0.jar">
-        JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
-        JdbcUrl jdbc:derby:databaseTwo;create=true
-        UserName SA
-      </Resource>
-
-    </tomee>
-	
-# Developer Information
-When testing within a Maven environment it is also possible to use direct maven coordinates rather than a file link, like so:
-
-    ....
-	<Resource id="DatabaseOne" type="DataSource" classpath="mvn:org.apache.derby:derby:10.10.1.1">
-	....
-	
-
-# AlternateDriverJarTest.java
-
-This test takes an embedded approach and as you can see the driver paths are specified as a DataSource parameter.
-Both examples demonstrate the same, in that two driver versions can be loaded and used within the same application.
-
-    @Configuration
-    public Properties config() {
-
-        final File drivers = new File(new File("target"), "drivers").getAbsoluteFile();
-
-        final Properties p = new Properties();
-        p.put("openejb.jdbc.datasource-creator", "dbcp-alternative");
-
-        File file = new File(drivers, "derby-10.10.1.1.jar");
-        Assert.assertTrue("Failed to find: " + file, file.exists());
-
-        p.put("JdbcOne", "new://Resource?type=DataSource&classpath="
-                + file.getAbsolutePath().replace("\\", "/"));
-        p.put("JdbcOne.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
-        p.put("JdbcOne.JdbcUrl", "jdbc:derby:memory:JdbcOne;create=true");
-        p.put("JdbcOne.UserName", USER);
-        p.put("JdbcOne.Password", PASSWORD);
-        p.put("JdbcOne.JtaManaged", "false");
-
-        file = new File(drivers, "derby-10.9.1.0.jar");
-        Assert.assertTrue("Failed to find: " + file, file.exists());
-
-        p.put("JdbcTwo", "new://Resource?type=DataSource&classpath="
-                + file.getAbsolutePath().replace("\\", "/"));
-        p.put("JdbcTwo.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
-        p.put("JdbcTwo.JdbcUrl", "jdbc:derby:memory:JdbcTwo;create=true");
-        p.put("JdbcTwo.UserName", USER);
-        p.put("JdbcTwo.Password", PASSWORD);
-        p.put("JdbcTwo.JtaManaged", "false");
-        return p;
-    }
-
-# Full Test Source for AlternateDataSourceTest.java
-
-    package org.superbiz;
-
-    import org.jboss.arquillian.container.test.api.Deployment;
-    import org.jboss.arquillian.junit.Arquillian;
-    import org.jboss.shrinkwrap.api.ShrinkWrap;
-    import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-    import org.jboss.shrinkwrap.api.spec.WebArchive;
-    import org.junit.Assert;
-    import org.junit.Test;
-    import org.junit.runner.RunWith;
-
-    import javax.annotation.Resource;
-    import javax.ejb.EJB;
-    import javax.ejb.Stateless;
-    import javax.sql.DataSource;
-    import java.sql.Connection;
-    import java.sql.DatabaseMetaData;
-    import java.sql.SQLException;
-
-    @RunWith(Arquillian.class)
-    public class AlternateDataSourceTest {
-
-        @Deployment
-        public static WebArchive createDeployment() {
-
-            return ShrinkWrap.create(WebArchive.class, "test.war")
-                .addClasses(DataSourceTester.class)
-                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml");
-            //We are using src/test/conf/tomee.xml, but this also works - .addAsResource(new ClassLoaderAsset("META-INF/resources.xml"), "META-INF/resources.xml");
-            //Or even using a persistence context - .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
-        }
-
-        @EJB
-        private DataSourceTester tester;
-
-        @Test
-        public void testDataSourceOne() throws Exception {
-            Assert.assertEquals("Should be using 10.10.1.1 - (1458268)", "10.10.1.1 - (1458268)", tester.getOne());
-        }
-
-        @Test
-        public void testDataSourceTwo() throws Exception {
-            Assert.assertEquals("Should be using 10.9.1.0 - (1344872)", "10.9.1.0 - (1344872)", tester.getTwo());
-        }
-
-        @Test
-        public void testDataSourceBoth() throws Exception {
-            Assert.assertEquals("Should be using 10.10.1.1 - (1458268)|10.9.1.0 - (1344872)", "10.10.1.1 - (1458268)|10.9.1.0 - (1344872)", tester.getBoth());
-        }
-
-        @Stateless
-        public static class DataSourceTester {
-
-            @Resource(name = "DatabaseOne")
-            DataSource dataSourceOne;
-
-            @Resource(name = "DatabaseTwo")
-            DataSource dataSourceTwo;
-
-            public String getOne() throws Exception {
-                return getVersion(dataSourceOne);
-            }
-
-            public String getTwo() throws Exception {
-                return getVersion(dataSourceTwo);
-            }
-
-            public String getBoth() throws Exception {
-                return getOne() + "|" + getTwo();
-            }
-
-            private static String getVersion(final DataSource ds) throws SQLException {
-                Connection con = null;
-                try {
-                    con = ds.getConnection();
-                    final DatabaseMetaData md = con.getMetaData();
-                    return md.getDriverVersion();
-                } finally {
-                    if (con != null) {
-                        con.close();
-                    }
-                }
-            }
-        }
-    }
-
-# Running
-
-    
-    -------------------------------------------------------
-     T E S T S
-    -------------------------------------------------------
-    Running org.superbiz.AlternateDataSourceTest
-    Apr 17, 2014 2:19:45 PM org.apache.openejb.arquillian.common.Setup findHome
-    INFO: Unable to find home in: C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote
-    Apr 17, 2014 2:19:45 PM org.apache.openejb.arquillian.common.MavenCache getArtifact
-    INFO: Downloading org.apache.openejb:apache-tomee:1.6.1-SNAPSHOT:zip:webprofile please wait...
-    Apr 17, 2014 2:19:45 PM org.apache.openejb.arquillian.common.Zips unzip
-    INFO: Extracting 'C:\Users\Andy\.m2\repository\org\apache\openejb\apache-tomee\1.6.1-SNAPSHOT\apache-tomee-1.6.1-SNAPSHOT-webprofile.zip' to 'C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote'
-    Apr 17, 2014 2:19:47 PM org.apache.tomee.arquillian.remote.RemoteTomEEContainer configure
-    INFO: Downloaded container to: C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT
-    INFO - The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: C:\Program Files\Java\jdk1.7.0_45\jre\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Windows Live\Shared;C:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Program Files\SlikSvn\bin;C:\dev\apache-maven-3.2.1\bin;C:\dev\apache-ant-1.9.3\bin;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\Git\bin;C:\Program Files\TortoiseGit\bin;C:\Program Files\TortoiseSVN\bin;.
-    INFO - Initializing ProtocolHandler ["http-bio-55243"]
-    INFO - Initializing ProtocolHandler ["ajp-bio-55245"]
-    INFO - Using 'openejb.jdbc.datasource-creator=org.apache.tomee.jdbc.TomEEDataSourceCreator'
-    INFO - Optional service not installed: org.apache.tomee.webservices.TomeeJaxRsService
-    INFO - Optional service not installed: org.apache.tomee.webservices.TomeeJaxWsService
-    INFO - ********************************************************************************
-    INFO - OpenEJB http://tomee.apache.org/
-    INFO - Startup: Thu Apr 17 14:19:55 CEST 2014
-    INFO - Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
-    INFO - Version: 7.0.0-SNAPSHOT
-    INFO - Build date: 20140417
-    INFO - Build time: 01:37
-    INFO - ********************************************************************************
-    INFO - openejb.home = C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT
-    INFO - openejb.base = C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT
-    INFO - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@22c2e2dd
-    INFO - Succeeded in installing singleton service
-    INFO - openejb configuration file is 'C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT\conf\tomee.xml'
-    INFO - Configuring Service(id=Tomcat Security Service, type=SecurityService, provider-id=Tomcat Security Service)
-    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    INFO - Configuring Service(id=DatabaseOne, type=Resource, provider-id=Default JDBC Database)
-    INFO - Configuring Service(id=DatabaseTwo, type=Resource, provider-id=Default JDBC Database)
-    INFO - Using 'openejb.system.apps=true'
-    INFO - Configuring enterprise application: openejb
-    INFO - Using openejb.deploymentId.format '{ejbName}'
-    INFO - Auto-deploying ejb openejb/Deployer: EjbDeployment(deployment-id=openejb/Deployer)
-    INFO - Auto-deploying ejb openejb/ConfigurationInfo: EjbDeployment(deployment-id=openejb/ConfigurationInfo)
-    INFO - Auto-deploying ejb MEJB: EjbDeployment(deployment-id=MEJB)
-    INFO - Configuring Service(id=Default Stateless Container, type=Container, provider-id=Default Stateless Container)
-    INFO - Auto-creating a container for bean openejb/Deployer: Container(type=STATELESS, id=Default Stateless Container)
-    INFO - Enterprise application "openejb" loaded.
-    INFO - Creating TransactionManager(id=Default Transaction Manager)
-    INFO - Creating SecurityService(id=Tomcat Security Service)
-    INFO - Creating Resource(id=DatabaseOne)
-    INFO - Disabling testOnBorrow since no validation query is provided
-    INFO - Creating Resource(id=DatabaseTwo)
-    INFO - Disabling testOnBorrow since no validation query is provided
-    INFO - Creating Container(id=Default Stateless Container)
-    INFO - Assembling app: openejb
-    INFO - Using 'openejb.jndiname.format={deploymentId}{interfaceType.openejbLegacyName}'
-    INFO - Jndi(name=openejb/DeployerBusinessRemote) --> Ejb(deployment-id=openejb/Deployer)
-    INFO - Jndi(name=global/openejb/openejb/Deployer!org.apache.openejb.assembler.Deployer) --> Ejb(deployment-id=openejb/Deployer)
-    INFO - Jndi(name=global/openejb/openejb/Deployer) --> Ejb(deployment-id=openejb/Deployer)
-    INFO - Jndi(name=openejb/ConfigurationInfoBusinessRemote) --> Ejb(deployment-id=openejb/ConfigurationInfo)
-    INFO - Jndi(name=global/openejb/openejb/ConfigurationInfo!org.apache.openejb.assembler.classic.cmd.ConfigurationInfo) --> Ejb(deployment-id=openejb/ConfigurationInfo)
-    INFO - Jndi(name=global/openejb/openejb/ConfigurationInfo) --> Ejb(deployment-id=openejb/ConfigurationInfo)
-    INFO - Jndi(name=MEJB) --> Ejb(deployment-id=MEJB)
-    INFO - Jndi(name=global/openejb/MEJB!javax.management.j2ee.ManagementHome) --> Ejb(deployment-id=MEJB)
-    INFO - Jndi(name=global/openejb/MEJB) --> Ejb(deployment-id=MEJB)
-    INFO - Created Ejb(deployment-id=openejb/Deployer, ejb-name=openejb/Deployer, container=Default Stateless Container)
-    INFO - Created Ejb(deployment-id=MEJB, ejb-name=MEJB, container=Default Stateless Container)
-    INFO - Created Ejb(deployment-id=openejb/ConfigurationInfo, ejb-name=openejb/ConfigurationInfo, container=Default Stateless Container)
-    INFO - Started Ejb(deployment-id=openejb/Deployer, ejb-name=openejb/Deployer, container=Default Stateless Container)
-    INFO - Started Ejb(deployment-id=MEJB, ejb-name=MEJB, container=Default Stateless Container)
-    INFO - Started Ejb(deployment-id=openejb/ConfigurationInfo, ejb-name=openejb/ConfigurationInfo, container=Default Stateless Container)
-    INFO - Deployed MBean(openejb.user.mbeans:application=openejb,group=org.apache.openejb.assembler.monitoring,name=JMXDeployer)
-    INFO - Deployed Application(path=openejb)
-    INFO -   ** Bound Services **
-    INFO -   NAME                 IP              PORT
-    INFO - -------
-    INFO - Ready!
-    INFO - Initialization processed in 7959 ms
-    INFO - Importing a Tomcat Resource with id 'UserDatabase' of type 'org.apache.catalina.UserDatabase'.
-    INFO - Creating Resource(id=UserDatabase)
-    INFO - Starting service Catalina
-    INFO - Starting Servlet Engine: Apache Tomcat (TomEE)/7.0.53 (1.6.1-SNAPSHOT)
-    INFO - Starting ProtocolHandler ["http-bio-55243"]
-    INFO - Starting ProtocolHandler ["ajp-bio-55245"]
-    INFO - Server startup in 288 ms
-    WARNING - StandardServer.await: Invalid command '' received
-    Apr 17, 2014 2:20:04 PM org.apache.openejb.client.EventLogger log
-    INFO: RemoteInitialContextCreated{providerUri=http://localhost:55243/tomee/ejb}
-    INFO - Extracting jar: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test.war
-    INFO - Extracted path: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test
-    INFO - using default host: localhost
-    INFO - ------------------------- localhost -> /test
-    INFO - Using 'openejb.session.manager=org.apache.tomee.catalina.session.QuickSessionManager'
-    INFO - Configuring enterprise application: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test
-    INFO - Auto-deploying ejb DataSourceTester: EjbDeployment(deployment-id=DataSourceTester)
-    INFO - Auto-linking resource-ref 'java:comp/env/DatabaseTwo' in bean DataSourceTester to Resource(id=DatabaseTwo)
-    INFO - Auto-linking resource-ref 'java:comp/env/DatabaseOne' in bean DataSourceTester to Resource(id=DatabaseOne)
-    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-    INFO - Auto-creating a container for bean org.superbiz.AlternateDataSourceTest: Container(type=MANAGED, id=Default Managed Container)
-    INFO - Creating Container(id=Default Managed Container)
-    INFO - Using directory C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT\temp for stateful session passivation
-    INFO - Enterprise application "C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test" loaded.
-    INFO - Assembling app: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test
-    INFO - Jndi(name=DataSourceTesterLocalBean) --> Ejb(deployment-id=DataSourceTester)
-    INFO - Jndi(name=global/test/DataSourceTester!org.superbiz.AlternateDataSourceTest$DataSourceTester) --> Ejb(deployment-id=DataSourceTester)
-    INFO - Jndi(name=global/test/DataSourceTester) --> Ejb(deployment-id=DataSourceTester)
-    INFO - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@22c2e2dd
-    INFO - OpenWebBeans Container is starting...
-    INFO - Adding OpenWebBeansPlugin : [CdiPlugin]
-    INFO - Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin]
-    INFO - All injection points were validated successfully.
-    INFO - OpenWebBeans Container has started, it took 203 ms.
-    INFO - Created Ejb(deployment-id=DataSourceTester, ejb-name=DataSourceTester, container=Default Stateless Container)
-    INFO - Started Ejb(deployment-id=DataSourceTester, ejb-name=DataSourceTester, container=Default Stateless Container)
-    INFO - Deployed Application(path=C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test)
-    Apr 17, 2014 2:20:11 PM org.apache.openejb.client.EventLogger log
-    INFO: RemoteInitialContextCreated{providerUri=http://localhost:55243/tomee/ejb}
-    INFO - Undeploying app: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test
-    Apr 17, 2014 2:20:13 PM org.apache.openejb.arquillian.common.TomEEContainer undeploy
-    INFO: cleaning C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0
-    Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 30.155 sec
-    Running org.superbiz.AlternateDriverJarTest
-    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigUtils searchForConfiguration
-    INFO: Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
-    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigurationFactory configureService
-    INFO: Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
-    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigurationFactory configureService
-    INFO: Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigurationFactory configureService
-    INFO: Configuring Service(id=JdbcTwo, type=Resource, provider-id=Default JDBC Database)
-    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigurationFactory configureService
-    INFO: Configuring Service(id=JdbcOne, type=Resource, provider-id=Default JDBC Database)
-    Apr 17, 2014 2:20:13 PM org.apache.openejb.assembler.classic.Assembler createRecipe
-    INFO: Creating TransactionManager(id=Default Transaction Manager)
-    Apr 17, 2014 2:20:14 PM org.apache.openejb.assembler.classic.Assembler createRecipe
-    INFO: Creating SecurityService(id=Default Security Service)
-    Apr 17, 2014 2:20:14 PM org.apache.openejb.assembler.classic.Assembler createRecipe
-    INFO: Creating Resource(id=JdbcTwo)
-    Apr 17, 2014 2:20:15 PM org.apache.openejb.assembler.classic.Assembler createRecipe
-    INFO: Creating Resource(id=JdbcOne)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.ConfigurationFactory configureApplication
-    INFO: Configuring enterprise application: C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.ConfigurationFactory configureService
-    INFO: Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AutoConfig createContainer
-    INFO: Auto-creating a container for bean org.superbiz.AlternateDriverJarTest: Container(type=MANAGED, id=Default Managed Container)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.Assembler createRecipe
-    INFO: Creating Container(id=Default Managed Container)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.core.managed.SimplePassivater init
-    INFO: Using directory C:\Users\Andy\AppData\Local\Temp for stateful session passivation
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.ConfigurationFactory configureService
-    INFO: Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AutoConfig createContainer
-    INFO: Auto-creating a container for bean JdbcOne: Container(type=SINGLETON, id=Default Singleton Container)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.Assembler createRecipe
-    INFO: Creating Container(id=Default Singleton Container)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AutoConfig processResourceRef
-    INFO: Auto-linking resource-ref 'java:comp/env/JdbcOne' in bean JdbcOne to Resource(id=JdbcOne)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AutoConfig processResourceRef
-    INFO: Auto-linking resource-ref 'java:comp/env/JdbcTwo' in bean JdbcTwo to Resource(id=JdbcTwo)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AppInfoBuilder build
-    INFO: Enterprise application "C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest" loaded.
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.Assembler createApplication
-    INFO: Assembling app: C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
-    INFO: Jndi(name=JdbcOneLocalBean) --> Ejb(deployment-id=JdbcOne)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
-    INFO: Jndi(name=global/AlternateDriverJarTest/app/JdbcOne!org.superbiz.AlternateDriverJarTest$JdbcOne) --> Ejb(deployment-id=JdbcOne)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
-    INFO: Jndi(name=global/AlternateDriverJarTest/app/JdbcOne) --> Ejb(deployment-id=JdbcOne)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
-    INFO: Jndi(name=JdbcTwoLocalBean) --> Ejb(deployment-id=JdbcTwo)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
-    INFO: Jndi(name=global/AlternateDriverJarTest/app/JdbcTwo!org.superbiz.AlternateDriverJarTest$JdbcTwo) --> Ejb(deployment-id=JdbcTwo)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
-    INFO: Jndi(name=global/AlternateDriverJarTest/app/JdbcTwo) --> Ejb(deployment-id=JdbcTwo)
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.cdi.CdiBuilder initializeOWB
-    INFO: Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@5ddd4e70
-    Apr 17, 2014 2:20:16 PM org.apache.openejb.cdi.CdiBuilder initializeOWB
-    INFO: Succeeded in installing singleton service
-    Apr 17, 2014 2:20:17 PM org.apache.openejb.cdi.OpenEJBLifecycle startApplication
-    INFO: OpenWebBeans Container is starting...
-    Apr 17, 2014 2:20:17 PM org.apache.webbeans.plugins.PluginLoader startUp
-    INFO: Adding OpenWebBeansPlugin : [CdiPlugin]
-    Apr 17, 2014 2:20:17 PM org.apache.webbeans.config.BeansDeployer validateInjectionPoints
-    INFO: All injection points were validated successfully.
-    Apr 17, 2014 2:20:17 PM org.apache.openejb.cdi.OpenEJBLifecycle startApplication
-    INFO: OpenWebBeans Container has started, it took 223 ms.
-    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler startEjbs
-    INFO: Created Ejb(deployment-id=JdbcTwo, ejb-name=JdbcTwo, container=Default Singleton Container)
-    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler startEjbs
-    INFO: Created Ejb(deployment-id=JdbcOne, ejb-name=JdbcOne, container=Default Singleton Container)
-    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler startEjbs
-    INFO: Started Ejb(deployment-id=JdbcTwo, ejb-name=JdbcTwo, container=Default Singleton Container)
-    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler startEjbs
-    INFO: Started Ejb(deployment-id=JdbcOne, ejb-name=JdbcOne, container=Default Singleton Container)
-    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler createApplication
-    INFO: Deployed Application(path=C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest)
-    Apr 17, 2014 2:20:20 PM org.apache.openejb.assembler.classic.Assembler destroyApplication
-    INFO: Undeploying app: C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest
-    Apr 17, 2014 2:20:20 PM org.apache.openejb.assembler.classic.Assembler destroyResource
-    INFO: Closing DataSource: JdbcTwo
-    Apr 17, 2014 2:20:20 PM org.apache.openejb.assembler.classic.Assembler destroyResource
-    INFO: Closing DataSource: JdbcOne
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.857 sec
-    INFO - A valid shutdown command was received via the shutdown port. Stopping the Server instance.
-    INFO - Pausing ProtocolHandler ["http-bio-55243"]
-    INFO - Pausing ProtocolHandler ["ajp-bio-55245"]
-    INFO - Stopping service Catalina
-    INFO - Stopping ProtocolHandler ["http-bio-55243"]
-    INFO - Stopping ProtocolHandler ["ajp-bio-55245"]
-    INFO - Stopping server services
-    INFO - Undeploying app: openejb
-    INFO - Closing DataSource: DatabaseOne
-    INFO - Closing DataSource: DatabaseTwo
-    INFO - Destroying ProtocolHandler ["http-bio-55243"]
-    INFO - Destroying ProtocolHandler ["ajp-bio-55245"]
-
-    Results :
-
-    Tests run: 4, Failures: 0, Errors: 0, Skipped: 0
+Title: DataSource Versioning
+
+This example shows you how to use versioned DataSources of the same provider using the classpath attribute.
+
+# Configuration
+
+The DataSource configuration can be made several ways and here we layout two common methods in the form of unit tests.
+Before we start, if you take a peek in the project pom.xml and look for the maven-dependency-plugin usage you will see that we pull in
+two completely different driver files for this example.
+
+# AlternateDataSourceTest.java
+This test utilizes the Arquillian testing framework. See [here](http://tomee.apache.org/arquillian-available-adapters.html) for more details.
+
+The example uses src/test/resources/arquillian.xml and src/test/conf/tomee.xml to define the DataSources.
+Note the differing driver version paths, yet still using the same provider (org.apache.derby.jdbc.EmbeddedDriver):
+
+    <tomee>
+
+      <Resource id="DatabaseOne" type="DataSource" classpath="${catalina.base}/../../drivers/derby-10.10.1.1.jar">
+        JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
+        JdbcUrl jdbc:derby:databaseOne;create=true
+        UserName SA
+      </Resource>
+
+      <Resource id="DatabaseTwo" type="DataSource" classpath="${catalina.base}/../../drivers/derby-10.9.1.0.jar">
+        JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
+        JdbcUrl jdbc:derby:databaseTwo;create=true
+        UserName SA
+      </Resource>
+
+    </tomee>
+	
+# Developer Information
+When testing within a Maven environment it is also possible to use direct maven coordinates rather than a file link, like so:
+
+    ....
+	<Resource id="DatabaseOne" type="DataSource" classpath="mvn:org.apache.derby:derby:10.10.1.1">
+	....
+	
+
+# AlternateDriverJarTest.java
+
+This test takes an embedded approach and as you can see the driver paths are specified as a DataSource parameter.
+Both examples demonstrate the same, in that two driver versions can be loaded and used within the same application.
+
+    @Configuration
+    public Properties config() {
+
+        final File drivers = new File(new File("target"), "drivers").getAbsoluteFile();
+
+        final Properties p = new Properties();
+        p.put("openejb.jdbc.datasource-creator", "dbcp-alternative");
+
+        File file = new File(drivers, "derby-10.10.1.1.jar");
+        Assert.assertTrue("Failed to find: " + file, file.exists());
+
+        p.put("JdbcOne", "new://Resource?type=DataSource&classpath="
+                + file.getAbsolutePath().replace("\\", "/"));
+        p.put("JdbcOne.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
+        p.put("JdbcOne.JdbcUrl", "jdbc:derby:memory:JdbcOne;create=true");
+        p.put("JdbcOne.UserName", USER);
+        p.put("JdbcOne.Password", PASSWORD);
+        p.put("JdbcOne.JtaManaged", "false");
+
+        file = new File(drivers, "derby-10.9.1.0.jar");
+        Assert.assertTrue("Failed to find: " + file, file.exists());
+
+        p.put("JdbcTwo", "new://Resource?type=DataSource&classpath="
+                + file.getAbsolutePath().replace("\\", "/"));
+        p.put("JdbcTwo.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
+        p.put("JdbcTwo.JdbcUrl", "jdbc:derby:memory:JdbcTwo;create=true");
+        p.put("JdbcTwo.UserName", USER);
+        p.put("JdbcTwo.Password", PASSWORD);
+        p.put("JdbcTwo.JtaManaged", "false");
+        return p;
+    }
+
+# Full Test Source for AlternateDataSourceTest.java
+
+    package org.superbiz;
+
+    import org.jboss.arquillian.container.test.api.Deployment;
+    import org.jboss.arquillian.junit.Arquillian;
+    import org.jboss.shrinkwrap.api.ShrinkWrap;
+    import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+    import org.jboss.shrinkwrap.api.spec.WebArchive;
+    import org.junit.Assert;
+    import org.junit.Test;
+    import org.junit.runner.RunWith;
+
+    import javax.annotation.Resource;
+    import javax.ejb.EJB;
+    import javax.ejb.Stateless;
+    import javax.sql.DataSource;
+    import java.sql.Connection;
+    import java.sql.DatabaseMetaData;
+    import java.sql.SQLException;
+
+    @RunWith(Arquillian.class)
+    public class AlternateDataSourceTest {
+
+        @Deployment
+        public static WebArchive createDeployment() {
+
+            return ShrinkWrap.create(WebArchive.class, "test.war")
+                .addClasses(DataSourceTester.class)
+                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml");
+            //We are using src/test/conf/tomee.xml, but this also works - .addAsResource(new ClassLoaderAsset("META-INF/resources.xml"), "META-INF/resources.xml");
+            //Or even using a persistence context - .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
+        }
+
+        @EJB
+        private DataSourceTester tester;
+
+        @Test
+        public void testDataSourceOne() throws Exception {
+            Assert.assertEquals("Should be using 10.10.1.1 - (1458268)", "10.10.1.1 - (1458268)", tester.getOne());
+        }
+
+        @Test
+        public void testDataSourceTwo() throws Exception {
+            Assert.assertEquals("Should be using 10.9.1.0 - (1344872)", "10.9.1.0 - (1344872)", tester.getTwo());
+        }
+
+        @Test
+        public void testDataSourceBoth() throws Exception {
+            Assert.assertEquals("Should be using 10.10.1.1 - (1458268)|10.9.1.0 - (1344872)", "10.10.1.1 - (1458268)|10.9.1.0 - (1344872)", tester.getBoth());
+        }
+
+        @Stateless
+        public static class DataSourceTester {
+
+            @Resource(name = "DatabaseOne")
+            DataSource dataSourceOne;
+
+            @Resource(name = "DatabaseTwo")
+            DataSource dataSourceTwo;
+
+            public String getOne() throws Exception {
+                return getVersion(dataSourceOne);
+            }
+
+            public String getTwo() throws Exception {
+                return getVersion(dataSourceTwo);
+            }
+
+            public String getBoth() throws Exception {
+                return getOne() + "|" + getTwo();
+            }
+
+            private static String getVersion(final DataSource ds) throws SQLException {
+                Connection con = null;
+                try {
+                    con = ds.getConnection();
+                    final DatabaseMetaData md = con.getMetaData();
+                    return md.getDriverVersion();
+                } finally {
+                    if (con != null) {
+                        con.close();
+                    }
+                }
+            }
+        }
+    }
+
+# Running
+
+    
+    -------------------------------------------------------
+     T E S T S
+    -------------------------------------------------------
+    Running org.superbiz.AlternateDataSourceTest
+    Apr 17, 2014 2:19:45 PM org.apache.openejb.arquillian.common.Setup findHome
+    INFO: Unable to find home in: C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote
+    Apr 17, 2014 2:19:45 PM org.apache.openejb.arquillian.common.MavenCache getArtifact
+    INFO: Downloading org.apache.openejb:apache-tomee:1.6.1-SNAPSHOT:zip:webprofile please wait...
+    Apr 17, 2014 2:19:45 PM org.apache.openejb.arquillian.common.Zips unzip
+    INFO: Extracting 'C:\Users\Andy\.m2\repository\org\apache\openejb\apache-tomee\1.6.1-SNAPSHOT\apache-tomee-1.6.1-SNAPSHOT-webprofile.zip' to 'C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote'
+    Apr 17, 2014 2:19:47 PM org.apache.tomee.arquillian.remote.RemoteTomEEContainer configure
+    INFO: Downloaded container to: C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT
+    INFO - The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: C:\Program Files\Java\jdk1.7.0_45\jre\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Windows Live\Shared;C:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Program Files\SlikSvn\bin;C:\dev\apache-maven-3.2.1\bin;C:\dev\apache-ant-1.9.3\bin;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\Git\bin;C:\Program Files\TortoiseGit\bin;C:\Program Files\TortoiseSVN\bin;.
+    INFO - Initializing ProtocolHandler ["http-bio-55243"]
+    INFO - Initializing ProtocolHandler ["ajp-bio-55245"]
+    INFO - Using 'openejb.jdbc.datasource-creator=org.apache.tomee.jdbc.TomEEDataSourceCreator'
+    INFO - Optional service not installed: org.apache.tomee.webservices.TomeeJaxRsService
+    INFO - Optional service not installed: org.apache.tomee.webservices.TomeeJaxWsService
+    INFO - ********************************************************************************
+    INFO - OpenEJB http://tomee.apache.org/
+    INFO - Startup: Thu Apr 17 14:19:55 CEST 2014
+    INFO - Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
+    INFO - Version: 7.0.0-SNAPSHOT
+    INFO - Build date: 20140417
+    INFO - Build time: 01:37
+    INFO - ********************************************************************************
+    INFO - openejb.home = C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT
+    INFO - openejb.base = C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT
+    INFO - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@22c2e2dd
+    INFO - Succeeded in installing singleton service
+    INFO - openejb configuration file is 'C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT\conf\tomee.xml'
+    INFO - Configuring Service(id=Tomcat Security Service, type=SecurityService, provider-id=Tomcat Security Service)
+    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    INFO - Configuring Service(id=DatabaseOne, type=Resource, provider-id=Default JDBC Database)
+    INFO - Configuring Service(id=DatabaseTwo, type=Resource, provider-id=Default JDBC Database)
+    INFO - Using 'openejb.system.apps=true'
+    INFO - Configuring enterprise application: openejb
+    INFO - Using openejb.deploymentId.format '{ejbName}'
+    INFO - Auto-deploying ejb openejb/Deployer: EjbDeployment(deployment-id=openejb/Deployer)
+    INFO - Auto-deploying ejb openejb/ConfigurationInfo: EjbDeployment(deployment-id=openejb/ConfigurationInfo)
+    INFO - Auto-deploying ejb MEJB: EjbDeployment(deployment-id=MEJB)
+    INFO - Configuring Service(id=Default Stateless Container, type=Container, provider-id=Default Stateless Container)
+    INFO - Auto-creating a container for bean openejb/Deployer: Container(type=STATELESS, id=Default Stateless Container)
+    INFO - Enterprise application "openejb" loaded.
+    INFO - Creating TransactionManager(id=Default Transaction Manager)
+    INFO - Creating SecurityService(id=Tomcat Security Service)
+    INFO - Creating Resource(id=DatabaseOne)
+    INFO - Disabling testOnBorrow since no validation query is provided
+    INFO - Creating Resource(id=DatabaseTwo)
+    INFO - Disabling testOnBorrow since no validation query is provided
+    INFO - Creating Container(id=Default Stateless Container)
+    INFO - Assembling app: openejb
+    INFO - Using 'openejb.jndiname.format={deploymentId}{interfaceType.openejbLegacyName}'
+    INFO - Jndi(name=openejb/DeployerBusinessRemote) --> Ejb(deployment-id=openejb/Deployer)
+    INFO - Jndi(name=global/openejb/openejb/Deployer!org.apache.openejb.assembler.Deployer) --> Ejb(deployment-id=openejb/Deployer)
+    INFO - Jndi(name=global/openejb/openejb/Deployer) --> Ejb(deployment-id=openejb/Deployer)
+    INFO - Jndi(name=openejb/ConfigurationInfoBusinessRemote) --> Ejb(deployment-id=openejb/ConfigurationInfo)
+    INFO - Jndi(name=global/openejb/openejb/ConfigurationInfo!org.apache.openejb.assembler.classic.cmd.ConfigurationInfo) --> Ejb(deployment-id=openejb/ConfigurationInfo)
+    INFO - Jndi(name=global/openejb/openejb/ConfigurationInfo) --> Ejb(deployment-id=openejb/ConfigurationInfo)
+    INFO - Jndi(name=MEJB) --> Ejb(deployment-id=MEJB)
+    INFO - Jndi(name=global/openejb/MEJB!javax.management.j2ee.ManagementHome) --> Ejb(deployment-id=MEJB)
+    INFO - Jndi(name=global/openejb/MEJB) --> Ejb(deployment-id=MEJB)
+    INFO - Created Ejb(deployment-id=openejb/Deployer, ejb-name=openejb/Deployer, container=Default Stateless Container)
+    INFO - Created Ejb(deployment-id=MEJB, ejb-name=MEJB, container=Default Stateless Container)
+    INFO - Created Ejb(deployment-id=openejb/ConfigurationInfo, ejb-name=openejb/ConfigurationInfo, container=Default Stateless Container)
+    INFO - Started Ejb(deployment-id=openejb/Deployer, ejb-name=openejb/Deployer, container=Default Stateless Container)
+    INFO - Started Ejb(deployment-id=MEJB, ejb-name=MEJB, container=Default Stateless Container)
+    INFO - Started Ejb(deployment-id=openejb/ConfigurationInfo, ejb-name=openejb/ConfigurationInfo, container=Default Stateless Container)
+    INFO - Deployed MBean(openejb.user.mbeans:application=openejb,group=org.apache.openejb.assembler.monitoring,name=JMXDeployer)
+    INFO - Deployed Application(path=openejb)
+    INFO -   ** Bound Services **
+    INFO -   NAME                 IP              PORT
+    INFO - -------
+    INFO - Ready!
+    INFO - Initialization processed in 7959 ms
+    INFO - Importing a Tomcat Resource with id 'UserDatabase' of type 'org.apache.catalina.UserDatabase'.
+    INFO - Creating Resource(id=UserDatabase)
+    INFO - Starting service Catalina
+    INFO - Starting Servlet Engine: Apache Tomcat (TomEE)/7.0.53 (1.6.1-SNAPSHOT)
+    INFO - Starting ProtocolHandler ["http-bio-55243"]
+    INFO - Starting ProtocolHandler ["ajp-bio-55245"]
+    INFO - Server startup in 288 ms
+    WARNING - StandardServer.await: Invalid command '' received
+    Apr 17, 2014 2:20:04 PM org.apache.openejb.client.EventLogger log
+    INFO: RemoteInitialContextCreated{providerUri=http://localhost:55243/tomee/ejb}
+    INFO - Extracting jar: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test.war
+    INFO - Extracted path: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test
+    INFO - using default host: localhost
+    INFO - ------------------------- localhost -> /test
+    INFO - Using 'openejb.session.manager=org.apache.tomee.catalina.session.QuickSessionManager'
+    INFO - Configuring enterprise application: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test
+    INFO - Auto-deploying ejb DataSourceTester: EjbDeployment(deployment-id=DataSourceTester)
+    INFO - Auto-linking resource-ref 'java:comp/env/DatabaseTwo' in bean DataSourceTester to Resource(id=DatabaseTwo)
+    INFO - Auto-linking resource-ref 'java:comp/env/DatabaseOne' in bean DataSourceTester to Resource(id=DatabaseOne)
+    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+    INFO - Auto-creating a container for bean org.superbiz.AlternateDataSourceTest: Container(type=MANAGED, id=Default Managed Container)
+    INFO - Creating Container(id=Default Managed Container)
+    INFO - Using directory C:\dev\svn\tomee\examples\datasource-versioning\target\apache-tomee-remote\apache-tomee-webprofile-1.6.1-SNAPSHOT\temp for stateful session passivation
+    INFO - Enterprise application "C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test" loaded.
+    INFO - Assembling app: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test
+    INFO - Jndi(name=DataSourceTesterLocalBean) --> Ejb(deployment-id=DataSourceTester)
+    INFO - Jndi(name=global/test/DataSourceTester!org.superbiz.AlternateDataSourceTest$DataSourceTester) --> Ejb(deployment-id=DataSourceTester)
+    INFO - Jndi(name=global/test/DataSourceTester) --> Ejb(deployment-id=DataSourceTester)
+    INFO - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@22c2e2dd
+    INFO - OpenWebBeans Container is starting...
+    INFO - Adding OpenWebBeansPlugin : [CdiPlugin]
+    INFO - Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin]
+    INFO - All injection points were validated successfully.
+    INFO - OpenWebBeans Container has started, it took 203 ms.
+    INFO - Created Ejb(deployment-id=DataSourceTester, ejb-name=DataSourceTester, container=Default Stateless Container)
+    INFO - Started Ejb(deployment-id=DataSourceTester, ejb-name=DataSourceTester, container=Default Stateless Container)
+    INFO - Deployed Application(path=C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test)
+    Apr 17, 2014 2:20:11 PM org.apache.openejb.client.EventLogger log
+    INFO: RemoteInitialContextCreated{providerUri=http://localhost:55243/tomee/ejb}
+    INFO - Undeploying app: C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0\test
+    Apr 17, 2014 2:20:13 PM org.apache.openejb.arquillian.common.TomEEContainer undeploy
+    INFO: cleaning C:\dev\svn\tomee\examples\datasource-versioning\target\arquillian-test-working-dir\0
+    Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 30.155 sec
+    Running org.superbiz.AlternateDriverJarTest
+    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigUtils searchForConfiguration
+    INFO: Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
+    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigurationFactory configureService
+    INFO: Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigurationFactory configureService
+    INFO: Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigurationFactory configureService
+    INFO: Configuring Service(id=JdbcTwo, type=Resource, provider-id=Default JDBC Database)
+    Apr 17, 2014 2:20:13 PM org.apache.openejb.config.ConfigurationFactory configureService
+    INFO: Configuring Service(id=JdbcOne, type=Resource, provider-id=Default JDBC Database)
+    Apr 17, 2014 2:20:13 PM org.apache.openejb.assembler.classic.Assembler createRecipe
+    INFO: Creating TransactionManager(id=Default Transaction Manager)
+    Apr 17, 2014 2:20:14 PM org.apache.openejb.assembler.classic.Assembler createRecipe
+    INFO: Creating SecurityService(id=Default Security Service)
+    Apr 17, 2014 2:20:14 PM org.apache.openejb.assembler.classic.Assembler createRecipe
+    INFO: Creating Resource(id=JdbcTwo)
+    Apr 17, 2014 2:20:15 PM org.apache.openejb.assembler.classic.Assembler createRecipe
+    INFO: Creating Resource(id=JdbcOne)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.ConfigurationFactory configureApplication
+    INFO: Configuring enterprise application: C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.ConfigurationFactory configureService
+    INFO: Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AutoConfig createContainer
+    INFO: Auto-creating a container for bean org.superbiz.AlternateDriverJarTest: Container(type=MANAGED, id=Default Managed Container)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.Assembler createRecipe
+    INFO: Creating Container(id=Default Managed Container)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.core.managed.SimplePassivater init
+    INFO: Using directory C:\Users\Andy\AppData\Local\Temp for stateful session passivation
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.ConfigurationFactory configureService
+    INFO: Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AutoConfig createContainer
+    INFO: Auto-creating a container for bean JdbcOne: Container(type=SINGLETON, id=Default Singleton Container)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.Assembler createRecipe
+    INFO: Creating Container(id=Default Singleton Container)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AutoConfig processResourceRef
+    INFO: Auto-linking resource-ref 'java:comp/env/JdbcOne' in bean JdbcOne to Resource(id=JdbcOne)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AutoConfig processResourceRef
+    INFO: Auto-linking resource-ref 'java:comp/env/JdbcTwo' in bean JdbcTwo to Resource(id=JdbcTwo)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.config.AppInfoBuilder build
+    INFO: Enterprise application "C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest" loaded.
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.Assembler createApplication
+    INFO: Assembling app: C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
+    INFO: Jndi(name=JdbcOneLocalBean) --> Ejb(deployment-id=JdbcOne)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
+    INFO: Jndi(name=global/AlternateDriverJarTest/app/JdbcOne!org.superbiz.AlternateDriverJarTest$JdbcOne) --> Ejb(deployment-id=JdbcOne)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
+    INFO: Jndi(name=global/AlternateDriverJarTest/app/JdbcOne) --> Ejb(deployment-id=JdbcOne)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
+    INFO: Jndi(name=JdbcTwoLocalBean) --> Ejb(deployment-id=JdbcTwo)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
+    INFO: Jndi(name=global/AlternateDriverJarTest/app/JdbcTwo!org.superbiz.AlternateDriverJarTest$JdbcTwo) --> Ejb(deployment-id=JdbcTwo)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.assembler.classic.JndiBuilder bind
+    INFO: Jndi(name=global/AlternateDriverJarTest/app/JdbcTwo) --> Ejb(deployment-id=JdbcTwo)
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.cdi.CdiBuilder initializeOWB
+    INFO: Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@5ddd4e70
+    Apr 17, 2014 2:20:16 PM org.apache.openejb.cdi.CdiBuilder initializeOWB
+    INFO: Succeeded in installing singleton service
+    Apr 17, 2014 2:20:17 PM org.apache.openejb.cdi.OpenEJBLifecycle startApplication
+    INFO: OpenWebBeans Container is starting...
+    Apr 17, 2014 2:20:17 PM org.apache.webbeans.plugins.PluginLoader startUp
+    INFO: Adding OpenWebBeansPlugin : [CdiPlugin]
+    Apr 17, 2014 2:20:17 PM org.apache.webbeans.config.BeansDeployer validateInjectionPoints
+    INFO: All injection points were validated successfully.
+    Apr 17, 2014 2:20:17 PM org.apache.openejb.cdi.OpenEJBLifecycle startApplication
+    INFO: OpenWebBeans Container has started, it took 223 ms.
+    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler startEjbs
+    INFO: Created Ejb(deployment-id=JdbcTwo, ejb-name=JdbcTwo, container=Default Singleton Container)
+    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler startEjbs
+    INFO: Created Ejb(deployment-id=JdbcOne, ejb-name=JdbcOne, container=Default Singleton Container)
+    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler startEjbs
+    INFO: Started Ejb(deployment-id=JdbcTwo, ejb-name=JdbcTwo, container=Default Singleton Container)
+    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler startEjbs
+    INFO: Started Ejb(deployment-id=JdbcOne, ejb-name=JdbcOne, container=Default Singleton Container)
+    Apr 17, 2014 2:20:17 PM org.apache.openejb.assembler.classic.Assembler createApplication
+    INFO: Deployed Application(path=C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest)
+    Apr 17, 2014 2:20:20 PM org.apache.openejb.assembler.classic.Assembler destroyApplication
+    INFO: Undeploying app: C:\dev\svn\tomee\examples\datasource-versioning\AlternateDriverJarTest
+    Apr 17, 2014 2:20:20 PM org.apache.openejb.assembler.classic.Assembler destroyResource
+    INFO: Closing DataSource: JdbcTwo
+    Apr 17, 2014 2:20:20 PM org.apache.openejb.assembler.classic.Assembler destroyResource
+    INFO: Closing DataSource: JdbcOne
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.857 sec
+    INFO - A valid shutdown command was received via the shutdown port. Stopping the Server instance.
+    INFO - Pausing ProtocolHandler ["http-bio-55243"]
+    INFO - Pausing ProtocolHandler ["ajp-bio-55245"]
+    INFO - Stopping service Catalina
+    INFO - Stopping ProtocolHandler ["http-bio-55243"]
+    INFO - Stopping ProtocolHandler ["ajp-bio-55245"]
+    INFO - Stopping server services
+    INFO - Undeploying app: openejb
+    INFO - Closing DataSource: DatabaseOne
+    INFO - Closing DataSource: DatabaseTwo
+    INFO - Destroying ProtocolHandler ["http-bio-55243"]
+    INFO - Destroying ProtocolHandler ["ajp-bio-55245"]
+
+    Results :
+
+    Tests run: 4, Failures: 0, Errors: 0, Skipped: 0

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
----------------------------------------------------------------------
diff --git a/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java b/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
index 2aa2386..2877434 100644
--- a/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
+++ b/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
@@ -1,101 +1,101 @@
-/*
- * 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.superbiz;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
-@RunWith(Arquillian.class)
-public class AlternateDataSourceTest {
-
-    @Deployment
-    public static WebArchive createDeployment() {
-
-        return ShrinkWrap.create(WebArchive.class, "test.war")
-                .addClasses(DataSourceTester.class)
-                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml");
-        //We are using src/test/conf/tomee.xml, but this also works - .addAsResource(new ClassLoaderAsset("META-INF/resources.xml"), "META-INF/resources.xml");
-        //Or even using a persistence context - .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
-    }
-
-    @EJB
-    private DataSourceTester tester;
-
-    @Test
-    public void testDataSourceOne() throws Exception {
-        Assert.assertEquals("Should be using 10.10.1.1 - (1458268)", "10.10.1.1 - (1458268)", tester.getOne());
-    }
-
-    @Test
-    public void testDataSourceTwo() throws Exception {
-        Assert.assertEquals("Should be using 10.9.1.0 - (1344872)", "10.9.1.0 - (1344872)", tester.getTwo());
-    }
-
-    @Test
-    public void testDataSourceBoth() throws Exception {
-        Assert.assertEquals("Should be using 10.10.1.1 - (1458268)|10.9.1.0 - (1344872)", "10.10.1.1 - (1458268)|10.9.1.0 - (1344872)", tester.getBoth());
-    }
-
-    @Stateless
-    public static class DataSourceTester {
-
-        @Resource(name = "DatabaseOne")
-        DataSource dataSourceOne;
-
-        @Resource(name = "DatabaseTwo")
-        DataSource dataSourceTwo;
-
-        public String getOne() throws Exception {
-            return getVersion(dataSourceOne);
-        }
-
-        public String getTwo() throws Exception {
-            return getVersion(dataSourceTwo);
-        }
-
-        public String getBoth() throws Exception {
-            return getOne() + "|" + getTwo();
-        }
-
-        private static String getVersion(final DataSource ds) throws SQLException {
-            Connection con = null;
-            try {
-                con = ds.getConnection();
-                final DatabaseMetaData md = con.getMetaData();
-                return md.getDriverVersion();
-            } finally {
-                if (con != null) {
-                    con.close();
-                }
-            }
-        }
-    }
-}
+/*
+ * 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.superbiz;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+@RunWith(Arquillian.class)
+public class AlternateDataSourceTest {
+
+    @Deployment
+    public static WebArchive createDeployment() {
+
+        return ShrinkWrap.create(WebArchive.class, "test.war")
+                .addClasses(DataSourceTester.class)
+                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml");
+        //We are using src/test/conf/tomee.xml, but this also works - .addAsResource(new ClassLoaderAsset("META-INF/resources.xml"), "META-INF/resources.xml");
+        //Or even using a persistence context - .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
+    }
+
+    @EJB
+    private DataSourceTester tester;
+
+    @Test
+    public void testDataSourceOne() throws Exception {
+        Assert.assertEquals("Should be using 10.10.1.1 - (1458268)", "10.10.1.1 - (1458268)", tester.getOne());
+    }
+
+    @Test
+    public void testDataSourceTwo() throws Exception {
+        Assert.assertEquals("Should be using 10.9.1.0 - (1344872)", "10.9.1.0 - (1344872)", tester.getTwo());
+    }
+
+    @Test
+    public void testDataSourceBoth() throws Exception {
+        Assert.assertEquals("Should be using 10.10.1.1 - (1458268)|10.9.1.0 - (1344872)", "10.10.1.1 - (1458268)|10.9.1.0 - (1344872)", tester.getBoth());
+    }
+
+    @Stateless
+    public static class DataSourceTester {
+
+        @Resource(name = "DatabaseOne")
+        DataSource dataSourceOne;
+
+        @Resource(name = "DatabaseTwo")
+        DataSource dataSourceTwo;
+
+        public String getOne() throws Exception {
+            return getVersion(dataSourceOne);
+        }
+
+        public String getTwo() throws Exception {
+            return getVersion(dataSourceTwo);
+        }
+
+        public String getBoth() throws Exception {
+            return getOne() + "|" + getTwo();
+        }
+
+        private static String getVersion(final DataSource ds) throws SQLException {
+            Connection con = null;
+            try {
+                con = ds.getConnection();
+                final DatabaseMetaData md = con.getMetaData();
+                return md.getDriverVersion();
+            } finally {
+                if (con != null) {
+                    con.close();
+                }
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/datasource-versioning/src/test/resources/META-INF/resources.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-versioning/src/test/resources/META-INF/resources.xml b/examples/datasource-versioning/src/test/resources/META-INF/resources.xml
index 62c12dc..3d18c66 100644
--- a/examples/datasource-versioning/src/test/resources/META-INF/resources.xml
+++ b/examples/datasource-versioning/src/test/resources/META-INF/resources.xml
@@ -1,36 +1,36 @@
-<?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.
--->
-<resources>
-
-  <!--Not used, just here as an example-->
-
-  <Resource id="DatabaseOne" type="DataSource" classpath="${catalina.base}/../../drivers/derby-10.10.1.1.jar">
-    JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
-    JdbcUrl jdbc:derby:target/databaseOne;create=true
-    UserName SA
-  </Resource>
-
-  <Resource id="DatabaseTwo" type="DataSource" classpath="${catalina.base}/../../drivers/derby-10.9.1.0.jar">
-    JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
-    JdbcUrl jdbc:derby:target/databaseTwo;create=true
-    UserName SA
-  </Resource>
-
+<?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.
+-->
+<resources>
+
+  <!--Not used, just here as an example-->
+
+  <Resource id="DatabaseOne" type="DataSource" classpath="${catalina.base}/../../drivers/derby-10.10.1.1.jar">
+    JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
+    JdbcUrl jdbc:derby:target/databaseOne;create=true
+    UserName SA
+  </Resource>
+
+  <Resource id="DatabaseTwo" type="DataSource" classpath="${catalina.base}/../../drivers/derby-10.9.1.0.jar">
+    JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
+    JdbcUrl jdbc:derby:target/databaseTwo;create=true
+    UserName SA
+  </Resource>
+
 </resources>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/decorators/src/main/java/org/superbiz/cdi/decorators/AccessDeniedException.java
----------------------------------------------------------------------
diff --git a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/AccessDeniedException.java b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/AccessDeniedException.java
index ce38e68..b0701f5 100644
--- a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/AccessDeniedException.java
+++ b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/AccessDeniedException.java
@@ -1,30 +1,30 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.decorators;
-
-import javax.ejb.ApplicationException;
-
-/**
- * @version $Revision$ $Date$
- */
-@ApplicationException
-public class AccessDeniedException extends RuntimeException {
-
-    public AccessDeniedException(String s) {
-        super(s);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.decorators;
+
+import javax.ejb.ApplicationException;
+
+/**
+ * @version $Revision$ $Date$
+ */
+@ApplicationException
+public class AccessDeniedException extends RuntimeException {
+
+    public AccessDeniedException(String s) {
+        super(s);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/decorators/src/main/java/org/superbiz/cdi/decorators/Calculator.java
----------------------------------------------------------------------
diff --git a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/Calculator.java b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/Calculator.java
index dec43bf..ef8ffed 100644
--- a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/Calculator.java
+++ b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/Calculator.java
@@ -1,33 +1,33 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.decorators;
-
-/**
- * @version $Revision$ $Date$
- */
-public interface Calculator {
-
-    public int add(int a, int b);
-
-    public int subtract(int a, int b);
-
-    public int multiply(int a, int b);
-
-    public int divide(int a, int b);
-
-    public int remainder(int a, int b);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.decorators;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public interface Calculator {
+
+    public int add(int a, int b);
+
+    public int subtract(int a, int b);
+
+    public int multiply(int a, int b);
+
+    public int divide(int a, int b);
+
+    public int remainder(int a, int b);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorBean.java
----------------------------------------------------------------------
diff --git a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorBean.java b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorBean.java
index 7d6c6e4..dc61f30 100644
--- a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorBean.java
+++ b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorBean.java
@@ -1,42 +1,42 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.decorators;
-
-import javax.ejb.Stateless;
-
-@Stateless
-public class CalculatorBean implements Calculator {
-    public int add(int a, int b) {
-        return a + b;
-    }
-
-    public int subtract(int a, int b) {
-        return a - b;
-    }
-
-    public int multiply(int a, int b) {
-        return a * b;
-    }
-
-    public int divide(int a, int b) {
-        return a / b;
-    }
-
-    public int remainder(int a, int b) {
-        return a % b;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.decorators;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class CalculatorBean implements Calculator {
+    public int add(int a, int b) {
+        return a + b;
+    }
+
+    public int subtract(int a, int b) {
+        return a - b;
+    }
+
+    public int multiply(int a, int b) {
+        return a * b;
+    }
+
+    public int divide(int a, int b) {
+        return a / b;
+    }
+
+    public int remainder(int a, int b) {
+        return a % b;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorLogging.java
----------------------------------------------------------------------
diff --git a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorLogging.java b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorLogging.java
index 3d21a42..3f12b71 100644
--- a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorLogging.java
+++ b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorLogging.java
@@ -1,60 +1,60 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.decorators;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-import java.util.logging.Logger;
-
-@Decorator
-public class CalculatorLogging implements Calculator {
-
-    private Logger logger = Logger.getLogger("Calculator");
-
-    @Inject
-    @Delegate
-    private Calculator calculator;
-
-    @Override
-    public int add(int a, int b) {
-        logger.fine(String.format("add(%s, %s)", a, b));
-        return calculator.add(a, b);
-    }
-
-    @Override
-    public int subtract(int a, int b) {
-        return calculator.subtract(a, b);
-    }
-
-    @Override
-    public int multiply(int a, int b) {
-        logger.finest(String.format("multiply(%s, %s)", a, b));
-        return calculator.multiply(a, b);
-    }
-
-    @Override
-    public int divide(int a, int b) {
-        return calculator.divide(a, b);
-    }
-
-    @Override
-    public int remainder(int a, int b) {
-        logger.info(String.format("remainder(%s, %s)", a, b));
-        return calculator.remainder(a, b);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.decorators;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+import java.util.logging.Logger;
+
+@Decorator
+public class CalculatorLogging implements Calculator {
+
+    private Logger logger = Logger.getLogger("Calculator");
+
+    @Inject
+    @Delegate
+    private Calculator calculator;
+
+    @Override
+    public int add(int a, int b) {
+        logger.fine(String.format("add(%s, %s)", a, b));
+        return calculator.add(a, b);
+    }
+
+    @Override
+    public int subtract(int a, int b) {
+        return calculator.subtract(a, b);
+    }
+
+    @Override
+    public int multiply(int a, int b) {
+        logger.finest(String.format("multiply(%s, %s)", a, b));
+        return calculator.multiply(a, b);
+    }
+
+    @Override
+    public int divide(int a, int b) {
+        return calculator.divide(a, b);
+    }
+
+    @Override
+    public int remainder(int a, int b) {
+        logger.info(String.format("remainder(%s, %s)", a, b));
+        return calculator.remainder(a, b);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorSecurity.java
----------------------------------------------------------------------
diff --git a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorSecurity.java b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorSecurity.java
index 00409a9..a4dd05c 100644
--- a/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorSecurity.java
+++ b/examples/decorators/src/main/java/org/superbiz/cdi/decorators/CalculatorSecurity.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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.decorators;
-
-import javax.annotation.Resource;
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.ejb.SessionContext;
-import javax.inject.Inject;
-
-@Decorator
-public class CalculatorSecurity implements Calculator {
-
-    @Inject
-    @Delegate
-    private Calculator calculator;
-
-    @Resource
-    private SessionContext sessionContext;
-
-    @Override
-    public int add(int a, int b) {
-        return calculator.add(a, b);
-    }
-
-    @Override
-    public int subtract(int a, int b) {
-        // Caller must pass a security check to call subtract
-        if (!sessionContext.isCallerInRole("Manager")) {
-            throw new AccessDeniedException(sessionContext.getCallerPrincipal().getName());
-        }
-
-        return calculator.subtract(a, b);
-    }
-
-    @Override
-    public int multiply(int a, int b) {
-        return calculator.multiply(a, b);
-    }
-
-    @Override
-    public int divide(int a, int b) {
-        return calculator.divide(a, b);
-    }
-
-    @Override
-    public int remainder(int a, int b) {
-        return calculator.remainder(a, b);
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.decorators;
+
+import javax.annotation.Resource;
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.ejb.SessionContext;
+import javax.inject.Inject;
+
+@Decorator
+public class CalculatorSecurity implements Calculator {
+
+    @Inject
+    @Delegate
+    private Calculator calculator;
+
+    @Resource
+    private SessionContext sessionContext;
+
+    @Override
+    public int add(int a, int b) {
+        return calculator.add(a, b);
+    }
+
+    @Override
+    public int subtract(int a, int b) {
+        // Caller must pass a security check to call subtract
+        if (!sessionContext.isCallerInRole("Manager")) {
+            throw new AccessDeniedException(sessionContext.getCallerPrincipal().getName());
+        }
+
+        return calculator.subtract(a, b);
+    }
+
+    @Override
+    public int multiply(int a, int b) {
+        return calculator.multiply(a, b);
+    }
+
+    @Override
+    public int divide(int a, int b) {
+        return calculator.divide(a, b);
+    }
+
+    @Override
+    public int remainder(int a, int b) {
+        return calculator.remainder(a, b);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/decorators/src/test/java/org/superbiz/cdi/decorators/CalculatorTest.java
----------------------------------------------------------------------
diff --git a/examples/decorators/src/test/java/org/superbiz/cdi/decorators/CalculatorTest.java b/examples/decorators/src/test/java/org/superbiz/cdi/decorators/CalculatorTest.java
index 610969e..42c0181 100644
--- a/examples/decorators/src/test/java/org/superbiz/cdi/decorators/CalculatorTest.java
+++ b/examples/decorators/src/test/java/org/superbiz/cdi/decorators/CalculatorTest.java
@@ -1,116 +1,116 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.decorators;
-
-import junit.framework.TestCase;
-
-import javax.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.embeddable.EJBContainer;
-import java.util.concurrent.Callable;
-
-public class CalculatorTest extends TestCase {
-
-    @EJB
-    private Calculator calculator;
-
-    @EJB
-    private ManagerBean manager;
-
-    /**
-     * Bootstrap the Embedded EJB Container
-     *
-     * @throws Exception
-     */
-    protected void setUp() throws Exception {
-        EJBContainer.createEJBContainer().getContext().bind("inject", this);
-    }
-
-    /**
-     * Test Add method
-     */
-    public void testAdd() {
-
-        assertEquals(10, calculator.add(4, 6));
-
-    }
-
-    /**
-     * Test Subtract method
-     */
-    public void testSubtract() {
-
-        try {
-            calculator.subtract(4, 6);
-
-            fail("AccessDeniedException should have been thrown for unauthenticated access");
-        } catch (AccessDeniedException expected) {
-            // pass
-        }
-
-        final int result = manager.call(new Callable<Integer>() {
-            public Integer call() {
-                return calculator.subtract(4, 6);
-            }
-        });
-
-        assertEquals(-2, result);
-
-    }
-
-    /**
-     * Test Multiply method
-     */
-    public void testMultiply() {
-
-        assertEquals(24, calculator.multiply(4, 6));
-
-    }
-
-    /**
-     * Test Divide method
-     */
-    public void testDivide() {
-
-        assertEquals(2, calculator.divide(12, 6));
-
-    }
-
-    /**
-     * Test Remainder method
-     */
-    public void testRemainder() {
-
-        assertEquals(4, calculator.remainder(46, 6));
-
-    }
-
-    @Stateless
-    @RunAs("Manager")
-    public static class ManagerBean {
-
-        public <V> V call(Callable<V> callable) {
-            try {
-                return callable.call();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.decorators;
+
+import junit.framework.TestCase;
+
+import javax.annotation.security.RunAs;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.embeddable.EJBContainer;
+import java.util.concurrent.Callable;
+
+public class CalculatorTest extends TestCase {
+
+    @EJB
+    private Calculator calculator;
+
+    @EJB
+    private ManagerBean manager;
+
+    /**
+     * Bootstrap the Embedded EJB Container
+     *
+     * @throws Exception
+     */
+    protected void setUp() throws Exception {
+        EJBContainer.createEJBContainer().getContext().bind("inject", this);
+    }
+
+    /**
+     * Test Add method
+     */
+    public void testAdd() {
+
+        assertEquals(10, calculator.add(4, 6));
+
+    }
+
+    /**
+     * Test Subtract method
+     */
+    public void testSubtract() {
+
+        try {
+            calculator.subtract(4, 6);
+
+            fail("AccessDeniedException should have been thrown for unauthenticated access");
+        } catch (AccessDeniedException expected) {
+            // pass
+        }
+
+        final int result = manager.call(new Callable<Integer>() {
+            public Integer call() {
+                return calculator.subtract(4, 6);
+            }
+        });
+
+        assertEquals(-2, result);
+
+    }
+
+    /**
+     * Test Multiply method
+     */
+    public void testMultiply() {
+
+        assertEquals(24, calculator.multiply(4, 6));
+
+    }
+
+    /**
+     * Test Divide method
+     */
+    public void testDivide() {
+
+        assertEquals(2, calculator.divide(12, 6));
+
+    }
+
+    /**
+     * Test Remainder method
+     */
+    public void testRemainder() {
+
+        assertEquals(4, calculator.remainder(46, 6));
+
+    }
+
+    @Stateless
+    @RunAs("Manager")
+    public static class ManagerBean {
+
+        public <V> V call(Callable<V> callable) {
+            try {
+                return callable.call();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
+}


[46/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
index ca7a751..7ef0dbd 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
@@ -1,201 +1,201 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.SecurityServiceInfo;
-import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.config.OutputGeneratedDescriptors;
-import org.apache.openejb.config.ValidationContext;
-import org.apache.openejb.config.ValidationFailedException;
-import org.apache.openejb.config.ValidationFailure;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.util.Join;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.ResourceBundle;
-import java.util.Set;
-
-import static org.apache.openejb.config.rules.ValidationAssertions.assertErrors;
-import static org.apache.openejb.config.rules.ValidationAssertions.assertFailures;
-import static org.apache.openejb.config.rules.ValidationAssertions.assertWarnings;
-import static org.junit.Assert.fail;
-
-/**
- * This Statement is the one which runs the test.
- */
-public class InvokeMethod extends Statement {
-    private ConfigurationFactory config;
-    private Assembler assembler;
-    // The test method
-    private final FrameworkMethod testMethod;
-    // The TestCase instance
-    private final Object target;
-    // These are all the keys defined in org.apache.openejb.config.rules.Messages.properties
-    private static final Set<String> allKeys;
-
-    static {
-        final ResourceBundle bundle = ResourceBundle.getBundle("org.apache.openejb.config.rules.Messages");
-        allKeys = bundle.keySet();
-    }
-
-    public InvokeMethod(final FrameworkMethod testMethod, final Object target) {
-        this.testMethod = testMethod;
-        this.target = target;
-    }
-
-    @Override
-    public void evaluate() throws Throwable {
-        final Map<Integer, List<String>> expectedKeys = validateKeys();
-        setUp();
-        final Object obj = testMethod.invokeExplosively(target);
-
-        final String outputDescriptors = SystemInstance.get().getProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, "false");
-        try {
-            SystemInstance.get().setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, "false");
-
-            ValidationContext vc = null;
-            if (obj instanceof EjbJar) {
-                final EjbJar ejbJar = (EjbJar) obj;
-                final EjbModule ejbModule = new EjbModule(ejbJar);
-                vc = ejbModule.getValidation();
-                assembler.createApplication(config.configureApplication(ejbModule));
-            } else if (obj instanceof EjbModule) {
-                final EjbModule ejbModule = (EjbModule) obj;
-                vc = ejbModule.getValidation();
-                assembler.createApplication(config.configureApplication(ejbModule));
-            } else if (obj instanceof AppModule) {
-                final AppModule appModule = (AppModule) obj;
-                vc = appModule.getValidation();
-                assembler.createApplication(config.configureApplication(appModule));
-            }
-            if (!isEmpty(expectedKeys)) {
-                if (vc != null && expectedKeys.get(KeyType.FAILURE).isEmpty() && expectedKeys.get(KeyType.ERROR).isEmpty()) {
-                    if (!expectedKeys.get(KeyType.WARNING).isEmpty()) {
-                        assertWarnings(expectedKeys.get(KeyType.WARNING), new ValidationFailedException("", vc));
-                    }
-                } else {
-                    fail("A ValidationFailedException should have been thrown");
-                }
-            }
-        } catch (final ValidationFailedException vfe) {
-            if (!isEmpty(expectedKeys)) {
-                if (!expectedKeys.get(KeyType.FAILURE).isEmpty()) {
-                    assertFailures(expectedKeys.get(KeyType.FAILURE), vfe);
-                }
-                if (!expectedKeys.get(KeyType.WARNING).isEmpty()) {
-                    assertWarnings(expectedKeys.get(KeyType.WARNING), vfe);
-                }
-                if (!expectedKeys.get(KeyType.ERROR).isEmpty()) {
-                    assertErrors(expectedKeys.get(KeyType.ERROR), vfe);
-                }
-            } else {
-                for (final ValidationFailure failure : vfe.getFailures()) {
-                    System.out.println("failure = " + failure.getMessageKey());
-                }
-                fail("There should be no validation failures");
-            }
-        } finally {
-            SystemInstance.get().setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, outputDescriptors);
-        }
-
-        tearDown();
-    }
-
-    private void setUp() throws Exception {
-        config = new ConfigurationFactory();
-        assembler = new Assembler();
-        assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
-        assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
-    }
-
-    private void tearDown() {
-    }
-
-    /**
-     * Tests to see if the keys specified in the @Keys annotation are also available in the org.apache.openejb.config.rules.Messages.properties file. If there are any invalid keys,
-     * then it throws an exception and causes the test to error out. If all the keys are valid, then it returns those keys. This list of keys can then be compared with all the Keys
-     * in org.apache.openejb.config.rules.Messages.properties and one can then find out the "test coverage" of the keys i.e. this tool can be used to find keys for which tests have
-     * not yet been written
-     *
-     * @return
-     * @throws Exception
-     */
-    private Map<Integer, List<String>> validateKeys() throws Exception {
-        final Keys annotation = testMethod.getAnnotation(Keys.class);
-        final Key[] keys = annotation.value();
-        final ArrayList<String> wrongKeys = new ArrayList<String>();
-        for (final Key key : keys) {
-            if (allKeys.contains("1." + key.value())) {
-                continue;
-            } else {
-                wrongKeys.add(key.value());
-            }
-        }
-        if (wrongKeys.isEmpty()) {
-            final Map<Integer, List<String>> validKeys = new HashMap<Integer, List<String>>();
-            final ArrayList<String> failureKeys = new ArrayList<String>();
-            final ArrayList<String> warningKeys = new ArrayList<String>();
-            final ArrayList<String> errorKeys = new ArrayList<String>();
-            for (final Key key : keys) {
-                for (int i = 0; i < key.count(); i++) {
-                    switch (key.type()) {
-                        case KeyType.FAILURE:
-                            failureKeys.add(key.value());
-                            break;
-                        case KeyType.WARNING:
-                            warningKeys.add(key.value());
-                            break;
-                        case KeyType.ERROR:
-                            errorKeys.add(key.value());
-                            break;
-                    }
-                }
-            }
-            validKeys.put(KeyType.FAILURE, failureKeys);
-            validKeys.put(KeyType.WARNING, warningKeys);
-            validKeys.put(KeyType.ERROR, errorKeys);
-            return validKeys;
-        } else {
-            final String commaDelimitedKeys = Join.join(",", wrongKeys);
-            throw new Exception("The following keys listed in the @Keys annotation on the method " + testMethod.getName() + "() of " + testMethod.getMethod().getDeclaringClass()
-                + " are invalid : " + commaDelimitedKeys
-                + " . Only keys listed in org.apache.openejb.config.rules.Messages.properties are allowed to be used in this annotation. ");
-        }
-    }
-
-    private boolean isEmpty(final Map<Integer, List<String>> expectedKeys) {
-        boolean empty = true;
-        final Set<Entry<Integer, List<String>>> entrySet = expectedKeys.entrySet();
-        for (final Entry<Integer, List<String>> entry : entrySet) {
-            empty = entry.getValue().size() == 0;
-            if (!empty)
-                return empty;
-        }
-        return empty;
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.OutputGeneratedDescriptors;
+import org.apache.openejb.config.ValidationContext;
+import org.apache.openejb.config.ValidationFailedException;
+import org.apache.openejb.config.ValidationFailure;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.Join;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+import static org.apache.openejb.config.rules.ValidationAssertions.assertErrors;
+import static org.apache.openejb.config.rules.ValidationAssertions.assertFailures;
+import static org.apache.openejb.config.rules.ValidationAssertions.assertWarnings;
+import static org.junit.Assert.fail;
+
+/**
+ * This Statement is the one which runs the test.
+ */
+public class InvokeMethod extends Statement {
+    private ConfigurationFactory config;
+    private Assembler assembler;
+    // The test method
+    private final FrameworkMethod testMethod;
+    // The TestCase instance
+    private final Object target;
+    // These are all the keys defined in org.apache.openejb.config.rules.Messages.properties
+    private static final Set<String> allKeys;
+
+    static {
+        final ResourceBundle bundle = ResourceBundle.getBundle("org.apache.openejb.config.rules.Messages");
+        allKeys = bundle.keySet();
+    }
+
+    public InvokeMethod(final FrameworkMethod testMethod, final Object target) {
+        this.testMethod = testMethod;
+        this.target = target;
+    }
+
+    @Override
+    public void evaluate() throws Throwable {
+        final Map<Integer, List<String>> expectedKeys = validateKeys();
+        setUp();
+        final Object obj = testMethod.invokeExplosively(target);
+
+        final String outputDescriptors = SystemInstance.get().getProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, "false");
+        try {
+            SystemInstance.get().setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, "false");
+
+            ValidationContext vc = null;
+            if (obj instanceof EjbJar) {
+                final EjbJar ejbJar = (EjbJar) obj;
+                final EjbModule ejbModule = new EjbModule(ejbJar);
+                vc = ejbModule.getValidation();
+                assembler.createApplication(config.configureApplication(ejbModule));
+            } else if (obj instanceof EjbModule) {
+                final EjbModule ejbModule = (EjbModule) obj;
+                vc = ejbModule.getValidation();
+                assembler.createApplication(config.configureApplication(ejbModule));
+            } else if (obj instanceof AppModule) {
+                final AppModule appModule = (AppModule) obj;
+                vc = appModule.getValidation();
+                assembler.createApplication(config.configureApplication(appModule));
+            }
+            if (!isEmpty(expectedKeys)) {
+                if (vc != null && expectedKeys.get(KeyType.FAILURE).isEmpty() && expectedKeys.get(KeyType.ERROR).isEmpty()) {
+                    if (!expectedKeys.get(KeyType.WARNING).isEmpty()) {
+                        assertWarnings(expectedKeys.get(KeyType.WARNING), new ValidationFailedException("", vc));
+                    }
+                } else {
+                    fail("A ValidationFailedException should have been thrown");
+                }
+            }
+        } catch (final ValidationFailedException vfe) {
+            if (!isEmpty(expectedKeys)) {
+                if (!expectedKeys.get(KeyType.FAILURE).isEmpty()) {
+                    assertFailures(expectedKeys.get(KeyType.FAILURE), vfe);
+                }
+                if (!expectedKeys.get(KeyType.WARNING).isEmpty()) {
+                    assertWarnings(expectedKeys.get(KeyType.WARNING), vfe);
+                }
+                if (!expectedKeys.get(KeyType.ERROR).isEmpty()) {
+                    assertErrors(expectedKeys.get(KeyType.ERROR), vfe);
+                }
+            } else {
+                for (final ValidationFailure failure : vfe.getFailures()) {
+                    System.out.println("failure = " + failure.getMessageKey());
+                }
+                fail("There should be no validation failures");
+            }
+        } finally {
+            SystemInstance.get().setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, outputDescriptors);
+        }
+
+        tearDown();
+    }
+
+    private void setUp() throws Exception {
+        config = new ConfigurationFactory();
+        assembler = new Assembler();
+        assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
+        assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+    }
+
+    private void tearDown() {
+    }
+
+    /**
+     * Tests to see if the keys specified in the @Keys annotation are also available in the org.apache.openejb.config.rules.Messages.properties file. If there are any invalid keys,
+     * then it throws an exception and causes the test to error out. If all the keys are valid, then it returns those keys. This list of keys can then be compared with all the Keys
+     * in org.apache.openejb.config.rules.Messages.properties and one can then find out the "test coverage" of the keys i.e. this tool can be used to find keys for which tests have
+     * not yet been written
+     *
+     * @return
+     * @throws Exception
+     */
+    private Map<Integer, List<String>> validateKeys() throws Exception {
+        final Keys annotation = testMethod.getAnnotation(Keys.class);
+        final Key[] keys = annotation.value();
+        final ArrayList<String> wrongKeys = new ArrayList<String>();
+        for (final Key key : keys) {
+            if (allKeys.contains("1." + key.value())) {
+                continue;
+            } else {
+                wrongKeys.add(key.value());
+            }
+        }
+        if (wrongKeys.isEmpty()) {
+            final Map<Integer, List<String>> validKeys = new HashMap<Integer, List<String>>();
+            final ArrayList<String> failureKeys = new ArrayList<String>();
+            final ArrayList<String> warningKeys = new ArrayList<String>();
+            final ArrayList<String> errorKeys = new ArrayList<String>();
+            for (final Key key : keys) {
+                for (int i = 0; i < key.count(); i++) {
+                    switch (key.type()) {
+                        case KeyType.FAILURE:
+                            failureKeys.add(key.value());
+                            break;
+                        case KeyType.WARNING:
+                            warningKeys.add(key.value());
+                            break;
+                        case KeyType.ERROR:
+                            errorKeys.add(key.value());
+                            break;
+                    }
+                }
+            }
+            validKeys.put(KeyType.FAILURE, failureKeys);
+            validKeys.put(KeyType.WARNING, warningKeys);
+            validKeys.put(KeyType.ERROR, errorKeys);
+            return validKeys;
+        } else {
+            final String commaDelimitedKeys = Join.join(",", wrongKeys);
+            throw new Exception("The following keys listed in the @Keys annotation on the method " + testMethod.getName() + "() of " + testMethod.getMethod().getDeclaringClass()
+                + " are invalid : " + commaDelimitedKeys
+                + " . Only keys listed in org.apache.openejb.config.rules.Messages.properties are allowed to be used in this annotation. ");
+        }
+    }
+
+    private boolean isEmpty(final Map<Integer, List<String>> expectedKeys) {
+        boolean empty = true;
+        final Set<Entry<Integer, List<String>>> entrySet = expectedKeys.entrySet();
+        for (final Entry<Integer, List<String>> entry : entrySet) {
+            empty = entry.getValue().size() == 0;
+            if (!empty)
+                return empty;
+        }
+        return empty;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java
index edf64d5..06ec3bf 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java
@@ -1,32 +1,32 @@
-/**
- * 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.config.rules;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Key {
-    String value();
-
-    int count() default 1;
-
-    int type() default KeyType.FAILURE;
-}
+/**
+ * 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.config.rules;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Key {
+    String value();
+
+    int count() default 1;
+
+    int type() default KeyType.FAILURE;
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Keys.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Keys.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Keys.java
index afda752..cb0dd09 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Keys.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Keys.java
@@ -1,31 +1,31 @@
-/**
- * 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.config.rules;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to specify the keys being tested.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Keys {
-    Key[] value() default {};
-}
+/**
+ * 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.config.rules;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Used to specify the keys being tested.
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Keys {
+    Key[] value() default {};
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java
index 0d4f4a0..6cce24f 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java
@@ -1,55 +1,55 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatefulBean;
-import org.apache.openejb.jee.StatelessBean;
-import org.junit.runner.RunWith;
-
-import javax.annotation.Resource;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-@RunWith(ValidationRunner.class)
-public class MistakenResourceRefUsageTest {
-    @Keys({@Key(value = "resourceRef.onEntityManagerFactory", count = 2), @Key(value = "resourceRef.onEntityManager", count = 2),
-        @Key(value = "resourceAnnotation.onClassWithNoName", count = 2)})
-    public EjbJar wrongUsage() throws OpenEJBException {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
-        ejbJar.addEnterpriseBean(new StatefulBean(FooStateful.class));
-        return ejbJar;
-    }
-
-    @Resource
-    private static class FooStateless {
-        @Resource
-        EntityManagerFactory emf;
-        @Resource
-        EntityManager em;
-    }
-
-    @Resource
-    private static class FooStateful {
-        @Resource
-        EntityManagerFactory emf;
-        @Resource
-        EntityManager em;
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatefulBean;
+import org.apache.openejb.jee.StatelessBean;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+@RunWith(ValidationRunner.class)
+public class MistakenResourceRefUsageTest {
+    @Keys({@Key(value = "resourceRef.onEntityManagerFactory", count = 2), @Key(value = "resourceRef.onEntityManager", count = 2),
+        @Key(value = "resourceAnnotation.onClassWithNoName", count = 2)})
+    public EjbJar wrongUsage() throws OpenEJBException {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
+        ejbJar.addEnterpriseBean(new StatefulBean(FooStateful.class));
+        return ejbJar;
+    }
+
+    @Resource
+    private static class FooStateless {
+        @Resource
+        EntityManagerFactory emf;
+        @Resource
+        EntityManager em;
+    }
+
+    @Resource
+    private static class FooStateful {
+        @Resource
+        EntityManagerFactory emf;
+        @Resource
+        EntityManager em;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationRunner.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationRunner.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationRunner.java
index d07cf52a..7b2d4ee 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationRunner.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationRunner.java
@@ -1,88 +1,88 @@
-/**
- * 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.config.rules;
-
-import org.junit.Test;
-import org.junit.internal.runners.model.ReflectiveCallable;
-import org.junit.internal.runners.statements.Fail;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
-
-import java.util.List;
-
-/**
- * This class is created specifically to write tests which test OpenEjb validation code. Specifically, it is used to check the usage of keys defined in
- * org.apache.openejb.config.rules.Messages.properties. To use this runner, simply annotate your test case with @RunWith(ValidationRunner.class). Here are some things to keep in
- * mind when writing tests: 1. A test method needs to be annotated with org.apache.openejb.config.rules.Keys instead of the org.junit.Test 2. Any usage of the @Test annotation will
- * be ignored 3. If the @Keys and @Test annotation are used together on a test method, then the TestCase will error out 4. Every test method should create a EjbJar and return it
- * from the method. It should list the keys being tested in the @Keys annotation 5. The runner will invoke the test method and use the Assembler and ConfigurationFactory to create
- * the application 6. This will kick off validation and this Runner will catch ValidationFailureException and make sure that all the keys specified in the @Keys annotation show up
- * in the ValidationFailureException 7. If the keys listed in the @Keys annotation match the keys found in the ValidationFailureException, the test passes, else the test fails. 8.
- * This Runner also validates that the keys specified in the @Keys annotation are also available in the org.apache.openejb.config.rules.Messages.properties file. If the key is not
- * found, then the Runner throws and exception resulting in your test case not being allowed to run. Sometimes you want to write a test where you do not want any
- * ValidationFailureException to be thrown, in those scenarios, simply annotate your test with @Keys and do not specify any @Key in it
- */
-public class ValidationRunner extends BlockJUnit4ClassRunner {
-    public ValidationRunner(final Class<?> klass) throws InitializationError {
-        super(klass);
-    }
-
-    /**
-     * Flags an error if you have annotated a test with both @Test and @Keys. Any method annotated with @Test will be ignored anyways.
-     */
-    @Override
-    protected void collectInitializationErrors(final List<Throwable> errors) {
-        super.collectInitializationErrors(errors);
-        final List<FrameworkMethod> methodsAnnotatedWithKeys = getTestClass().getAnnotatedMethods(Keys.class);
-        for (final FrameworkMethod frameworkMethod : methodsAnnotatedWithKeys) {
-            if (frameworkMethod.getAnnotation(Test.class) != null) {
-                final String gripe = "The method " + frameworkMethod.getName() + "() can only be annotated with @Keys";
-                errors.add(new Exception(gripe));
-            }
-        }
-    }
-
-    @Override
-    protected Statement methodBlock(final FrameworkMethod method) {
-        final Object test;
-        try {
-            test = new ReflectiveCallable() {
-                @Override
-                protected Object runReflectiveCall() throws Throwable {
-                    return createTest();
-                }
-            }.run();
-        } catch (final Throwable e) {
-            return new Fail(e);
-        }
-        Statement statement = new InvokeMethod(method, test);
-        statement = withBefores(method, test, statement);
-        statement = withAfters(method, test, statement);
-        return statement;
-    }
-
-    /**
-     * By default JUnit includes all methods annotated with @Test. This method only allows methods annotated with @Keys to be included in the list of methods to be run in a
-     * TestCase. Any @Test methods will be ignored
-     */
-    @Override
-    protected List<FrameworkMethod> computeTestMethods() {
-        return getTestClass().getAnnotatedMethods(Keys.class);
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.junit.Test;
+import org.junit.internal.runners.model.ReflectiveCallable;
+import org.junit.internal.runners.statements.Fail;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+import java.util.List;
+
+/**
+ * This class is created specifically to write tests which test OpenEjb validation code. Specifically, it is used to check the usage of keys defined in
+ * org.apache.openejb.config.rules.Messages.properties. To use this runner, simply annotate your test case with @RunWith(ValidationRunner.class). Here are some things to keep in
+ * mind when writing tests: 1. A test method needs to be annotated with org.apache.openejb.config.rules.Keys instead of the org.junit.Test 2. Any usage of the @Test annotation will
+ * be ignored 3. If the @Keys and @Test annotation are used together on a test method, then the TestCase will error out 4. Every test method should create a EjbJar and return it
+ * from the method. It should list the keys being tested in the @Keys annotation 5. The runner will invoke the test method and use the Assembler and ConfigurationFactory to create
+ * the application 6. This will kick off validation and this Runner will catch ValidationFailureException and make sure that all the keys specified in the @Keys annotation show up
+ * in the ValidationFailureException 7. If the keys listed in the @Keys annotation match the keys found in the ValidationFailureException, the test passes, else the test fails. 8.
+ * This Runner also validates that the keys specified in the @Keys annotation are also available in the org.apache.openejb.config.rules.Messages.properties file. If the key is not
+ * found, then the Runner throws and exception resulting in your test case not being allowed to run. Sometimes you want to write a test where you do not want any
+ * ValidationFailureException to be thrown, in those scenarios, simply annotate your test with @Keys and do not specify any @Key in it
+ */
+public class ValidationRunner extends BlockJUnit4ClassRunner {
+    public ValidationRunner(final Class<?> klass) throws InitializationError {
+        super(klass);
+    }
+
+    /**
+     * Flags an error if you have annotated a test with both @Test and @Keys. Any method annotated with @Test will be ignored anyways.
+     */
+    @Override
+    protected void collectInitializationErrors(final List<Throwable> errors) {
+        super.collectInitializationErrors(errors);
+        final List<FrameworkMethod> methodsAnnotatedWithKeys = getTestClass().getAnnotatedMethods(Keys.class);
+        for (final FrameworkMethod frameworkMethod : methodsAnnotatedWithKeys) {
+            if (frameworkMethod.getAnnotation(Test.class) != null) {
+                final String gripe = "The method " + frameworkMethod.getName() + "() can only be annotated with @Keys";
+                errors.add(new Exception(gripe));
+            }
+        }
+    }
+
+    @Override
+    protected Statement methodBlock(final FrameworkMethod method) {
+        final Object test;
+        try {
+            test = new ReflectiveCallable() {
+                @Override
+                protected Object runReflectiveCall() throws Throwable {
+                    return createTest();
+                }
+            }.run();
+        } catch (final Throwable e) {
+            return new Fail(e);
+        }
+        Statement statement = new InvokeMethod(method, test);
+        statement = withBefores(method, test, statement);
+        statement = withAfters(method, test, statement);
+        return statement;
+    }
+
+    /**
+     * By default JUnit includes all methods annotated with @Test. This method only allows methods annotated with @Keys to be included in the list of methods to be run in a
+     * TestCase. Any @Test methods will be ignored
+     */
+    @Override
+    protected List<FrameworkMethod> computeTestMethods() {
+        return getTestClass().getAnnotatedMethods(Keys.class);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/core/security/PermitAllWithDenyAllOnClassTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/security/PermitAllWithDenyAllOnClassTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/security/PermitAllWithDenyAllOnClassTest.java
index 9bd27e2..c37baf7 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/security/PermitAllWithDenyAllOnClassTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/security/PermitAllWithDenyAllOnClassTest.java
@@ -1,88 +1,88 @@
-/**
- * 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.core.security;
-
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Module;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.PermitAll;
-import javax.ejb.EJB;
-import javax.ejb.EJBAccessException;
-import javax.ejb.Singleton;
-
-@RunWith(ApplicationComposer.class)
-public class PermitAllWithDenyAllOnClassTest {
-    @Module
-    public Class<?>[] beans() {
-        return new Class<?>[]{DenyAllow.class, AllowDeny.class};
-    }
-
-    @EJB
-    private DenyAllow denyAllow;
-
-    @EJB
-    private AllowDeny allowDeny;
-
-    @Test
-    public void allowed() {
-        denyAllow.allowed();
-    }
-
-    @Test(expected = EJBAccessException.class)
-    public void forbidden() {
-        denyAllow.forbidden();
-    }
-
-    @Test
-    public void allowed2() {
-        allowDeny.allowed();
-    }
-
-    @Test(expected = EJBAccessException.class)
-    public void forbidden2() {
-        allowDeny.forbidden();
-    }
-
-    @Singleton
-    @DenyAll
-    public static class DenyAllow {
-        @PermitAll
-        public void allowed() {
-            // no-op
-        }
-
-        public void forbidden() {
-            // no-op
-        }
-    }
-
-    @Singleton
-    @PermitAll
-    public static class AllowDeny {
-        public void allowed() {
-            // no-op
-        }
-
-        @DenyAll
-        public void forbidden() {
-            // no-op
-        }
-    }
-}
+/**
+ * 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.core.security;
+
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Module;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.PermitAll;
+import javax.ejb.EJB;
+import javax.ejb.EJBAccessException;
+import javax.ejb.Singleton;
+
+@RunWith(ApplicationComposer.class)
+public class PermitAllWithDenyAllOnClassTest {
+    @Module
+    public Class<?>[] beans() {
+        return new Class<?>[]{DenyAllow.class, AllowDeny.class};
+    }
+
+    @EJB
+    private DenyAllow denyAllow;
+
+    @EJB
+    private AllowDeny allowDeny;
+
+    @Test
+    public void allowed() {
+        denyAllow.allowed();
+    }
+
+    @Test(expected = EJBAccessException.class)
+    public void forbidden() {
+        denyAllow.forbidden();
+    }
+
+    @Test
+    public void allowed2() {
+        allowDeny.allowed();
+    }
+
+    @Test(expected = EJBAccessException.class)
+    public void forbidden2() {
+        allowDeny.forbidden();
+    }
+
+    @Singleton
+    @DenyAll
+    public static class DenyAllow {
+        @PermitAll
+        public void allowed() {
+            // no-op
+        }
+
+        public void forbidden() {
+            // no-op
+        }
+    }
+
+    @Singleton
+    @PermitAll
+    public static class AllowDeny {
+        public void allowed() {
+            // no-op
+        }
+
+        @DenyAll
+        public void forbidden() {
+            // no-op
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/jpa/JTAPuAndBmtTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/jpa/JTAPuAndBmtTest.java b/container/openejb-core/src/test/java/org/apache/openejb/jpa/JTAPuAndBmtTest.java
index cb03686..121c966 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/jpa/JTAPuAndBmtTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/jpa/JTAPuAndBmtTest.java
@@ -1,154 +1,154 @@
-/*
- * 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.jpa;
-
-import org.apache.openejb.jee.Empty;
-import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.jee.jpa.unit.Persistence;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Configuration;
-import org.apache.openejb.testing.Module;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import java.util.Properties;
-
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(ApplicationComposer.class)
-public class JTAPuAndBmtTest {
-    @EJB
-    private BmtManager bmtManager;
-
-    @Configuration
-    public Properties config() {
-        final Properties p = new Properties();
-        p.put("JTAPuAndBmtTest", "new://Resource?type=DataSource");
-        p.put("JTAPuAndBmtTest.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("JTAPuAndBmtTest.JdbcUrl", "jdbc:hsqldb:mem:bval");
-        return p;
-    }
-
-    @Module
-    public StatelessBean app() throws Exception {
-        final StatelessBean bean = new StatelessBean(BmtManager.class);
-        bean.setLocalBean(new Empty());
-        return bean;
-    }
-
-    @Module
-    public Persistence persistence() {
-        final PersistenceUnit unit = new PersistenceUnit("foo-unit");
-        unit.addClass(TheEntity.class);
-        unit.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
-        unit.getProperties().setProperty("openjpa.RuntimeUnenhancedClasses", "supported");
-        unit.setExcludeUnlistedClasses(true);
-
-        final Persistence persistence = new Persistence(unit);
-        persistence.setVersion("2.0");
-        return persistence;
-    }
-
-    @LocalBean
-    @Stateless
-    @TransactionManagement(TransactionManagementType.BEAN)
-    public static class BmtManager {
-        @PersistenceContext
-        private EntityManager em;
-
-        @Resource
-        private EJBContext ctx;
-
-        public TheEntity persist() {
-            try {
-                ctx.getUserTransaction().begin();
-                final TheEntity entity = new TheEntity();
-                entity.setName("name");
-                em.persist(entity);
-                ctx.getUserTransaction().commit();
-                return entity;
-            } catch (final Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        public TheEntity findWithJpQl() {
-            final TypedQuery<TheEntity> query = em.createQuery("select e from JTAPuAndBmtTest$TheEntity e", TheEntity.class);
-            query.getResultList(); // to ensure we don't break OPENEJB-1443
-            return query.getResultList().iterator().next();
-        }
-
-        public void update(final TheEntity entity) {
-            entity.setName("new");
-            try {
-                ctx.getUserTransaction().begin();
-                em.merge(entity);
-                ctx.getUserTransaction().commit();
-            } catch (final Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    @Entity
-    public static class TheEntity {
-        @Id
-        @GeneratedValue
-        private long id;
-        private String name;
-
-        public long getId() {
-            return id;
-        }
-
-        public void setId(final long i) {
-            id = i;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(final String n) {
-            name = n;
-        }
-    }
-
-    @Test
-    public void valid() {
-        assertNotNull(bmtManager.persist());
-
-        final TheEntity entity = bmtManager.findWithJpQl();
-        assertNotNull(entity);
-
-        bmtManager.update(entity); // will throw an exception if any error
-    }
-}
+/*
+ * 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.jpa;
+
+import org.apache.openejb.jee.Empty;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.ejb.EJBContext;
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import java.util.Properties;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(ApplicationComposer.class)
+public class JTAPuAndBmtTest {
+    @EJB
+    private BmtManager bmtManager;
+
+    @Configuration
+    public Properties config() {
+        final Properties p = new Properties();
+        p.put("JTAPuAndBmtTest", "new://Resource?type=DataSource");
+        p.put("JTAPuAndBmtTest.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("JTAPuAndBmtTest.JdbcUrl", "jdbc:hsqldb:mem:bval");
+        return p;
+    }
+
+    @Module
+    public StatelessBean app() throws Exception {
+        final StatelessBean bean = new StatelessBean(BmtManager.class);
+        bean.setLocalBean(new Empty());
+        return bean;
+    }
+
+    @Module
+    public Persistence persistence() {
+        final PersistenceUnit unit = new PersistenceUnit("foo-unit");
+        unit.addClass(TheEntity.class);
+        unit.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
+        unit.getProperties().setProperty("openjpa.RuntimeUnenhancedClasses", "supported");
+        unit.setExcludeUnlistedClasses(true);
+
+        final Persistence persistence = new Persistence(unit);
+        persistence.setVersion("2.0");
+        return persistence;
+    }
+
+    @LocalBean
+    @Stateless
+    @TransactionManagement(TransactionManagementType.BEAN)
+    public static class BmtManager {
+        @PersistenceContext
+        private EntityManager em;
+
+        @Resource
+        private EJBContext ctx;
+
+        public TheEntity persist() {
+            try {
+                ctx.getUserTransaction().begin();
+                final TheEntity entity = new TheEntity();
+                entity.setName("name");
+                em.persist(entity);
+                ctx.getUserTransaction().commit();
+                return entity;
+            } catch (final Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        public TheEntity findWithJpQl() {
+            final TypedQuery<TheEntity> query = em.createQuery("select e from JTAPuAndBmtTest$TheEntity e", TheEntity.class);
+            query.getResultList(); // to ensure we don't break OPENEJB-1443
+            return query.getResultList().iterator().next();
+        }
+
+        public void update(final TheEntity entity) {
+            entity.setName("new");
+            try {
+                ctx.getUserTransaction().begin();
+                em.merge(entity);
+                ctx.getUserTransaction().commit();
+            } catch (final Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @Entity
+    public static class TheEntity {
+        @Id
+        @GeneratedValue
+        private long id;
+        private String name;
+
+        public long getId() {
+            return id;
+        }
+
+        public void setId(final long i) {
+            id = i;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(final String n) {
+            name = n;
+        }
+    }
+
+    @Test
+    public void valid() {
+        assertNotNull(bmtManager.persist());
+
+        final TheEntity entity = bmtManager.findWithJpQl();
+        assertNotNull(entity);
+
+        bmtManager.update(entity); // will throw an exception if any error
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java b/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java
index 3b66dfb..9f6aea7 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java
@@ -1,82 +1,82 @@
-/**
- * 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.junit;
-
-import org.apache.openejb.jee.SessionBean;
-import org.apache.openejb.jee.SingletonBean;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.Singleton;
-import javax.inject.Inject;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test for https://issues.apache.org/jira/browse/OPENEJB-2014
- *
- * @version $Rev$ $Date$
- */
-@RunWith(ApplicationComposer.class)
-public class PreDestroyTest {
-
-    private static final AtomicBoolean isConstructed = new AtomicBoolean(false);
-    private static final AtomicBoolean isDestroyed = new AtomicBoolean(false);
-
-    @Inject
-    private TestMe testMe;
-
-    @AfterClass
-    public static void onAfterClass() {
-        assertTrue("onPostConstruct was not called", isConstructed.get());
-        assertTrue("onPreDestroy was not called", isDestroyed.get());
-    }
-
-    @org.apache.openejb.testing.Module
-    public SessionBean getEjbs() {
-        return new SingletonBean(TestMe.class);
-    }
-
-    @Test
-    public void testLifecycle() {
-        this.testMe.noOp();
-    }
-
-    @Singleton
-    public static class TestMe {
-
-        @PostConstruct
-        public void onPostConstruct() {
-            isConstructed.set(true);
-        }
-
-        @PreDestroy
-        public void onPreDestroy() {
-            isDestroyed.set(true);
-        }
-
-        public void noOp() {
-            //no-op
-        }
-
-    }
-
-}
+/**
+ * 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.junit;
+
+import org.apache.openejb.jee.SessionBean;
+import org.apache.openejb.jee.SingletonBean;
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test for https://issues.apache.org/jira/browse/OPENEJB-2014
+ *
+ * @version $Rev$ $Date$
+ */
+@RunWith(ApplicationComposer.class)
+public class PreDestroyTest {
+
+    private static final AtomicBoolean isConstructed = new AtomicBoolean(false);
+    private static final AtomicBoolean isDestroyed = new AtomicBoolean(false);
+
+    @Inject
+    private TestMe testMe;
+
+    @AfterClass
+    public static void onAfterClass() {
+        assertTrue("onPostConstruct was not called", isConstructed.get());
+        assertTrue("onPreDestroy was not called", isDestroyed.get());
+    }
+
+    @org.apache.openejb.testing.Module
+    public SessionBean getEjbs() {
+        return new SingletonBean(TestMe.class);
+    }
+
+    @Test
+    public void testLifecycle() {
+        this.testMe.noOp();
+    }
+
+    @Singleton
+    public static class TestMe {
+
+        @PostConstruct
+        public void onPostConstruct() {
+            isConstructed.set(true);
+        }
+
+        @PreDestroy
+        public void onPreDestroy() {
+            isDestroyed.set(true);
+        }
+
+        public void noOp() {
+            //no-op
+        }
+
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/resource/URLAsResourceTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/URLAsResourceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/URLAsResourceTest.java
index dda0eed..d63518d 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/URLAsResourceTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/URLAsResourceTest.java
@@ -1,71 +1,71 @@
-/*
- * 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.resource;
-
-import org.apache.openejb.jee.EnterpriseBean;
-import org.apache.openejb.jee.SingletonBean;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Configuration;
-import org.apache.openejb.testing.Module;
-import org.apache.openejb.testng.PropertiesBuilder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import java.net.URL;
-import java.util.Properties;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(ApplicationComposer.class)
-public class URLAsResourceTest {
-    @Configuration
-    public Properties config() {
-        return new PropertiesBuilder()
-            .p("url", "new://Resource?class-name=java.net.URL&constructor=value")
-            .p("url.value", "http://tomee.apache.org")
-            .build();
-    }
-
-    @Module
-    public EnterpriseBean bean() {
-        return new SingletonBean(WithUrl.class).localBean();
-    }
-
-    @EJB
-    private WithUrl withUrl;
-
-    @Test
-    public void url() {
-        final URL url = withUrl.getUrl();
-        assertNotNull(url);
-        assertEquals("http://tomee.apache.org", url.toExternalForm());
-    }
-
-    @Singleton
-    public static class WithUrl {
-        @Resource(name = "url")
-        private URL url;
-
-        public URL getUrl() {
-            return url;
-        }
-    }
-}
+/*
+ * 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.resource;
+
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.SingletonBean;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.ejb.Singleton;
+import java.net.URL;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(ApplicationComposer.class)
+public class URLAsResourceTest {
+    @Configuration
+    public Properties config() {
+        return new PropertiesBuilder()
+            .p("url", "new://Resource?class-name=java.net.URL&constructor=value")
+            .p("url.value", "http://tomee.apache.org")
+            .build();
+    }
+
+    @Module
+    public EnterpriseBean bean() {
+        return new SingletonBean(WithUrl.class).localBean();
+    }
+
+    @EJB
+    private WithUrl withUrl;
+
+    @Test
+    public void url() {
+        final URL url = withUrl.getUrl();
+        assertNotNull(url);
+        assertEquals("http://tomee.apache.org", url.toExternalForm());
+    }
+
+    @Singleton
+    public static class WithUrl {
+        @Resource(name = "url")
+        private URL url;
+
+        public URL getUrl() {
+            return url;
+        }
+    }
+}


[40/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java
index ea3671b..90bd2b9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java
@@ -1,393 +1,393 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 The message-destination-ref element contains a declaration of
- * Deployment Component's reference to a message destination associated
- * with a resource in Deployment Component's environment. It consists of:
- * <p/>
- * - an optional description - the message destination reference name -
- * the message destination type - a specification as to whether the
- * destination is used for consuming or producing messages, or both - a
- * link to the message destination
- * <p/>
- * Examples:
- * <p/>
- * <p/>
- * <pre>
- * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;message-destination-ref xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;message-destination-ref-name&gt;
- *
- * 						jms/StockQueue
- *
- * 					&lt;/message-destination-ref-name&gt;&lt;message-destination-type&gt;
- *
- * 						javax.jms.Queue
- *
- * 					&lt;/message-destination-type&gt;&lt;message-destination-usage&gt;
- *
- * 						Consumes
- *
- * 					&lt;/message-destination-usage&gt;&lt;message-destination-link&gt;
- *
- * 						CorporateStocks
- *
- * 					&lt;/message-destination-link&gt;
- *
- * 				&lt;/message-destination-ref&gt;
- * </pre>
- * <p/>
- * <p/>
- * <p/>
- * <p/>
- * Java class for MessageDestinationRef complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MessageDestinationRef">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="usage" type="{common.xmi}MessageDestinationUsageType" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageDestinationRef", propOrder = {"descriptions",
-    "extensions"})
-public class MessageDestinationRef {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String link;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute(name = "type")
-    protected String messageDestinationRefTypeString;
-    @XmlAttribute
-    protected MessageDestinationUsageEnum usage;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the link property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLink() {
-        return link;
-    }
-
-    /**
-     * Sets the value of the link property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLink(final String value) {
-        this.link = 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 messageDestinationRefTypeString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getMessageDestinationRefTypeString() {
-        return messageDestinationRefTypeString;
-    }
-
-    /**
-     * Sets the value of the messageDestinationRefTypeString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setMessageDestinationRefTypeString(final String value) {
-        this.messageDestinationRefTypeString = value;
-    }
-
-    /**
-     * Gets the value of the usage property.
-     *
-     * @return possible object is {@link MessageDestinationUsageEnum }
-     */
-    public MessageDestinationUsageEnum getUsage() {
-        return usage;
-    }
-
-    /**
-     * Sets the value of the usage property.
-     *
-     * @param value allowed object is {@link MessageDestinationUsageEnum }
-     */
-    public void setUsage(final MessageDestinationUsageEnum value) {
-        this.usage = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 The message-destination-ref element contains a declaration of
+ * Deployment Component's reference to a message destination associated
+ * with a resource in Deployment Component's environment. It consists of:
+ * <p/>
+ * - an optional description - the message destination reference name -
+ * the message destination type - a specification as to whether the
+ * destination is used for consuming or producing messages, or both - a
+ * link to the message destination
+ * <p/>
+ * Examples:
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;message-destination-ref xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;message-destination-ref-name&gt;
+ *
+ * 						jms/StockQueue
+ *
+ * 					&lt;/message-destination-ref-name&gt;&lt;message-destination-type&gt;
+ *
+ * 						javax.jms.Queue
+ *
+ * 					&lt;/message-destination-type&gt;&lt;message-destination-usage&gt;
+ *
+ * 						Consumes
+ *
+ * 					&lt;/message-destination-usage&gt;&lt;message-destination-link&gt;
+ *
+ * 						CorporateStocks
+ *
+ * 					&lt;/message-destination-link&gt;
+ *
+ * 				&lt;/message-destination-ref&gt;
+ * </pre>
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for MessageDestinationRef complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MessageDestinationRef">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="usage" type="{common.xmi}MessageDestinationUsageType" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageDestinationRef", propOrder = {"descriptions",
+    "extensions"})
+public class MessageDestinationRef {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String link;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute(name = "type")
+    protected String messageDestinationRefTypeString;
+    @XmlAttribute
+    protected MessageDestinationUsageEnum usage;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the link property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLink() {
+        return link;
+    }
+
+    /**
+     * Sets the value of the link property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLink(final String value) {
+        this.link = 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 messageDestinationRefTypeString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getMessageDestinationRefTypeString() {
+        return messageDestinationRefTypeString;
+    }
+
+    /**
+     * Sets the value of the messageDestinationRefTypeString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setMessageDestinationRefTypeString(final String value) {
+        this.messageDestinationRefTypeString = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     *
+     * @return possible object is {@link MessageDestinationUsageEnum }
+     */
+    public MessageDestinationUsageEnum getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     *
+     * @param value allowed object is {@link MessageDestinationUsageEnum }
+     */
+    public void setUsage(final MessageDestinationUsageEnum value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationUsageEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationUsageEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationUsageEnum.java
index d94e3ab..ac24dc4 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationUsageEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationUsageEnum.java
@@ -1,68 +1,68 @@
-/**
- * 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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for MessageDestinationUsageType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="MessageDestinationUsageType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Consumes"/>
- *     &lt;enumeration value="Produces"/>
- *     &lt;enumeration value="ConsumesProduces"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum MessageDestinationUsageEnum {
-
-    @XmlEnumValue("Consumes")
-    CONSUMES("Consumes"), @XmlEnumValue("Produces")
-    PRODUCES("Produces"), @XmlEnumValue("ConsumesProduces")
-    CONSUMES_PRODUCES("ConsumesProduces");
-    private final String value;
-
-    MessageDestinationUsageEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static MessageDestinationUsageEnum fromValue(final String v) {
-        for (final MessageDestinationUsageEnum c : MessageDestinationUsageEnum
-            .values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for MessageDestinationUsageType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="MessageDestinationUsageType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Consumes"/>
+ *     &lt;enumeration value="Produces"/>
+ *     &lt;enumeration value="ConsumesProduces"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum MessageDestinationUsageEnum {
+
+    @XmlEnumValue("Consumes")
+    CONSUMES("Consumes"), @XmlEnumValue("Produces")
+    PRODUCES("Produces"), @XmlEnumValue("ConsumesProduces")
+    CONSUMES_PRODUCES("ConsumesProduces");
+    private final String value;
+
+    MessageDestinationUsageEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static MessageDestinationUsageEnum fromValue(final String v) {
+        for (final MessageDestinationUsageEnum c : MessageDestinationUsageEnum
+            .values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java
index 2e0c6b1..fe362b4 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java
@@ -1,475 +1,475 @@
-/**
- * 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.was.v6.common;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the org.apache.openejb.jee.was.v6.common
- * package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static javax.xml.namespace.QName _QName_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "QName");
-    private final static javax.xml.namespace.QName _Listener_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "Listener");
-    private final static javax.xml.namespace.QName _SecurityRoleRef_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "SecurityRoleRef");
-    private final static javax.xml.namespace.QName _Identity_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "Identity");
-    private final static javax.xml.namespace.QName _Description_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "Description");
-    private final static javax.xml.namespace.QName _EnvEntry_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "EnvEntry");
-    private final static javax.xml.namespace.QName _DisplayName_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "DisplayName");
-    private final static javax.xml.namespace.QName _ResourceEnvRef_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "ResourceEnvRef");
-    private final static javax.xml.namespace.QName _DescriptionGroup_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "DescriptionGroup");
-    private final static javax.xml.namespace.QName _SecurityIdentity_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "SecurityIdentity");
-    private final static javax.xml.namespace.QName _RunAsSpecifiedIdentity_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "RunAsSpecifiedIdentity");
-    private final static javax.xml.namespace.QName _IconType_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "IconType");
-    private final static javax.xml.namespace.QName _UseCallerIdentity_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "UseCallerIdentity");
-    private final static javax.xml.namespace.QName _MessageDestination_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "MessageDestination");
-    private final static javax.xml.namespace.QName _MessageDestinationRef_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "MessageDestinationRef");
-    private final static javax.xml.namespace.QName _CompatibilityDescriptionGroup_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "CompatibilityDescriptionGroup");
-    private final static javax.xml.namespace.QName _ResourceRef_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "ResourceRef");
-    private final static javax.xml.namespace.QName _ParamValue_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "ParamValue");
-    private final static javax.xml.namespace.QName _EjbRef_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "EjbRef");
-    private final static javax.xml.namespace.QName _EJBLocalRef_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "EJBLocalRef");
-    private final static javax.xml.namespace.QName _SecurityRole_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "SecurityRole");
-    private final static javax.xml.namespace.QName _JNDIEnvRefsGroup_QNAME = new javax.xml.namespace.QName(
-        "common.xmi", "JNDIEnvRefsGroup");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package: org.apache.openejb.jee.was.v6.common
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link EJBLocalRef }
-     */
-    public EJBLocalRef createEJBLocalRef() {
-        return new EJBLocalRef();
-    }
-
-    /**
-     * Create an instance of {@link SecurityRole }
-     */
-    public SecurityRole createSecurityRole() {
-        return new SecurityRole();
-    }
-
-    /**
-     * Create an instance of {@link ResourceRef }
-     */
-    public ResourceRef createResourceRef() {
-        return new ResourceRef();
-    }
-
-    /**
-     * Create an instance of {@link ResourceEnvRef }
-     */
-    public ResourceEnvRef createResourceEnvRef() {
-        return new ResourceEnvRef();
-    }
-
-    /**
-     * Create an instance of {@link ParamValue }
-     */
-    public ParamValue createParamValue() {
-        return new ParamValue();
-    }
-
-    /**
-     * Create an instance of {@link DisplayName }
-     */
-    public DisplayName createDisplayName() {
-        return new DisplayName();
-    }
-
-    /**
-     * Create an instance of {@link CompatibilityDescriptionGroup }
-     */
-    public CompatibilityDescriptionGroup createCompatibilityDescriptionGroup() {
-        return new CompatibilityDescriptionGroup();
-    }
-
-    /**
-     * Create an instance of {@link Identity }
-     */
-    public Identity createIdentity() {
-        return new Identity();
-    }
-
-    /**
-     * Create an instance of {@link SecurityRoleRef }
-     */
-    public SecurityRoleRef createSecurityRoleRef() {
-        return new SecurityRoleRef();
-    }
-
-    /**
-     * Create an instance of {@link IconType }
-     */
-    public IconType createIconType() {
-        return new IconType();
-    }
-
-    /**
-     * Create an instance of {@link SecurityIdentity }
-     */
-    public SecurityIdentity createSecurityIdentity() {
-        return new SecurityIdentity();
-    }
-
-    /**
-     * Create an instance of {@link UseCallerIdentity }
-     */
-    public UseCallerIdentity createUseCallerIdentity() {
-        return new UseCallerIdentity();
-    }
-
-    /**
-     * Create an instance of {@link MessageDestinationRef }
-     */
-    public MessageDestinationRef createMessageDestinationRef() {
-        return new MessageDestinationRef();
-    }
-
-    /**
-     * Create an instance of {@link org.apache.openejb.jee.was.v6.common.QName }
-     */
-    public org.apache.openejb.jee.was.v6.common.QName createQName() {
-        return new org.apache.openejb.jee.was.v6.common.QName();
-    }
-
-    /**
-     * Create an instance of {@link MessageDestination }
-     */
-    public MessageDestination createMessageDestination() {
-        return new MessageDestination();
-    }
-
-    /**
-     * Create an instance of {@link EjbRef }
-     */
-    public EjbRef createEjbRef() {
-        return new EjbRef();
-    }
-
-    /**
-     * Create an instance of {@link Description }
-     */
-    public Description createDescription() {
-        return new Description();
-    }
-
-    /**
-     * Create an instance of {@link JNDIEnvRefsGroup }
-     */
-    public JNDIEnvRefsGroup createJNDIEnvRefsGroup() {
-        return new JNDIEnvRefsGroup();
-    }
-
-    /**
-     * Create an instance of {@link EnvEntry }
-     */
-    public EnvEntry createEnvEntry() {
-        return new EnvEntry();
-    }
-
-    /**
-     * Create an instance of {@link RunAsSpecifiedIdentity }
-     */
-    public RunAsSpecifiedIdentity createRunAsSpecifiedIdentity() {
-        return new RunAsSpecifiedIdentity();
-    }
-
-    /**
-     * Create an instance of {@link Listener }
-     */
-    public Listener createListener() {
-        return new Listener();
-    }
-
-    /**
-     * Create an instance of {@link DescriptionGroup }
-     */
-    public DescriptionGroup createDescriptionGroup() {
-        return new DescriptionGroup();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link org.apache.openejb.jee.was.v6.common.QName }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "QName")
-    public JAXBElement<org.apache.openejb.jee.was.v6.common.QName> createQName(
-        final org.apache.openejb.jee.was.v6.common.QName value) {
-        return new JAXBElement<org.apache.openejb.jee.was.v6.common.QName>(
-            _QName_QNAME, org.apache.openejb.jee.was.v6.common.QName.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Listener }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "Listener")
-    public JAXBElement<Listener> createListener(final Listener value) {
-        return new JAXBElement<Listener>(_Listener_QNAME, Listener.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityRoleRef }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "SecurityRoleRef")
-    public JAXBElement<SecurityRoleRef> createSecurityRoleRef(
-        final SecurityRoleRef value) {
-        return new JAXBElement<SecurityRoleRef>(_SecurityRoleRef_QNAME,
-            SecurityRoleRef.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Identity }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "Identity")
-    public JAXBElement<Identity> createIdentity(final Identity value) {
-        return new JAXBElement<Identity>(_Identity_QNAME, Identity.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Description }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "Description")
-    public JAXBElement<Description> createDescription(final Description value) {
-        return new JAXBElement<Description>(_Description_QNAME,
-            Description.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnvEntry }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "EnvEntry")
-    public JAXBElement<EnvEntry> createEnvEntry(final EnvEntry value) {
-        return new JAXBElement<EnvEntry>(_EnvEntry_QNAME, EnvEntry.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DisplayName }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "DisplayName")
-    public JAXBElement<DisplayName> createDisplayName(final DisplayName value) {
-        return new JAXBElement<DisplayName>(_DisplayName_QNAME,
-            DisplayName.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceEnvRef }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "ResourceEnvRef")
-    public JAXBElement<ResourceEnvRef> createResourceEnvRef(final ResourceEnvRef value) {
-        return new JAXBElement<ResourceEnvRef>(_ResourceEnvRef_QNAME,
-            ResourceEnvRef.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link DescriptionGroup }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "DescriptionGroup")
-    public JAXBElement<DescriptionGroup> createDescriptionGroup(
-        final DescriptionGroup value) {
-        return new JAXBElement<DescriptionGroup>(_DescriptionGroup_QNAME,
-            DescriptionGroup.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link SecurityIdentity }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "SecurityIdentity")
-    public JAXBElement<SecurityIdentity> createSecurityIdentity(
-        final SecurityIdentity value) {
-        return new JAXBElement<SecurityIdentity>(_SecurityIdentity_QNAME,
-            SecurityIdentity.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link RunAsSpecifiedIdentity }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "RunAsSpecifiedIdentity")
-    public JAXBElement<RunAsSpecifiedIdentity> createRunAsSpecifiedIdentity(
-        final RunAsSpecifiedIdentity value) {
-        return new JAXBElement<RunAsSpecifiedIdentity>(
-            _RunAsSpecifiedIdentity_QNAME, RunAsSpecifiedIdentity.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IconType }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "IconType")
-    public JAXBElement<IconType> createIconType(final IconType value) {
-        return new JAXBElement<IconType>(_IconType_QNAME, IconType.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link UseCallerIdentity }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "UseCallerIdentity")
-    public JAXBElement<UseCallerIdentity> createUseCallerIdentity(
-        final UseCallerIdentity value) {
-        return new JAXBElement<UseCallerIdentity>(_UseCallerIdentity_QNAME,
-            UseCallerIdentity.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link MessageDestination }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "MessageDestination")
-    public JAXBElement<MessageDestination> createMessageDestination(
-        final MessageDestination value) {
-        return new JAXBElement<MessageDestination>(_MessageDestination_QNAME,
-            MessageDestination.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link MessageDestinationRef }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "MessageDestinationRef")
-    public JAXBElement<MessageDestinationRef> createMessageDestinationRef(
-        final MessageDestinationRef value) {
-        return new JAXBElement<MessageDestinationRef>(
-            _MessageDestinationRef_QNAME, MessageDestinationRef.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link CompatibilityDescriptionGroup }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "CompatibilityDescriptionGroup")
-    public JAXBElement<CompatibilityDescriptionGroup> createCompatibilityDescriptionGroup(
-        final CompatibilityDescriptionGroup value) {
-        return new JAXBElement<CompatibilityDescriptionGroup>(
-            _CompatibilityDescriptionGroup_QNAME,
-            CompatibilityDescriptionGroup.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceRef }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "ResourceRef")
-    public JAXBElement<ResourceRef> createResourceRef(final ResourceRef value) {
-        return new JAXBElement<ResourceRef>(_ResourceRef_QNAME,
-            ResourceRef.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ParamValue }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "ParamValue")
-    public JAXBElement<ParamValue> createParamValue(final ParamValue value) {
-        return new JAXBElement<ParamValue>(_ParamValue_QNAME, ParamValue.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EjbRef }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "EjbRef")
-    public JAXBElement<EjbRef> createEjbRef(final EjbRef value) {
-        return new JAXBElement<EjbRef>(_EjbRef_QNAME, EjbRef.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EJBLocalRef }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "EJBLocalRef")
-    public JAXBElement<EJBLocalRef> createEJBLocalRef(final EJBLocalRef value) {
-        return new JAXBElement<EJBLocalRef>(_EJBLocalRef_QNAME,
-            EJBLocalRef.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityRole }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "SecurityRole")
-    public JAXBElement<SecurityRole> createSecurityRole(final SecurityRole value) {
-        return new JAXBElement<SecurityRole>(_SecurityRole_QNAME,
-            SecurityRole.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link JNDIEnvRefsGroup }{@code >}
-     */
-    @XmlElementDecl(namespace = "common.xmi", name = "JNDIEnvRefsGroup")
-    public JAXBElement<JNDIEnvRefsGroup> createJNDIEnvRefsGroup(
-        final JNDIEnvRefsGroup value) {
-        return new JAXBElement<JNDIEnvRefsGroup>(_JNDIEnvRefsGroup_QNAME,
-            JNDIEnvRefsGroup.class, null, 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.was.v6.common;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the org.apache.openejb.jee.was.v6.common
+ * package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static javax.xml.namespace.QName _QName_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "QName");
+    private final static javax.xml.namespace.QName _Listener_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "Listener");
+    private final static javax.xml.namespace.QName _SecurityRoleRef_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "SecurityRoleRef");
+    private final static javax.xml.namespace.QName _Identity_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "Identity");
+    private final static javax.xml.namespace.QName _Description_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "Description");
+    private final static javax.xml.namespace.QName _EnvEntry_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "EnvEntry");
+    private final static javax.xml.namespace.QName _DisplayName_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "DisplayName");
+    private final static javax.xml.namespace.QName _ResourceEnvRef_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "ResourceEnvRef");
+    private final static javax.xml.namespace.QName _DescriptionGroup_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "DescriptionGroup");
+    private final static javax.xml.namespace.QName _SecurityIdentity_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "SecurityIdentity");
+    private final static javax.xml.namespace.QName _RunAsSpecifiedIdentity_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "RunAsSpecifiedIdentity");
+    private final static javax.xml.namespace.QName _IconType_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "IconType");
+    private final static javax.xml.namespace.QName _UseCallerIdentity_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "UseCallerIdentity");
+    private final static javax.xml.namespace.QName _MessageDestination_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "MessageDestination");
+    private final static javax.xml.namespace.QName _MessageDestinationRef_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "MessageDestinationRef");
+    private final static javax.xml.namespace.QName _CompatibilityDescriptionGroup_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "CompatibilityDescriptionGroup");
+    private final static javax.xml.namespace.QName _ResourceRef_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "ResourceRef");
+    private final static javax.xml.namespace.QName _ParamValue_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "ParamValue");
+    private final static javax.xml.namespace.QName _EjbRef_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "EjbRef");
+    private final static javax.xml.namespace.QName _EJBLocalRef_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "EJBLocalRef");
+    private final static javax.xml.namespace.QName _SecurityRole_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "SecurityRole");
+    private final static javax.xml.namespace.QName _JNDIEnvRefsGroup_QNAME = new javax.xml.namespace.QName(
+        "common.xmi", "JNDIEnvRefsGroup");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package: org.apache.openejb.jee.was.v6.common
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link EJBLocalRef }
+     */
+    public EJBLocalRef createEJBLocalRef() {
+        return new EJBLocalRef();
+    }
+
+    /**
+     * Create an instance of {@link SecurityRole }
+     */
+    public SecurityRole createSecurityRole() {
+        return new SecurityRole();
+    }
+
+    /**
+     * Create an instance of {@link ResourceRef }
+     */
+    public ResourceRef createResourceRef() {
+        return new ResourceRef();
+    }
+
+    /**
+     * Create an instance of {@link ResourceEnvRef }
+     */
+    public ResourceEnvRef createResourceEnvRef() {
+        return new ResourceEnvRef();
+    }
+
+    /**
+     * Create an instance of {@link ParamValue }
+     */
+    public ParamValue createParamValue() {
+        return new ParamValue();
+    }
+
+    /**
+     * Create an instance of {@link DisplayName }
+     */
+    public DisplayName createDisplayName() {
+        return new DisplayName();
+    }
+
+    /**
+     * Create an instance of {@link CompatibilityDescriptionGroup }
+     */
+    public CompatibilityDescriptionGroup createCompatibilityDescriptionGroup() {
+        return new CompatibilityDescriptionGroup();
+    }
+
+    /**
+     * Create an instance of {@link Identity }
+     */
+    public Identity createIdentity() {
+        return new Identity();
+    }
+
+    /**
+     * Create an instance of {@link SecurityRoleRef }
+     */
+    public SecurityRoleRef createSecurityRoleRef() {
+        return new SecurityRoleRef();
+    }
+
+    /**
+     * Create an instance of {@link IconType }
+     */
+    public IconType createIconType() {
+        return new IconType();
+    }
+
+    /**
+     * Create an instance of {@link SecurityIdentity }
+     */
+    public SecurityIdentity createSecurityIdentity() {
+        return new SecurityIdentity();
+    }
+
+    /**
+     * Create an instance of {@link UseCallerIdentity }
+     */
+    public UseCallerIdentity createUseCallerIdentity() {
+        return new UseCallerIdentity();
+    }
+
+    /**
+     * Create an instance of {@link MessageDestinationRef }
+     */
+    public MessageDestinationRef createMessageDestinationRef() {
+        return new MessageDestinationRef();
+    }
+
+    /**
+     * Create an instance of {@link org.apache.openejb.jee.was.v6.common.QName }
+     */
+    public org.apache.openejb.jee.was.v6.common.QName createQName() {
+        return new org.apache.openejb.jee.was.v6.common.QName();
+    }
+
+    /**
+     * Create an instance of {@link MessageDestination }
+     */
+    public MessageDestination createMessageDestination() {
+        return new MessageDestination();
+    }
+
+    /**
+     * Create an instance of {@link EjbRef }
+     */
+    public EjbRef createEjbRef() {
+        return new EjbRef();
+    }
+
+    /**
+     * Create an instance of {@link Description }
+     */
+    public Description createDescription() {
+        return new Description();
+    }
+
+    /**
+     * Create an instance of {@link JNDIEnvRefsGroup }
+     */
+    public JNDIEnvRefsGroup createJNDIEnvRefsGroup() {
+        return new JNDIEnvRefsGroup();
+    }
+
+    /**
+     * Create an instance of {@link EnvEntry }
+     */
+    public EnvEntry createEnvEntry() {
+        return new EnvEntry();
+    }
+
+    /**
+     * Create an instance of {@link RunAsSpecifiedIdentity }
+     */
+    public RunAsSpecifiedIdentity createRunAsSpecifiedIdentity() {
+        return new RunAsSpecifiedIdentity();
+    }
+
+    /**
+     * Create an instance of {@link Listener }
+     */
+    public Listener createListener() {
+        return new Listener();
+    }
+
+    /**
+     * Create an instance of {@link DescriptionGroup }
+     */
+    public DescriptionGroup createDescriptionGroup() {
+        return new DescriptionGroup();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link org.apache.openejb.jee.was.v6.common.QName }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "QName")
+    public JAXBElement<org.apache.openejb.jee.was.v6.common.QName> createQName(
+        final org.apache.openejb.jee.was.v6.common.QName value) {
+        return new JAXBElement<org.apache.openejb.jee.was.v6.common.QName>(
+            _QName_QNAME, org.apache.openejb.jee.was.v6.common.QName.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Listener }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "Listener")
+    public JAXBElement<Listener> createListener(final Listener value) {
+        return new JAXBElement<Listener>(_Listener_QNAME, Listener.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityRoleRef }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "SecurityRoleRef")
+    public JAXBElement<SecurityRoleRef> createSecurityRoleRef(
+        final SecurityRoleRef value) {
+        return new JAXBElement<SecurityRoleRef>(_SecurityRoleRef_QNAME,
+            SecurityRoleRef.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Identity }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "Identity")
+    public JAXBElement<Identity> createIdentity(final Identity value) {
+        return new JAXBElement<Identity>(_Identity_QNAME, Identity.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Description }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "Description")
+    public JAXBElement<Description> createDescription(final Description value) {
+        return new JAXBElement<Description>(_Description_QNAME,
+            Description.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EnvEntry }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "EnvEntry")
+    public JAXBElement<EnvEntry> createEnvEntry(final EnvEntry value) {
+        return new JAXBElement<EnvEntry>(_EnvEntry_QNAME, EnvEntry.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DisplayName }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "DisplayName")
+    public JAXBElement<DisplayName> createDisplayName(final DisplayName value) {
+        return new JAXBElement<DisplayName>(_DisplayName_QNAME,
+            DisplayName.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceEnvRef }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "ResourceEnvRef")
+    public JAXBElement<ResourceEnvRef> createResourceEnvRef(final ResourceEnvRef value) {
+        return new JAXBElement<ResourceEnvRef>(_ResourceEnvRef_QNAME,
+            ResourceEnvRef.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link DescriptionGroup }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "DescriptionGroup")
+    public JAXBElement<DescriptionGroup> createDescriptionGroup(
+        final DescriptionGroup value) {
+        return new JAXBElement<DescriptionGroup>(_DescriptionGroup_QNAME,
+            DescriptionGroup.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link SecurityIdentity }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "SecurityIdentity")
+    public JAXBElement<SecurityIdentity> createSecurityIdentity(
+        final SecurityIdentity value) {
+        return new JAXBElement<SecurityIdentity>(_SecurityIdentity_QNAME,
+            SecurityIdentity.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link RunAsSpecifiedIdentity }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "RunAsSpecifiedIdentity")
+    public JAXBElement<RunAsSpecifiedIdentity> createRunAsSpecifiedIdentity(
+        final RunAsSpecifiedIdentity value) {
+        return new JAXBElement<RunAsSpecifiedIdentity>(
+            _RunAsSpecifiedIdentity_QNAME, RunAsSpecifiedIdentity.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link IconType }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "IconType")
+    public JAXBElement<IconType> createIconType(final IconType value) {
+        return new JAXBElement<IconType>(_IconType_QNAME, IconType.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link UseCallerIdentity }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "UseCallerIdentity")
+    public JAXBElement<UseCallerIdentity> createUseCallerIdentity(
+        final UseCallerIdentity value) {
+        return new JAXBElement<UseCallerIdentity>(_UseCallerIdentity_QNAME,
+            UseCallerIdentity.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link MessageDestination }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "MessageDestination")
+    public JAXBElement<MessageDestination> createMessageDestination(
+        final MessageDestination value) {
+        return new JAXBElement<MessageDestination>(_MessageDestination_QNAME,
+            MessageDestination.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link MessageDestinationRef }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "MessageDestinationRef")
+    public JAXBElement<MessageDestinationRef> createMessageDestinationRef(
+        final MessageDestinationRef value) {
+        return new JAXBElement<MessageDestinationRef>(
+            _MessageDestinationRef_QNAME, MessageDestinationRef.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link CompatibilityDescriptionGroup }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "CompatibilityDescriptionGroup")
+    public JAXBElement<CompatibilityDescriptionGroup> createCompatibilityDescriptionGroup(
+        final CompatibilityDescriptionGroup value) {
+        return new JAXBElement<CompatibilityDescriptionGroup>(
+            _CompatibilityDescriptionGroup_QNAME,
+            CompatibilityDescriptionGroup.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceRef }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "ResourceRef")
+    public JAXBElement<ResourceRef> createResourceRef(final ResourceRef value) {
+        return new JAXBElement<ResourceRef>(_ResourceRef_QNAME,
+            ResourceRef.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ParamValue }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "ParamValue")
+    public JAXBElement<ParamValue> createParamValue(final ParamValue value) {
+        return new JAXBElement<ParamValue>(_ParamValue_QNAME, ParamValue.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EjbRef }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "EjbRef")
+    public JAXBElement<EjbRef> createEjbRef(final EjbRef value) {
+        return new JAXBElement<EjbRef>(_EjbRef_QNAME, EjbRef.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EJBLocalRef }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "EJBLocalRef")
+    public JAXBElement<EJBLocalRef> createEJBLocalRef(final EJBLocalRef value) {
+        return new JAXBElement<EJBLocalRef>(_EJBLocalRef_QNAME,
+            EJBLocalRef.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityRole }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "SecurityRole")
+    public JAXBElement<SecurityRole> createSecurityRole(final SecurityRole value) {
+        return new JAXBElement<SecurityRole>(_SecurityRole_QNAME,
+            SecurityRole.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link JNDIEnvRefsGroup }{@code >}
+     */
+    @XmlElementDecl(namespace = "common.xmi", name = "JNDIEnvRefsGroup")
+    public JAXBElement<JNDIEnvRefsGroup> createJNDIEnvRefsGroup(
+        final JNDIEnvRefsGroup value) {
+        return new JAXBElement<JNDIEnvRefsGroup>(_JNDIEnvRefsGroup_QNAME,
+            JNDIEnvRefsGroup.class, null, value);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java
index 689a8a8..8429a04 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java
@@ -1,339 +1,339 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 This type is a general type that can be used to declare
- * parameter/value lists.
- * <p/>
- * <p/>
- * <p/>
- * Java class for ParamValue complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ParamValue">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ParamValue", propOrder = {"descriptions", "extensions"})
-public class ParamValue {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected String value;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = 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 value property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setValue(final String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 This type is a general type that can be used to declare
+ * parameter/value lists.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for ParamValue complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ParamValue">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ParamValue", propOrder = {"descriptions", "extensions"})
+public class ParamValue {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String value;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = 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 value property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}


[27/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/QueryMethod.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/QueryMethod.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/QueryMethod.java
index 6c0be79..ac38012 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/QueryMethod.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/QueryMethod.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for QueryMethod complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="QueryMethod">
- *   &lt;complexContent>
- *     &lt;extension base="{ejb.xmi}MethodElement">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "QueryMethod")
-public class QueryMethod extends MethodElement {
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for QueryMethod complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="QueryMethod">
+ *   &lt;complexContent>
+ *     &lt;extension base="{ejb.xmi}MethodElement">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "QueryMethod")
+public class QueryMethod extends MethodElement {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java
index f3e276f..0cf7248 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java
@@ -1,333 +1,333 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The relationships describes the relationships in which entity beans with
- * container managed persistence participate. The relationships element contains
- * an optional description; and a list of ejb-relation elements, which specify
- * the container managed relationships.
- * <p/>
- * <p/>
- * <p/>
- * Java class for Relationships complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Relationships">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="ejbRelations" type="{ejb.xmi}EJBRelation"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Relationships", propOrder = {"ejbRelations", "descriptions",
-    "extensions"})
-public class Relationships {
-
-    protected List<EJBRelation> ejbRelations;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the ejbRelations 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 ejbRelations property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEjbRelations().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EJBRelation }
-     */
-    public List<EJBRelation> getEjbRelations() {
-        if (ejbRelations == null) {
-            ejbRelations = new ArrayList<EJBRelation>();
-        }
-        return this.ejbRelations;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The relationships describes the relationships in which entity beans with
+ * container managed persistence participate. The relationships element contains
+ * an optional description; and a list of ejb-relation elements, which specify
+ * the container managed relationships.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for Relationships complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Relationships">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="ejbRelations" type="{ejb.xmi}EJBRelation"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Relationships", propOrder = {"ejbRelations", "descriptions",
+    "extensions"})
+public class Relationships {
+
+    protected List<EJBRelation> ejbRelations;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the ejbRelations 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 ejbRelations property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEjbRelations().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EJBRelation }
+     */
+    public List<EJBRelation> getEjbRelations() {
+        if (ejbRelations == null) {
+            ejbRelations = new ArrayList<EJBRelation>();
+        }
+        return this.ejbRelations;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ReturnTypeMappingEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ReturnTypeMappingEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ReturnTypeMappingEnum.java
index 3841eb0..b1865a4 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ReturnTypeMappingEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ReturnTypeMappingEnum.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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for ReturnTypeMapping.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="ReturnTypeMapping">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Local"/>
- *     &lt;enumeration value="Remote"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum ReturnTypeMappingEnum {
-
-    @XmlEnumValue("Local")
-    LOCAL("Local"), @XmlEnumValue("Remote")
-    REMOTE("Remote");
-    private final String value;
-
-    ReturnTypeMappingEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static ReturnTypeMappingEnum fromValue(final String v) {
-        for (final ReturnTypeMappingEnum c : ReturnTypeMappingEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for ReturnTypeMapping.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="ReturnTypeMapping">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Local"/>
+ *     &lt;enumeration value="Remote"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum ReturnTypeMappingEnum {
+
+    @XmlEnumValue("Local")
+    LOCAL("Local"), @XmlEnumValue("Remote")
+    REMOTE("Remote");
+    private final String value;
+
+    ReturnTypeMappingEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static ReturnTypeMappingEnum fromValue(final String v) {
+        for (final ReturnTypeMappingEnum c : ReturnTypeMappingEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java
index 4af4c8e..0f0d8f8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java
@@ -1,355 +1,355 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * Designates the source of a role that participates in a relationship. A
- * relationship-role-source element uniquely identifies an entity bean. @invariant
- * The content of each role-source element shall refer to an existing entity
- * bean, entity bean reference.
- * <p/>
- * <p/>
- * <p/>
- * Java class for RoleSource complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="RoleSource">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="entityBean" type="{ejb.xmi}ContainerManagedEntity"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="entityBean" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RoleSource", propOrder = {"entityBeans", "descriptions",
-    "extensions"})
-public class RoleSource {
-
-    @XmlElement(name = "entityBean")
-    protected List<ContainerManagedEntity> entityBeans;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String entityBean;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the entityBeans 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 entityBeans property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEntityBeans().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ContainerManagedEntity }
-     */
-    public List<ContainerManagedEntity> getEntityBeans() {
-        if (entityBeans == null) {
-            entityBeans = new ArrayList<ContainerManagedEntity>();
-        }
-        return this.entityBeans;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the entityBean property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEntityBean() {
-        return entityBean;
-    }
-
-    /**
-     * Sets the value of the entityBean property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEntityBean(final String value) {
-        this.entityBean = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * Designates the source of a role that participates in a relationship. A
+ * relationship-role-source element uniquely identifies an entity bean. @invariant
+ * The content of each role-source element shall refer to an existing entity
+ * bean, entity bean reference.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for RoleSource complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="RoleSource">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="entityBean" type="{ejb.xmi}ContainerManagedEntity"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="entityBean" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "RoleSource", propOrder = {"entityBeans", "descriptions",
+    "extensions"})
+public class RoleSource {
+
+    @XmlElement(name = "entityBean")
+    protected List<ContainerManagedEntity> entityBeans;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String entityBean;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the entityBeans 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 entityBeans property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEntityBeans().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ContainerManagedEntity }
+     */
+    public List<ContainerManagedEntity> getEntityBeans() {
+        if (entityBeans == null) {
+            entityBeans = new ArrayList<ContainerManagedEntity>();
+        }
+        return this.entityBeans;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the entityBean property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEntityBean() {
+        return entityBean;
+    }
+
+    /**
+     * Sets the value of the entityBean property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEntityBean(final String value) {
+        this.entityBean = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Session.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Session.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Session.java
index 3eea768..5922e73 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Session.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Session.java
@@ -1,176 +1,176 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.java.JavaClass;
-
-/**
- * The session-beanType declares an session bean. The declaration consists of:
- * <p/>
- * - an optional description - an optional display name - an optional icon
- * element that contains a small and a large icon file name - a name assigned to
- * the enterprise bean in the deployment description - the names of the session
- * bean's remote home and remote interfaces, if any - the names of the session
- * bean's local home and local interfaces, if any - the name of the session
- * bean's web service endpoint interface, if any - the session bean's
- * implementation class - the session bean's state management type - the session
- * bean's transaction management type - an optional declaration of the bean's
- * environment entries - an optional declaration of the bean's EJB references -
- * an optional declaration of the bean's local EJB references - an optional
- * declaration of the bean's web service references - an optional declaration of
- * the security role references - an optional declaration of the security
- * identity to be used for the execution of the bean's methods - an optional
- * declaration of the bean's resource manager connection factory references - an
- * optional declaration of the bean's resource environment references. - an
- * optional declaration of the bean's message destination references
- * <p/>
- * The elements that are optional are "optional" in the sense that they are
- * omitted when if lists represented by them are empty.
- * <p/>
- * Either both the local-home and the local elements or both the home and the
- * remote elements must be specified for the session bean.
- * <p/>
- * The service-endpoint element may only be specified if the bean is a stateless
- * session bean.
- * <p/>
- * <p/>
- * <p/>
- * Java class for Session complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Session">
- *   &lt;complexContent>
- *     &lt;extension base="{ejb.xmi}EnterpriseBean">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="serviceEndpoint" type="{java.xmi}JavaClass"/>
- *       &lt;/choice>
- *       &lt;attribute name="serviceEndpoint" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="sessionType" type="{ejb.xmi}SessionType" />
- *       &lt;attribute name="transactionType" type="{ejb.xmi}TransactionType" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Session", propOrder = {"serviceEndpoints"})
-public class Session extends EnterpriseBean {
-
-    @XmlElement(name = "serviceEndpoint")
-    protected List<JavaClass> serviceEndpoints;
-    @XmlAttribute
-    protected String serviceEndpoint;
-    @XmlAttribute
-    protected SessionEnum sessionType;
-    @XmlAttribute
-    protected TransactionEnum transactionType;
-
-    /**
-     * Gets the value of the serviceEndpoints 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 serviceEndpoints property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getServiceEndpoints().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getServiceEndpoints() {
-        if (serviceEndpoints == null) {
-            serviceEndpoints = new ArrayList<JavaClass>();
-        }
-        return this.serviceEndpoints;
-    }
-
-    /**
-     * Gets the value of the serviceEndpoint property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getServiceEndpoint() {
-        return serviceEndpoint;
-    }
-
-    /**
-     * Sets the value of the serviceEndpoint property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setServiceEndpoint(final String value) {
-        this.serviceEndpoint = value;
-    }
-
-    /**
-     * Gets the value of the sessionType property.
-     *
-     * @return possible object is {@link SessionEnum }
-     */
-    public SessionEnum getSessionType() {
-        return sessionType;
-    }
-
-    /**
-     * Sets the value of the sessionType property.
-     *
-     * @param value allowed object is {@link SessionEnum }
-     */
-    public void setSessionType(final SessionEnum value) {
-        this.sessionType = value;
-    }
-
-    /**
-     * Gets the value of the transactionType property.
-     *
-     * @return possible object is {@link TransactionEnum }
-     */
-    public TransactionEnum getTransactionType() {
-        return transactionType;
-    }
-
-    /**
-     * Sets the value of the transactionType property.
-     *
-     * @param value allowed object is {@link TransactionEnum }
-     */
-    public void setTransactionType(final TransactionEnum value) {
-        this.transactionType = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.java.JavaClass;
+
+/**
+ * The session-beanType declares an session bean. The declaration consists of:
+ * <p/>
+ * - an optional description - an optional display name - an optional icon
+ * element that contains a small and a large icon file name - a name assigned to
+ * the enterprise bean in the deployment description - the names of the session
+ * bean's remote home and remote interfaces, if any - the names of the session
+ * bean's local home and local interfaces, if any - the name of the session
+ * bean's web service endpoint interface, if any - the session bean's
+ * implementation class - the session bean's state management type - the session
+ * bean's transaction management type - an optional declaration of the bean's
+ * environment entries - an optional declaration of the bean's EJB references -
+ * an optional declaration of the bean's local EJB references - an optional
+ * declaration of the bean's web service references - an optional declaration of
+ * the security role references - an optional declaration of the security
+ * identity to be used for the execution of the bean's methods - an optional
+ * declaration of the bean's resource manager connection factory references - an
+ * optional declaration of the bean's resource environment references. - an
+ * optional declaration of the bean's message destination references
+ * <p/>
+ * The elements that are optional are "optional" in the sense that they are
+ * omitted when if lists represented by them are empty.
+ * <p/>
+ * Either both the local-home and the local elements or both the home and the
+ * remote elements must be specified for the session bean.
+ * <p/>
+ * The service-endpoint element may only be specified if the bean is a stateless
+ * session bean.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for Session complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Session">
+ *   &lt;complexContent>
+ *     &lt;extension base="{ejb.xmi}EnterpriseBean">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="serviceEndpoint" type="{java.xmi}JavaClass"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="serviceEndpoint" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="sessionType" type="{ejb.xmi}SessionType" />
+ *       &lt;attribute name="transactionType" type="{ejb.xmi}TransactionType" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Session", propOrder = {"serviceEndpoints"})
+public class Session extends EnterpriseBean {
+
+    @XmlElement(name = "serviceEndpoint")
+    protected List<JavaClass> serviceEndpoints;
+    @XmlAttribute
+    protected String serviceEndpoint;
+    @XmlAttribute
+    protected SessionEnum sessionType;
+    @XmlAttribute
+    protected TransactionEnum transactionType;
+
+    /**
+     * Gets the value of the serviceEndpoints 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 serviceEndpoints property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getServiceEndpoints().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getServiceEndpoints() {
+        if (serviceEndpoints == null) {
+            serviceEndpoints = new ArrayList<JavaClass>();
+        }
+        return this.serviceEndpoints;
+    }
+
+    /**
+     * Gets the value of the serviceEndpoint property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getServiceEndpoint() {
+        return serviceEndpoint;
+    }
+
+    /**
+     * Sets the value of the serviceEndpoint property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setServiceEndpoint(final String value) {
+        this.serviceEndpoint = value;
+    }
+
+    /**
+     * Gets the value of the sessionType property.
+     *
+     * @return possible object is {@link SessionEnum }
+     */
+    public SessionEnum getSessionType() {
+        return sessionType;
+    }
+
+    /**
+     * Sets the value of the sessionType property.
+     *
+     * @param value allowed object is {@link SessionEnum }
+     */
+    public void setSessionType(final SessionEnum value) {
+        this.sessionType = value;
+    }
+
+    /**
+     * Gets the value of the transactionType property.
+     *
+     * @return possible object is {@link TransactionEnum }
+     */
+    public TransactionEnum getTransactionType() {
+        return transactionType;
+    }
+
+    /**
+     * Sets the value of the transactionType property.
+     *
+     * @param value allowed object is {@link TransactionEnum }
+     */
+    public void setTransactionType(final TransactionEnum value) {
+        this.transactionType = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SessionEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SessionEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SessionEnum.java
index 06add94..dd36bd2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SessionEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SessionEnum.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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for SessionType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="SessionType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Stateful"/>
- *     &lt;enumeration value="Stateless"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum SessionEnum {
-
-    @XmlEnumValue("Stateful")
-    STATEFUL("Stateful"), @XmlEnumValue("Stateless")
-    STATELESS("Stateless");
-    private final String value;
-
-    SessionEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static SessionEnum fromValue(final String v) {
-        for (final SessionEnum c : SessionEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for SessionType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="SessionType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Stateful"/>
+ *     &lt;enumeration value="Stateless"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum SessionEnum {
+
+    @XmlEnumValue("Stateful")
+    STATEFUL("Stateful"), @XmlEnumValue("Stateless")
+    STATELESS("Stateless");
+    private final String value;
+
+    SessionEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static SessionEnum fromValue(final String v) {
+        for (final SessionEnum c : SessionEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SubscriptionDurabilityEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SubscriptionDurabilityEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SubscriptionDurabilityEnum.java
index d61a3c1..92841cf 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SubscriptionDurabilityEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/SubscriptionDurabilityEnum.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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for SubscriptionDurabilityKind.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="SubscriptionDurabilityKind">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Durable"/>
- *     &lt;enumeration value="NonDurable"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum SubscriptionDurabilityEnum {
-
-    @XmlEnumValue("Durable")
-    DURABLE("Durable"), @XmlEnumValue("NonDurable")
-    NON_DURABLE("NonDurable");
-    private final String value;
-
-    SubscriptionDurabilityEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static SubscriptionDurabilityEnum fromValue(final String v) {
-        for (final SubscriptionDurabilityEnum c : SubscriptionDurabilityEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for SubscriptionDurabilityKind.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="SubscriptionDurabilityKind">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Durable"/>
+ *     &lt;enumeration value="NonDurable"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum SubscriptionDurabilityEnum {
+
+    @XmlEnumValue("Durable")
+    DURABLE("Durable"), @XmlEnumValue("NonDurable")
+    NON_DURABLE("NonDurable");
+    private final String value;
+
+    SubscriptionDurabilityEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static SubscriptionDurabilityEnum fromValue(final String v) {
+        for (final SubscriptionDurabilityEnum c : SubscriptionDurabilityEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionAttributeEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionAttributeEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionAttributeEnum.java
index 8ae29e4..b845dbf 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionAttributeEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionAttributeEnum.java
@@ -1,73 +1,73 @@
-/**
- * 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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for TransactionAttributeType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="TransactionAttributeType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="NotSupported"/>
- *     &lt;enumeration value="Supports"/>
- *     &lt;enumeration value="Required"/>
- *     &lt;enumeration value="RequiresNew"/>
- *     &lt;enumeration value="Mandatory"/>
- *     &lt;enumeration value="Never"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum TransactionAttributeEnum {
-
-    @XmlEnumValue("NotSupported")
-    NOT_SUPPORTED("NotSupported"), @XmlEnumValue("Supports")
-    SUPPORTS("Supports"), @XmlEnumValue("Required")
-    REQUIRED("Required"), @XmlEnumValue("RequiresNew")
-    REQUIRES_NEW("RequiresNew"), @XmlEnumValue("Mandatory")
-    MANDATORY("Mandatory"), @XmlEnumValue("Never")
-    NEVER("Never");
-    private final String value;
-
-    TransactionAttributeEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static TransactionAttributeEnum fromValue(final String v) {
-        for (final TransactionAttributeEnum c : TransactionAttributeEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for TransactionAttributeType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="TransactionAttributeType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="NotSupported"/>
+ *     &lt;enumeration value="Supports"/>
+ *     &lt;enumeration value="Required"/>
+ *     &lt;enumeration value="RequiresNew"/>
+ *     &lt;enumeration value="Mandatory"/>
+ *     &lt;enumeration value="Never"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum TransactionAttributeEnum {
+
+    @XmlEnumValue("NotSupported")
+    NOT_SUPPORTED("NotSupported"), @XmlEnumValue("Supports")
+    SUPPORTS("Supports"), @XmlEnumValue("Required")
+    REQUIRED("Required"), @XmlEnumValue("RequiresNew")
+    REQUIRES_NEW("RequiresNew"), @XmlEnumValue("Mandatory")
+    MANDATORY("Mandatory"), @XmlEnumValue("Never")
+    NEVER("Never");
+    private final String value;
+
+    TransactionAttributeEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static TransactionAttributeEnum fromValue(final String v) {
+        for (final TransactionAttributeEnum c : TransactionAttributeEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionEnum.java
index 7f38b7a..0ee4ff3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/TransactionEnum.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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for TransactionType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="TransactionType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Bean"/>
- *     &lt;enumeration value="Container"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum TransactionEnum {
-
-    @XmlEnumValue("Bean")
-    BEAN("Bean"), @XmlEnumValue("Container")
-    CONTAINER("Container");
-    private final String value;
-
-    TransactionEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static TransactionEnum fromValue(final String v) {
-        for (final TransactionEnum c : TransactionEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for TransactionType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="TransactionType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Bean"/>
+ *     &lt;enumeration value="Container"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum TransactionEnum {
+
+    @XmlEnumValue("Bean")
+    BEAN("Bean"), @XmlEnumValue("Container")
+    CONTAINER("Container");
+    private final String value;
+
+    TransactionEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static TransactionEnum fromValue(final String v) {
+        for (final TransactionEnum c : TransactionEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/package-info.java
index d1d4a4b..62fbfe9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "ejb.xmi") package org.apache.openejb.jee.was.v6.ejb;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "ejb.xmi") package org.apache.openejb.jee.was.v6.ejb;
+


[45/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
index f4f8efe..8b03d45 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
@@ -1,329 +1,329 @@
-/**
- *
- * 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.resource.jdbc;
-
-import org.apache.openejb.OpenEJB;
-import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
-import org.apache.openejb.assembler.classic.ResourceInfo;
-import org.apache.openejb.assembler.classic.SecurityServiceInfo;
-import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
-import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.config.PersistenceModule;
-import org.apache.openejb.config.sys.Resource;
-import org.apache.openejb.core.LocalInitialContextFactory;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.jee.jpa.unit.Persistence;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.apache.openejb.jee.jpa.unit.TransactionType;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.resource.jdbc.router.Router;
-import org.apache.openejb.spi.ContainerSystem;
-import org.junit.After;
-import org.junit.Test;
-
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Id;
-import javax.persistence.PersistenceContext;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.junit.Assert.assertEquals;
-
-public class DynamicDataSourceTest {
-
-    @After
-    public void tearDown() throws Exception {
-        OpenEJB.destroy();
-    }
-
-    @Test
-    public void route() throws Exception {
-        System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
-
-        final ConfigurationFactory config = new ConfigurationFactory();
-
-        final Assembler assembler = new Assembler();
-        assembler.createProxyFactory(config.configureService(ProxyFactoryInfo.class));
-        assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
-        assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
-
-        // resources
-        for (int i = 1; i <= 3; i++) {
-            final String dbName = "database" + i;
-            final Resource resourceDs = new Resource(dbName, "DataSource");
-            final Properties p = resourceDs.getProperties();
-            p.put("JdbcDriver", "org.hsqldb.jdbcDriver");
-            p.put("JdbcUrl", "jdbc:hsqldb:mem:db" + i);
-            p.put("UserName", "sa");
-            p.put("Password", "");
-            p.put("JtaManaged", "true");
-            assembler.createResource(config.configureService(resourceDs, ResourceInfo.class));
-        }
-        final Resource resourceRouter = new Resource("My Router", "org.apache.openejb.router.test.DynamicDataSourceTest$DeterminedRouter", "org.router:DeterminedRouter");
-        resourceRouter.getProperties().setProperty("DatasourceNames", "database1 database2 database3");
-        resourceRouter.getProperties().setProperty("DefaultDataSourceName", "database1");
-        assembler.createResource(config.configureService(resourceRouter, ResourceInfo.class));
-
-        final Resource resourceRoutedDs = new Resource("Routed Datasource", "org.apache.openejb.resource.jdbc.Router", "RoutedDataSource");
-        resourceRoutedDs.getProperties().setProperty("Router", "My Router");
-        assembler.createResource(config.configureService(resourceRoutedDs, ResourceInfo.class));
-
-        // containers
-        final StatelessSessionContainerInfo statelessContainerInfo = config.configureService(StatelessSessionContainerInfo.class);
-        assembler.createContainer(statelessContainerInfo);
-
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(RoutedEJBBean.class));
-        ejbJar.addEnterpriseBean(new StatelessBean(UtilityBean.class));
-
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-
-        // Create an "ear"
-        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), "test-dynamic-data-source");
-        appModule.getEjbModules().add(ejbModule);
-
-        // Create a persistence-units
-        final PersistenceUnit unit = new PersistenceUnit("router");
-        unit.addClass(Person.class);
-        unit.getProperties().put("openjpa.jdbc.SynchronizeMappings", "buildSchema");
-        unit.setTransactionType(TransactionType.JTA);
-        unit.setJtaDataSource("Routed Datasource");
-        appModule.addPersistenceModule(new PersistenceModule("root", new Persistence(unit)));
-        for (int i = 1; i <= 3; i++) {
-            final PersistenceUnit u = new PersistenceUnit("db" + i);
-            u.addClass(Person.class);
-            u.getProperties().put("openjpa.jdbc.SynchronizeMappings", "buildSchema");
-            u.setTransactionType(TransactionType.JTA);
-            u.setJtaDataSource("database" + i);
-            appModule.addPersistenceModule(new PersistenceModule("root", new Persistence(u)));
-        }
-
-        assembler.createApplication(config.configureApplication(appModule));
-
-        // context
-        final Context ctx = new InitialContext();
-
-        // running persist on all "routed" databases
-        final List<String> databases = new ArrayList<String>();
-        databases.add("database1");
-        databases.add("database2");
-        databases.add("database3");
-
-        // convinient bean to create tables for each persistence unit
-        final Utility utility = (Utility) ctx.lookup("UtilityBeanLocal");
-        utility.initDatabase();
-
-        final RoutedEJB ejb = (RoutedEJB) ctx.lookup("RoutedEJBBeanLocal");
-        for (int i = 0; i < 18; i++) {
-            final String name = "record " + i;
-            final String db = databases.get(i % 3);
-            ejb.persist(i, name, db);
-        }
-
-        // assert database records number using jdbc
-        for (int i = 1; i <= 3; i++) {
-            final Connection connection = DriverManager.getConnection("jdbc:hsqldb:mem:db" + i, "sa", "");
-            final Statement st = connection.createStatement();
-            final ResultSet rs = st.executeQuery("select count(*) from \"DynamicDataSourceTest$Person\"");
-            rs.next();
-            assertEquals(6, rs.getInt(1));
-            st.close();
-            connection.close();
-        }
-    }
-
-    @Stateless
-    @Local(RoutedEJB.class)
-    public static class RoutedEJBBean implements RoutedEJB {
-        @PersistenceContext(unitName = "router")
-        private EntityManager em;
-
-        @javax.annotation.Resource(name = "My Router", type = DeterminedRouter.class)
-        private DeterminedRouter router;
-
-        public void persist(final int id, final String name, final String ds) {
-            router.setDataSource(ds);
-            em.persist(new Person(id, name));
-        }
-
-    }
-
-    @Stateless
-    @Local(Utility.class)
-    public static class UtilityBean implements Utility {
-
-        @PersistenceContext(unitName = "db1")
-        private EntityManager em1;
-        @PersistenceContext(unitName = "db2")
-        private EntityManager em2;
-        @PersistenceContext(unitName = "db3")
-        private EntityManager em3;
-
-        @TransactionAttribute(TransactionAttributeType.SUPPORTS)
-        public void initDatabase() {
-            em1.find(Person.class, 0);
-            em2.find(Person.class, 0);
-            em3.find(Person.class, 0);
-        }
-    }
-
-    public static interface RoutedEJB {
-        void persist(int id, String name, String ds);
-    }
-
-    public static interface Utility {
-        void initDatabase();
-    }
-
-    @Entity
-    public static class Person {
-        @Id
-        private long id;
-        private String name;
-
-        public Person() {
-            // no-op
-        }
-
-        public Person(final int i, final String n) {
-            id = i;
-            name = n;
-        }
-
-        public long getId() {
-            return id;
-        }
-
-        public void setId(final long id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(final String name) {
-            this.name = name;
-        }
-    }
-
-    public static class DeterminedRouter implements Router {
-        private String dataSourceNames;
-        private String defaultDataSourceName;
-        private Map<String, DataSource> dataSources = null;
-        private final ThreadLocal<DataSource> currentDataSource = new ThreadLocal<DataSource>();
-
-        /**
-         * @param datasourceList datasource resource name, separator is a space
-         */
-        public void setDataSourceNames(final String datasourceList) {
-            dataSourceNames = datasourceList;
-        }
-
-        /**
-         * lookup datasource in openejb resources
-         */
-        private void init() {
-            dataSources = new ConcurrentHashMap<String, DataSource>();
-            for (final String ds : dataSourceNames.split(" ")) {
-                final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
-
-                Object o = null;
-                final Context ctx = containerSystem.getJNDIContext();
-                try {
-                    o = ctx.lookup("openejb:Resource/" + ds);
-                    if (o instanceof DataSource) {
-                        dataSources.put(ds, (DataSource) o);
-                    }
-                } catch (final NamingException e) {
-                }
-            }
-        }
-
-        /**
-         * @return the user selected data source if it is set
-         * or the default one
-         * @throws IllegalArgumentException if the data source is not found
-         */
-        public DataSource getDataSource() {
-            // lazy init of routed datasources
-            if (dataSources == null) {
-                init();
-            }
-
-            // if no datasource is selected use the default one
-            if (currentDataSource.get() == null) {
-                if (dataSources.containsKey(defaultDataSourceName)) {
-                    return dataSources.get(defaultDataSourceName);
-
-                } else {
-                    throw new IllegalArgumentException("you have to specify at least one datasource");
-                }
-            }
-
-            // the developper set the datasource to use
-            return currentDataSource.get();
-        }
-
-        /**
-         * @param datasourceName data source name
-         */
-        public void setDataSource(final String datasourceName) {
-            if (dataSources == null) {
-                init();
-            }
-            if (!dataSources.containsKey(datasourceName)) {
-                throw new IllegalArgumentException("data source called " + datasourceName + " can't be found.");
-            }
-            final DataSource ds = dataSources.get(datasourceName);
-            currentDataSource.set(ds);
-        }
-
-        /**
-         * reset the data source
-         */
-        public void clear() {
-            currentDataSource.remove();
-        }
-
-        public void setDefaultDataSourceName(final String name) {
-            this.defaultDataSourceName = name;
-        }
-    }
-}
+/**
+ *
+ * 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.resource.jdbc;
+
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
+import org.apache.openejb.assembler.classic.ResourceInfo;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.PersistenceModule;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.core.LocalInitialContextFactory;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.jee.jpa.unit.TransactionType;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.resource.jdbc.router.Router;
+import org.apache.openejb.spi.ContainerSystem;
+import org.junit.After;
+import org.junit.Test;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static org.junit.Assert.assertEquals;
+
+public class DynamicDataSourceTest {
+
+    @After
+    public void tearDown() throws Exception {
+        OpenEJB.destroy();
+    }
+
+    @Test
+    public void route() throws Exception {
+        System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
+
+        final ConfigurationFactory config = new ConfigurationFactory();
+
+        final Assembler assembler = new Assembler();
+        assembler.createProxyFactory(config.configureService(ProxyFactoryInfo.class));
+        assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
+        assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+
+        // resources
+        for (int i = 1; i <= 3; i++) {
+            final String dbName = "database" + i;
+            final Resource resourceDs = new Resource(dbName, "DataSource");
+            final Properties p = resourceDs.getProperties();
+            p.put("JdbcDriver", "org.hsqldb.jdbcDriver");
+            p.put("JdbcUrl", "jdbc:hsqldb:mem:db" + i);
+            p.put("UserName", "sa");
+            p.put("Password", "");
+            p.put("JtaManaged", "true");
+            assembler.createResource(config.configureService(resourceDs, ResourceInfo.class));
+        }
+        final Resource resourceRouter = new Resource("My Router", "org.apache.openejb.router.test.DynamicDataSourceTest$DeterminedRouter", "org.router:DeterminedRouter");
+        resourceRouter.getProperties().setProperty("DatasourceNames", "database1 database2 database3");
+        resourceRouter.getProperties().setProperty("DefaultDataSourceName", "database1");
+        assembler.createResource(config.configureService(resourceRouter, ResourceInfo.class));
+
+        final Resource resourceRoutedDs = new Resource("Routed Datasource", "org.apache.openejb.resource.jdbc.Router", "RoutedDataSource");
+        resourceRoutedDs.getProperties().setProperty("Router", "My Router");
+        assembler.createResource(config.configureService(resourceRoutedDs, ResourceInfo.class));
+
+        // containers
+        final StatelessSessionContainerInfo statelessContainerInfo = config.configureService(StatelessSessionContainerInfo.class);
+        assembler.createContainer(statelessContainerInfo);
+
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(RoutedEJBBean.class));
+        ejbJar.addEnterpriseBean(new StatelessBean(UtilityBean.class));
+
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+
+        // Create an "ear"
+        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), "test-dynamic-data-source");
+        appModule.getEjbModules().add(ejbModule);
+
+        // Create a persistence-units
+        final PersistenceUnit unit = new PersistenceUnit("router");
+        unit.addClass(Person.class);
+        unit.getProperties().put("openjpa.jdbc.SynchronizeMappings", "buildSchema");
+        unit.setTransactionType(TransactionType.JTA);
+        unit.setJtaDataSource("Routed Datasource");
+        appModule.addPersistenceModule(new PersistenceModule("root", new Persistence(unit)));
+        for (int i = 1; i <= 3; i++) {
+            final PersistenceUnit u = new PersistenceUnit("db" + i);
+            u.addClass(Person.class);
+            u.getProperties().put("openjpa.jdbc.SynchronizeMappings", "buildSchema");
+            u.setTransactionType(TransactionType.JTA);
+            u.setJtaDataSource("database" + i);
+            appModule.addPersistenceModule(new PersistenceModule("root", new Persistence(u)));
+        }
+
+        assembler.createApplication(config.configureApplication(appModule));
+
+        // context
+        final Context ctx = new InitialContext();
+
+        // running persist on all "routed" databases
+        final List<String> databases = new ArrayList<String>();
+        databases.add("database1");
+        databases.add("database2");
+        databases.add("database3");
+
+        // convinient bean to create tables for each persistence unit
+        final Utility utility = (Utility) ctx.lookup("UtilityBeanLocal");
+        utility.initDatabase();
+
+        final RoutedEJB ejb = (RoutedEJB) ctx.lookup("RoutedEJBBeanLocal");
+        for (int i = 0; i < 18; i++) {
+            final String name = "record " + i;
+            final String db = databases.get(i % 3);
+            ejb.persist(i, name, db);
+        }
+
+        // assert database records number using jdbc
+        for (int i = 1; i <= 3; i++) {
+            final Connection connection = DriverManager.getConnection("jdbc:hsqldb:mem:db" + i, "sa", "");
+            final Statement st = connection.createStatement();
+            final ResultSet rs = st.executeQuery("select count(*) from \"DynamicDataSourceTest$Person\"");
+            rs.next();
+            assertEquals(6, rs.getInt(1));
+            st.close();
+            connection.close();
+        }
+    }
+
+    @Stateless
+    @Local(RoutedEJB.class)
+    public static class RoutedEJBBean implements RoutedEJB {
+        @PersistenceContext(unitName = "router")
+        private EntityManager em;
+
+        @javax.annotation.Resource(name = "My Router", type = DeterminedRouter.class)
+        private DeterminedRouter router;
+
+        public void persist(final int id, final String name, final String ds) {
+            router.setDataSource(ds);
+            em.persist(new Person(id, name));
+        }
+
+    }
+
+    @Stateless
+    @Local(Utility.class)
+    public static class UtilityBean implements Utility {
+
+        @PersistenceContext(unitName = "db1")
+        private EntityManager em1;
+        @PersistenceContext(unitName = "db2")
+        private EntityManager em2;
+        @PersistenceContext(unitName = "db3")
+        private EntityManager em3;
+
+        @TransactionAttribute(TransactionAttributeType.SUPPORTS)
+        public void initDatabase() {
+            em1.find(Person.class, 0);
+            em2.find(Person.class, 0);
+            em3.find(Person.class, 0);
+        }
+    }
+
+    public static interface RoutedEJB {
+        void persist(int id, String name, String ds);
+    }
+
+    public static interface Utility {
+        void initDatabase();
+    }
+
+    @Entity
+    public static class Person {
+        @Id
+        private long id;
+        private String name;
+
+        public Person() {
+            // no-op
+        }
+
+        public Person(final int i, final String n) {
+            id = i;
+            name = n;
+        }
+
+        public long getId() {
+            return id;
+        }
+
+        public void setId(final long id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(final String name) {
+            this.name = name;
+        }
+    }
+
+    public static class DeterminedRouter implements Router {
+        private String dataSourceNames;
+        private String defaultDataSourceName;
+        private Map<String, DataSource> dataSources = null;
+        private final ThreadLocal<DataSource> currentDataSource = new ThreadLocal<DataSource>();
+
+        /**
+         * @param datasourceList datasource resource name, separator is a space
+         */
+        public void setDataSourceNames(final String datasourceList) {
+            dataSourceNames = datasourceList;
+        }
+
+        /**
+         * lookup datasource in openejb resources
+         */
+        private void init() {
+            dataSources = new ConcurrentHashMap<String, DataSource>();
+            for (final String ds : dataSourceNames.split(" ")) {
+                final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+
+                Object o = null;
+                final Context ctx = containerSystem.getJNDIContext();
+                try {
+                    o = ctx.lookup("openejb:Resource/" + ds);
+                    if (o instanceof DataSource) {
+                        dataSources.put(ds, (DataSource) o);
+                    }
+                } catch (final NamingException e) {
+                }
+            }
+        }
+
+        /**
+         * @return the user selected data source if it is set
+         * or the default one
+         * @throws IllegalArgumentException if the data source is not found
+         */
+        public DataSource getDataSource() {
+            // lazy init of routed datasources
+            if (dataSources == null) {
+                init();
+            }
+
+            // if no datasource is selected use the default one
+            if (currentDataSource.get() == null) {
+                if (dataSources.containsKey(defaultDataSourceName)) {
+                    return dataSources.get(defaultDataSourceName);
+
+                } else {
+                    throw new IllegalArgumentException("you have to specify at least one datasource");
+                }
+            }
+
+            // the developper set the datasource to use
+            return currentDataSource.get();
+        }
+
+        /**
+         * @param datasourceName data source name
+         */
+        public void setDataSource(final String datasourceName) {
+            if (dataSources == null) {
+                init();
+            }
+            if (!dataSources.containsKey(datasourceName)) {
+                throw new IllegalArgumentException("data source called " + datasourceName + " can't be found.");
+            }
+            final DataSource ds = dataSources.get(datasourceName);
+            currentDataSource.set(ds);
+        }
+
+        /**
+         * reset the data source
+         */
+        public void clear() {
+            currentDataSource.remove();
+        }
+
+        public void setDefaultDataSourceName(final String name) {
+            this.defaultDataSourceName = name;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
index ae7015e..caee9e5 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
@@ -1,132 +1,132 @@
-/*
- * 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.resource.jdbc.driver;
-
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.SingletonBean;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Configuration;
-import org.apache.openejb.testing.Module;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.LocalBean;
-import javax.ejb.Singleton;
-import javax.sql.DataSource;
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.util.Properties;
-
-import static org.apache.openejb.loader.JarLocation.jarLocation;
-
-@RunWith(ApplicationComposer.class)
-public class AlternateDriverJarTest {
-
-    private static final String USER = "SA";
-    private static final String PASSWORD = "";
-
-    @Configuration
-    public Properties config() {
-
-        final File drivers = new File(jarLocation(AlternateDriverJarTest.class).getParentFile(), "drivers").getAbsoluteFile();
-
-        final Properties p = new Properties();
-        p.put("openejb.jdbc.datasource-creator", "dbcp-alternative");
-
-        File file = new File(drivers, "derby-10.10.1.1.jar");
-        Assert.assertTrue("Failed to find: " + file, file.exists());
-
-        p.put("JdbcOne", "new://Resource?type=DataSource&classpath="
-            + file.getAbsolutePath().replace("\\", "/"));
-        p.put("JdbcOne.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
-        p.put("JdbcOne.JdbcUrl", "jdbc:derby:memory:JdbcOne;create=true");
-        p.put("JdbcOne.UserName", USER);
-        p.put("JdbcOne.Password", PASSWORD);
-        p.put("JdbcOne.JtaManaged", "false");
-
-        file = new File(drivers, "derby-10.9.1.0.jar");
-        Assert.assertTrue("Failed to find: " + file, file.exists());
-
-        p.put("JdbcTwo", "new://Resource?type=DataSource&classpath="
-            + file.getAbsolutePath().replace("\\", "/"));
-        p.put("JdbcTwo.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
-        p.put("JdbcTwo.JdbcUrl", "jdbc:derby:memory:JdbcTwo;create=true");
-        p.put("JdbcTwo.UserName", USER);
-        p.put("JdbcTwo.Password", PASSWORD);
-        p.put("JdbcTwo.JtaManaged", "false");
-        return p;
-    }
-
-    @Module
-    public EjbJar app() throws Exception {
-        return new EjbJar()
-            .enterpriseBean(new SingletonBean(JdbcOne.class).localBean())
-            .enterpriseBean(new SingletonBean(JdbcTwo.class).localBean());
-    }
-
-    @EJB
-    private JdbcOne one;
-
-    @EJB
-    private JdbcTwo two;
-
-    @Test
-    public void testBoth() throws Exception {
-
-        final String oneDriverVersion = one.getDriverVersion();
-        System.out.println("oneDriverVersion = " + oneDriverVersion);
-        Assert.assertEquals("Should be using 10.10.1.1 - (1458268)", "10.10.1.1 - (1458268)", oneDriverVersion);
-
-        final String twoDriverVersion = two.getDriverVersion();
-        System.out.println("twoDriverVersion = " + twoDriverVersion);
-        Assert.assertEquals("Should be using 10.9.1.0 - (1344872)", "10.9.1.0 - (1344872)", twoDriverVersion);
-    }
-
-    @LocalBean
-    @Singleton
-    public static class JdbcOne {
-
-        @Resource(name = "JdbcOne")
-        private DataSource ds;
-
-        public String getDriverVersion() throws Exception {
-
-            final Connection con = ds.getConnection();
-            final DatabaseMetaData md = con.getMetaData();
-            return md.getDriverVersion();
-        }
-    }
-
-    @LocalBean
-    @Singleton
-    public static class JdbcTwo {
-
-        @Resource(name = "JdbcTwo")
-        private DataSource ds;
-
-        public String getDriverVersion() throws Exception {
-
-            final Connection con = ds.getConnection();
-            final DatabaseMetaData md = con.getMetaData();
-            return md.getDriverVersion();
-        }
-    }
-}
+/*
+ * 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.resource.jdbc.driver;
+
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.SingletonBean;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.ejb.LocalBean;
+import javax.ejb.Singleton;
+import javax.sql.DataSource;
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.util.Properties;
+
+import static org.apache.openejb.loader.JarLocation.jarLocation;
+
+@RunWith(ApplicationComposer.class)
+public class AlternateDriverJarTest {
+
+    private static final String USER = "SA";
+    private static final String PASSWORD = "";
+
+    @Configuration
+    public Properties config() {
+
+        final File drivers = new File(jarLocation(AlternateDriverJarTest.class).getParentFile(), "drivers").getAbsoluteFile();
+
+        final Properties p = new Properties();
+        p.put("openejb.jdbc.datasource-creator", "dbcp-alternative");
+
+        File file = new File(drivers, "derby-10.10.1.1.jar");
+        Assert.assertTrue("Failed to find: " + file, file.exists());
+
+        p.put("JdbcOne", "new://Resource?type=DataSource&classpath="
+            + file.getAbsolutePath().replace("\\", "/"));
+        p.put("JdbcOne.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
+        p.put("JdbcOne.JdbcUrl", "jdbc:derby:memory:JdbcOne;create=true");
+        p.put("JdbcOne.UserName", USER);
+        p.put("JdbcOne.Password", PASSWORD);
+        p.put("JdbcOne.JtaManaged", "false");
+
+        file = new File(drivers, "derby-10.9.1.0.jar");
+        Assert.assertTrue("Failed to find: " + file, file.exists());
+
+        p.put("JdbcTwo", "new://Resource?type=DataSource&classpath="
+            + file.getAbsolutePath().replace("\\", "/"));
+        p.put("JdbcTwo.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
+        p.put("JdbcTwo.JdbcUrl", "jdbc:derby:memory:JdbcTwo;create=true");
+        p.put("JdbcTwo.UserName", USER);
+        p.put("JdbcTwo.Password", PASSWORD);
+        p.put("JdbcTwo.JtaManaged", "false");
+        return p;
+    }
+
+    @Module
+    public EjbJar app() throws Exception {
+        return new EjbJar()
+            .enterpriseBean(new SingletonBean(JdbcOne.class).localBean())
+            .enterpriseBean(new SingletonBean(JdbcTwo.class).localBean());
+    }
+
+    @EJB
+    private JdbcOne one;
+
+    @EJB
+    private JdbcTwo two;
+
+    @Test
+    public void testBoth() throws Exception {
+
+        final String oneDriverVersion = one.getDriverVersion();
+        System.out.println("oneDriverVersion = " + oneDriverVersion);
+        Assert.assertEquals("Should be using 10.10.1.1 - (1458268)", "10.10.1.1 - (1458268)", oneDriverVersion);
+
+        final String twoDriverVersion = two.getDriverVersion();
+        System.out.println("twoDriverVersion = " + twoDriverVersion);
+        Assert.assertEquals("Should be using 10.9.1.0 - (1344872)", "10.9.1.0 - (1344872)", twoDriverVersion);
+    }
+
+    @LocalBean
+    @Singleton
+    public static class JdbcOne {
+
+        @Resource(name = "JdbcOne")
+        private DataSource ds;
+
+        public String getDriverVersion() throws Exception {
+
+            final Connection con = ds.getConnection();
+            final DatabaseMetaData md = con.getMetaData();
+            return md.getDriverVersion();
+        }
+    }
+
+    @LocalBean
+    @Singleton
+    public static class JdbcTwo {
+
+        @Resource(name = "JdbcTwo")
+        private DataSource ds;
+
+        public String getDriverVersion() throws Exception {
+
+            final Connection con = ds.getConnection();
+            final DatabaseMetaData md = con.getMetaData();
+            return md.getDriverVersion();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Green.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Green.java b/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Green.java
index 7e22c15..9333805 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Green.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Green.java
@@ -1,33 +1,33 @@
-/*
- * 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.test.annotated;
-
-import javax.ejb.Stateful;
-import javax.interceptor.AroundInvoke;
-import javax.jws.WebService;
-
-
-@Stateful(description = "test")
-@WebService
-public class Green {
-
-    // need to add this @AroundInvoke to cause validation to fail. Validation does not
-    // fail on warnings, which causes this framework to not work properly
-    @AroundInvoke
-    public void sayCheese() {
-    }
-}
+/*
+ * 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.test.annotated;
+
+import javax.ejb.Stateful;
+import javax.interceptor.AroundInvoke;
+import javax.jws.WebService;
+
+
+@Stateful(description = "test")
+@WebService
+public class Green {
+
+    // need to add this @AroundInvoke to cause validation to fail. Validation does not
+    // fail on warnings, which causes this framework to not work properly
+    @AroundInvoke
+    public void sayCheese() {
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java b/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java
index 5cff367..69632ec 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java
@@ -1,32 +1,32 @@
-/*
- * 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.test.annotated;
-
-import javax.annotation.ManagedBean;
-import javax.interceptor.AroundInvoke;
-import javax.jws.WebService;
-
-@ManagedBean
-@WebService
-public class Red {
-
-    // need to add this @AroundInvoke to cause validation to fail. Validation does not
-    // fail on warnings, which causes this framework to not work properly
-    @AroundInvoke
-    public void sayCheese() {
-    }
-}
+/*
+ * 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.test.annotated;
+
+import javax.annotation.ManagedBean;
+import javax.interceptor.AroundInvoke;
+import javax.jws.WebService;
+
+@ManagedBean
+@WebService
+public class Red {
+
+    // need to add this @AroundInvoke to cause validation to fail. Validation does not
+    // fail on warnings, which causes this framework to not work properly
+    @AroundInvoke
+    public void sayCheese() {
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Yellow.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Yellow.java b/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Yellow.java
index f8774ff..d16c274 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Yellow.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Yellow.java
@@ -1,40 +1,40 @@
-/*
- * 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.test.annotated;
-
-import javax.ejb.MessageDriven;
-import javax.interceptor.AroundInvoke;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jws.WebService;
-
-
-@MessageDriven
-@WebService
-public class Yellow implements MessageListener {
-
-    // need to add this @AroundInvoke to cause validation to fail. Validation does not
-    // fail on warnings, which causes this framework to not work properly
-    @AroundInvoke
-    public void sayCheese() {
-    }
-
-    @Override
-    public void onMessage(final Message message) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
+/*
+ * 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.test.annotated;
+
+import javax.ejb.MessageDriven;
+import javax.interceptor.AroundInvoke;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jws.WebService;
+
+
+@MessageDriven
+@WebService
+public class Yellow implements MessageListener {
+
+    // need to add this @AroundInvoke to cause validation to fail. Validation does not
+    // fail on warnings, which causes this framework to not work properly
+    @AroundInvoke
+    public void sayCheese() {
+    }
+
+    @Override
+    public void onMessage(final Message message) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/util/BeanTypeComparisonTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/BeanTypeComparisonTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/BeanTypeComparisonTest.java
index 67aa55f..7bc1d27 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/BeanTypeComparisonTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/BeanTypeComparisonTest.java
@@ -1,35 +1,35 @@
-/**
- * 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.util;
-
-import org.apache.openejb.BeanType;
-import org.apache.openejb.jee.SessionType;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-
-public class BeanTypeComparisonTest {
-
-    @Test
-    public void testEqualsMethodForDifferentClassTypes() {
-        final BeanType beanType = BeanType.STATELESS;
-        final SessionType sessionType = SessionType.STATELESS;
-        assertFalse(beanType.equals(sessionType));
-    }
-
-
-}
+/**
+ * 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.util;
+
+import org.apache.openejb.BeanType;
+import org.apache.openejb.jee.SessionType;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+
+public class BeanTypeComparisonTest {
+
+    @Test
+    public void testEqualsMethodForDifferentClassTypes() {
+        final BeanType beanType = BeanType.STATELESS;
+        final SessionType sessionType = SessionType.STATELESS;
+        assertFalse(beanType.equals(sessionType));
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/util/CollectionsUtilTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/CollectionsUtilTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/CollectionsUtilTest.java
index 7eca925..fe7373d 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/CollectionsUtilTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/CollectionsUtilTest.java
@@ -1,34 +1,34 @@
-/**
- * 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.util;
-
-import org.junit.Test;
-
-import java.util.List;
-
-public class CollectionsUtilTest {
-
-    @Test
-    public void safeIterationForNullList() {
-        final List<String> stringList = null;
-        for (final String string : CollectionsUtil.safe(stringList)) {
-        }
-
-        //PASS: No NPE thrown
-    }
-}
+/**
+ * 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.util;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class CollectionsUtilTest {
+
+    @Test
+    public void safeIterationForNullList() {
+        final List<String> stringList = null;
+        for (final String string : CollectionsUtil.safe(stringList)) {
+        }
+
+        //PASS: No NPE thrown
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/resources/META-INF/jpa-test-mappings.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/resources/META-INF/jpa-test-mappings.xml b/container/openejb-core/src/test/resources/META-INF/jpa-test-mappings.xml
index a644fac..fe6eae5 100644
--- a/container/openejb-core/src/test/resources/META-INF/jpa-test-mappings.xml
+++ b/container/openejb-core/src/test/resources/META-INF/jpa-test-mappings.xml
@@ -1,24 +1,24 @@
-<?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$ -->
+
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
     <mapped-superclass class="org.apache.openejb.test.entity.cmp.BasicCmpBean">
         <attributes>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml b/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml
index c9bceb1..147189f 100644
--- a/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml
+++ b/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml
@@ -1,24 +1,24 @@
-<?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$ -->
+
 <ServiceJar>
 
   <ServiceProvider id="CheddarContainer" service="Container" class-name="org.acme.SuperContainer">

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/resources/META-INF/org.router/service-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/resources/META-INF/org.router/service-jar.xml b/container/openejb-core/src/test/resources/META-INF/org.router/service-jar.xml
index cb86297..e409d7d 100644
--- a/container/openejb-core/src/test/resources/META-INF/org.router/service-jar.xml
+++ b/container/openejb-core/src/test/resources/META-INF/org.router/service-jar.xml
@@ -1,28 +1,28 @@
-<?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$ -->
-<ServiceJar>
-  <ServiceProvider id="DeterminedRouter" service="Resource"
-    type="org.apache.openejb.resource.jdbc.router.Router"
-    class-name="org.apache.openejb.resource.jdbc.DynamicDataSourceTest$DeterminedRouter">
-    DataSourceNames
-    DefaultDataSourceName
-  </ServiceProvider>
-</ServiceJar>
+<?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$ -->
+<ServiceJar>
+  <ServiceProvider id="DeterminedRouter" service="Resource"
+    type="org.apache.openejb.resource.jdbc.router.Router"
+    class-name="org.apache.openejb.resource.jdbc.DynamicDataSourceTest$DeterminedRouter">
+    DataSourceNames
+    DefaultDataSourceName
+  </ServiceProvider>
+</ServiceJar>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml b/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
index 9ea2e3d..e2017c0 100644
--- a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
+++ b/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.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$ -->
+
 <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">

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/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>
-
+


[21/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java
index cd60eca..0a1fc31 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java
@@ -1,323 +1,323 @@
-/**
- * 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.was.v6.wsclient;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.java.JavaClass;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The port-component-ref element declares a client dependency on the container
- * for resolving a Service Endpoint Interface to a WSDL port. It optionally
- * associates the Service Endpoint Interface with a particular port-component.
- * This is only used by the container for a Service.getPort(Class) method call.
- * <p/>
- * <p/>
- * <p/>
- * Java class for PortComponentRef complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="PortComponentRef">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="serviceEndpointInterface" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="portComponentLink" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="serviceEndpointInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PortComponentRef", propOrder = {"serviceEndpointInterfaces",
-    "extensions"})
-public class PortComponentRef {
-
-    @XmlElement(name = "serviceEndpointInterface")
-    protected List<JavaClass> serviceEndpointInterfaces;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String portComponentLink;
-    @XmlAttribute(name = "serviceEndpointInterface")
-    protected String serviceEndpointInterfaceString;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the serviceEndpointInterfaces 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 serviceEndpointInterfaces property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getServiceEndpointInterfaces().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getServiceEndpointInterfaces() {
-        if (serviceEndpointInterfaces == null) {
-            serviceEndpointInterfaces = new ArrayList<JavaClass>();
-        }
-        return this.serviceEndpointInterfaces;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the portComponentLink property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getPortComponentLink() {
-        return portComponentLink;
-    }
-
-    /**
-     * Sets the value of the portComponentLink property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setPortComponentLink(final String value) {
-        this.portComponentLink = value;
-    }
-
-    /**
-     * Gets the value of the serviceEndpointInterfaceString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getServiceEndpointInterfaceString() {
-        return serviceEndpointInterfaceString;
-    }
-
-    /**
-     * Sets the value of the serviceEndpointInterfaceString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setServiceEndpointInterfaceString(final String value) {
-        this.serviceEndpointInterfaceString = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.wsclient;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.java.JavaClass;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The port-component-ref element declares a client dependency on the container
+ * for resolving a Service Endpoint Interface to a WSDL port. It optionally
+ * associates the Service Endpoint Interface with a particular port-component.
+ * This is only used by the container for a Service.getPort(Class) method call.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for PortComponentRef complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="PortComponentRef">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="serviceEndpointInterface" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="portComponentLink" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="serviceEndpointInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PortComponentRef", propOrder = {"serviceEndpointInterfaces",
+    "extensions"})
+public class PortComponentRef {
+
+    @XmlElement(name = "serviceEndpointInterface")
+    protected List<JavaClass> serviceEndpointInterfaces;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String portComponentLink;
+    @XmlAttribute(name = "serviceEndpointInterface")
+    protected String serviceEndpointInterfaceString;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the serviceEndpointInterfaces 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 serviceEndpointInterfaces property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getServiceEndpointInterfaces().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getServiceEndpointInterfaces() {
+        if (serviceEndpointInterfaces == null) {
+            serviceEndpointInterfaces = new ArrayList<JavaClass>();
+        }
+        return this.serviceEndpointInterfaces;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the portComponentLink property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getPortComponentLink() {
+        return portComponentLink;
+    }
+
+    /**
+     * Sets the value of the portComponentLink property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setPortComponentLink(final String value) {
+        this.portComponentLink = value;
+    }
+
+    /**
+     * Gets the value of the serviceEndpointInterfaceString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getServiceEndpointInterfaceString() {
+        return serviceEndpointInterfaceString;
+    }
+
+    /**
+     * Sets the value of the serviceEndpointInterfaceString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setServiceEndpointInterfaceString(final String value) {
+        this.serviceEndpointInterfaceString = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ServiceRef.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ServiceRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ServiceRef.java
index bd99687..4f41d73 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ServiceRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ServiceRef.java
@@ -1,276 +1,276 @@
-/**
- * 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.was.v6.wsclient;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.common.CompatibilityDescriptionGroup;
-import org.apache.openejb.jee.was.v6.common.QName;
-import org.apache.openejb.jee.was.v6.java.JavaClass;
-
-/**
- * The service-ref element declares a reference to a Web service. It contains
- * optional description, display name and icons, a declaration of the required
- * Service interface, an optional WSDL document location, an optional set of
- * JAX-RPC mappings, an optional QName for the service element, an optional set
- * of Service Endpoint Interfaces to be resolved by the container to a WSDL
- * port, and an optional set of handlers.
- * <p/>
- * <p/>
- * <p/>
- * Java class for ServiceRef complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ServiceRef">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="serviceInterface" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="portComponentRefs" type="{webservice_client.xmi}PortComponentRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="handlers" type="{webservice_client.xmi}Handler"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="serviceQname" type="{common.xmi}QName"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="jaxrpcMappingFile" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="serviceInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="serviceRefName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="wsdlFile" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ServiceRef", propOrder = {"serviceInterfaces",
-    "portComponentRefs", "handlers", "serviceQnames"})
-public class ServiceRef extends CompatibilityDescriptionGroup {
-
-    @XmlElement(name = "serviceInterface")
-    protected List<JavaClass> serviceInterfaces;
-    protected List<PortComponentRef> portComponentRefs;
-    protected List<Handler> handlers;
-    @XmlElement(name = "serviceQname")
-    protected List<QName> serviceQnames;
-    @XmlAttribute
-    protected String jaxrpcMappingFile;
-    @XmlAttribute(name = "serviceInterface")
-    protected String serviceInterfaceString;
-    @XmlAttribute
-    protected String serviceRefName;
-    @XmlAttribute
-    protected String wsdlFile;
-
-    /**
-     * Gets the value of the serviceInterfaces 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 serviceInterfaces property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getServiceInterfaces().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getServiceInterfaces() {
-        if (serviceInterfaces == null) {
-            serviceInterfaces = new ArrayList<JavaClass>();
-        }
-        return this.serviceInterfaces;
-    }
-
-    /**
-     * Gets the value of the portComponentRefs 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 portComponentRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getPortComponentRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PortComponentRef }
-     */
-    public List<PortComponentRef> getPortComponentRefs() {
-        if (portComponentRefs == null) {
-            portComponentRefs = new ArrayList<PortComponentRef>();
-        }
-        return this.portComponentRefs;
-    }
-
-    /**
-     * Gets the value of the handlers 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 handlers property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getHandlers().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Handler }
-     */
-    public List<Handler> getHandlers() {
-        if (handlers == null) {
-            handlers = new ArrayList<Handler>();
-        }
-        return this.handlers;
-    }
-
-    /**
-     * Gets the value of the serviceQnames 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 serviceQnames property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getServiceQnames().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link QName }
-     */
-    public List<QName> getServiceQnames() {
-        if (serviceQnames == null) {
-            serviceQnames = new ArrayList<QName>();
-        }
-        return this.serviceQnames;
-    }
-
-    /**
-     * Gets the value of the jaxrpcMappingFile property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJaxrpcMappingFile() {
-        return jaxrpcMappingFile;
-    }
-
-    /**
-     * Sets the value of the jaxrpcMappingFile property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJaxrpcMappingFile(final String value) {
-        this.jaxrpcMappingFile = value;
-    }
-
-    /**
-     * Gets the value of the serviceInterfaceString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getServiceInterfaceString() {
-        return serviceInterfaceString;
-    }
-
-    /**
-     * Sets the value of the serviceInterfaceString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setServiceInterfaceString(final String value) {
-        this.serviceInterfaceString = value;
-    }
-
-    /**
-     * Gets the value of the serviceRefName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getServiceRefName() {
-        return serviceRefName;
-    }
-
-    /**
-     * Sets the value of the serviceRefName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setServiceRefName(final String value) {
-        this.serviceRefName = value;
-    }
-
-    /**
-     * Gets the value of the wsdlFile property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getWsdlFile() {
-        return wsdlFile;
-    }
-
-    /**
-     * Sets the value of the wsdlFile property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setWsdlFile(final String value) {
-        this.wsdlFile = 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.was.v6.wsclient;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.common.CompatibilityDescriptionGroup;
+import org.apache.openejb.jee.was.v6.common.QName;
+import org.apache.openejb.jee.was.v6.java.JavaClass;
+
+/**
+ * The service-ref element declares a reference to a Web service. It contains
+ * optional description, display name and icons, a declaration of the required
+ * Service interface, an optional WSDL document location, an optional set of
+ * JAX-RPC mappings, an optional QName for the service element, an optional set
+ * of Service Endpoint Interfaces to be resolved by the container to a WSDL
+ * port, and an optional set of handlers.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for ServiceRef complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ServiceRef">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}CompatibilityDescriptionGroup">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="serviceInterface" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="portComponentRefs" type="{webservice_client.xmi}PortComponentRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="handlers" type="{webservice_client.xmi}Handler"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="serviceQname" type="{common.xmi}QName"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="jaxrpcMappingFile" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="serviceInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="serviceRefName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="wsdlFile" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServiceRef", propOrder = {"serviceInterfaces",
+    "portComponentRefs", "handlers", "serviceQnames"})
+public class ServiceRef extends CompatibilityDescriptionGroup {
+
+    @XmlElement(name = "serviceInterface")
+    protected List<JavaClass> serviceInterfaces;
+    protected List<PortComponentRef> portComponentRefs;
+    protected List<Handler> handlers;
+    @XmlElement(name = "serviceQname")
+    protected List<QName> serviceQnames;
+    @XmlAttribute
+    protected String jaxrpcMappingFile;
+    @XmlAttribute(name = "serviceInterface")
+    protected String serviceInterfaceString;
+    @XmlAttribute
+    protected String serviceRefName;
+    @XmlAttribute
+    protected String wsdlFile;
+
+    /**
+     * Gets the value of the serviceInterfaces 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 serviceInterfaces property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getServiceInterfaces().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getServiceInterfaces() {
+        if (serviceInterfaces == null) {
+            serviceInterfaces = new ArrayList<JavaClass>();
+        }
+        return this.serviceInterfaces;
+    }
+
+    /**
+     * Gets the value of the portComponentRefs 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 portComponentRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getPortComponentRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PortComponentRef }
+     */
+    public List<PortComponentRef> getPortComponentRefs() {
+        if (portComponentRefs == null) {
+            portComponentRefs = new ArrayList<PortComponentRef>();
+        }
+        return this.portComponentRefs;
+    }
+
+    /**
+     * Gets the value of the handlers 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 handlers property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getHandlers().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Handler }
+     */
+    public List<Handler> getHandlers() {
+        if (handlers == null) {
+            handlers = new ArrayList<Handler>();
+        }
+        return this.handlers;
+    }
+
+    /**
+     * Gets the value of the serviceQnames 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 serviceQnames property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getServiceQnames().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link QName }
+     */
+    public List<QName> getServiceQnames() {
+        if (serviceQnames == null) {
+            serviceQnames = new ArrayList<QName>();
+        }
+        return this.serviceQnames;
+    }
+
+    /**
+     * Gets the value of the jaxrpcMappingFile property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJaxrpcMappingFile() {
+        return jaxrpcMappingFile;
+    }
+
+    /**
+     * Sets the value of the jaxrpcMappingFile property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJaxrpcMappingFile(final String value) {
+        this.jaxrpcMappingFile = value;
+    }
+
+    /**
+     * Gets the value of the serviceInterfaceString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getServiceInterfaceString() {
+        return serviceInterfaceString;
+    }
+
+    /**
+     * Sets the value of the serviceInterfaceString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setServiceInterfaceString(final String value) {
+        this.serviceInterfaceString = value;
+    }
+
+    /**
+     * Gets the value of the serviceRefName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getServiceRefName() {
+        return serviceRefName;
+    }
+
+    /**
+     * Sets the value of the serviceRefName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setServiceRefName(final String value) {
+        this.serviceRefName = value;
+    }
+
+    /**
+     * Gets the value of the wsdlFile property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getWsdlFile() {
+        return wsdlFile;
+    }
+
+    /**
+     * Sets the value of the wsdlFile property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setWsdlFile(final String value) {
+        this.wsdlFile = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java
index 6a23f4a..5ee68e2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java
@@ -1,307 +1,307 @@
-/**
- * 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.was.v6.wsclient;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 deprecated
- * <p/>
- * <p/>
- * Java class for WebServicesClient complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="WebServicesClient">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="componentScopedRefs" type="{webservice_client.xmi}ComponentScopedRefs"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="serviceRefs" type="{webservice_client.xmi}ServiceRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "WebServicesClient", propOrder = {"componentScopedRefs",
-    "serviceRefs", "extensions"})
-public class WebServicesClient {
-
-    protected List<ComponentScopedRefs> componentScopedRefs;
-    protected List<ServiceRef> serviceRefs;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the componentScopedRefs 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 componentScopedRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getComponentScopedRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ComponentScopedRefs }
-     */
-    public List<ComponentScopedRefs> getComponentScopedRefs() {
-        if (componentScopedRefs == null) {
-            componentScopedRefs = new ArrayList<ComponentScopedRefs>();
-        }
-        return this.componentScopedRefs;
-    }
-
-    /**
-     * Gets the value of the serviceRefs 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 serviceRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getServiceRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceRef }
-     */
-    public List<ServiceRef> getServiceRefs() {
-        if (serviceRefs == null) {
-            serviceRefs = new ArrayList<ServiceRef>();
-        }
-        return this.serviceRefs;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.wsclient;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 deprecated
+ * <p/>
+ * <p/>
+ * Java class for WebServicesClient complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="WebServicesClient">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="componentScopedRefs" type="{webservice_client.xmi}ComponentScopedRefs"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="serviceRefs" type="{webservice_client.xmi}ServiceRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "WebServicesClient", propOrder = {"componentScopedRefs",
+    "serviceRefs", "extensions"})
+public class WebServicesClient {
+
+    protected List<ComponentScopedRefs> componentScopedRefs;
+    protected List<ServiceRef> serviceRefs;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the componentScopedRefs 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 componentScopedRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getComponentScopedRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ComponentScopedRefs }
+     */
+    public List<ComponentScopedRefs> getComponentScopedRefs() {
+        if (componentScopedRefs == null) {
+            componentScopedRefs = new ArrayList<ComponentScopedRefs>();
+        }
+        return this.componentScopedRefs;
+    }
+
+    /**
+     * Gets the value of the serviceRefs 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 serviceRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getServiceRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceRef }
+     */
+    public List<ServiceRef> getServiceRefs() {
+        if (serviceRefs == null) {
+            serviceRefs = new ArrayList<ServiceRef>();
+        }
+        return this.serviceRefs;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/package-info.java
index df58525..0a456a8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "webservice_client.xmi") package org.apache.openejb.jee.was.v6.wsclient;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "webservice_client.xmi") package org.apache.openejb.jee.was.v6.wsclient;
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Add.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Add.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Add.java
index 3ae6aed..ba51cf2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Add.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Add.java
@@ -1,101 +1,101 @@
-/**
- * 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.was.v6.xmi;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for Add complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Add">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.omg.org/XMI}Difference">
- *       &lt;attribute name="addition" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
- *       &lt;attribute name="position" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Add")
-public class Add extends Difference {
-
-    @XmlAttribute(name = "addition")
-    @XmlIDREF
-    protected List<Object> additions;
-    @XmlAttribute
-    protected String position;
-
-    /**
-     * Gets the value of the additions 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 additions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getAdditions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Object }
-     */
-    public List<Object> getAdditions() {
-        if (additions == null) {
-            additions = new ArrayList<Object>();
-        }
-        return this.additions;
-    }
-
-    /**
-     * Gets the value of the position property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getPosition() {
-        return position;
-    }
-
-    /**
-     * Sets the value of the position property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setPosition(final String value) {
-        this.position = 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.was.v6.xmi;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for Add complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Add">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.omg.org/XMI}Difference">
+ *       &lt;attribute name="addition" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
+ *       &lt;attribute name="position" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Add")
+public class Add extends Difference {
+
+    @XmlAttribute(name = "addition")
+    @XmlIDREF
+    protected List<Object> additions;
+    @XmlAttribute
+    protected String position;
+
+    /**
+     * Gets the value of the additions 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 additions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getAdditions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Object }
+     */
+    public List<Object> getAdditions() {
+        if (additions == null) {
+            additions = new ArrayList<Object>();
+        }
+        return this.additions;
+    }
+
+    /**
+     * Gets the value of the position property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getPosition() {
+        return position;
+    }
+
+    /**
+     * Sets the value of the position property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setPosition(final String value) {
+        this.position = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Any.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Any.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Any.java
index 1c5b2bb..ade45ac 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Any.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Any.java
@@ -1,105 +1,105 @@
-/**
- * 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.was.v6.xmi;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-/**
- * <p/>
- * Java class for Any complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Any">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;any/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Any", propOrder = {"elements"})
-public class Any {
-
-    @XmlAnyElement
-    protected List<Element> elements;
-    @XmlAnyAttribute
-    private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the elements 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 elements property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getElements().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Element }
-     */
-    public List<Element> getElements() {
-        if (elements == null) {
-            elements = new ArrayList<Element>();
-        }
-        return this.elements;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed
-     * property on this class.
-     * <p/>
-     * <p/>
-     * the map is keyed by the name of the attribute and the value is the string
-     * value of the attribute.
-     * <p/>
-     * the map returned by this method is live, and you can add new attribute by
-     * updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
+/**
+ * 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.was.v6.xmi;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+/**
+ * <p/>
+ * Java class for Any complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Any">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;any/>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Any", propOrder = {"elements"})
+public class Any {
+
+    @XmlAnyElement
+    protected List<Element> elements;
+    @XmlAnyAttribute
+    private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the elements 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 elements property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getElements().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Element }
+     */
+    public List<Element> getElements() {
+        if (elements == null) {
+            elements = new ArrayList<Element>();
+        }
+        return this.elements;
+    }
+
+    /**
+     * Gets a map that contains attributes that aren't bound to any typed
+     * property on this class.
+     * <p/>
+     * <p/>
+     * the map is keyed by the name of the attribute and the value is the string
+     * value of the attribute.
+     * <p/>
+     * the map returned by this method is live, and you can add new attribute by
+     * updating the map directly. Because of this design, there's no setter.
+     *
+     * @return always non-null
+     */
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Delete.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Delete.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Delete.java
index c7c454c..2eac4f5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Delete.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Delete.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.xmi;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for Delete complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Delete">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.omg.org/XMI}Difference">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Delete")
-public class Delete extends Difference {
-
-}
+/**
+ * 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.was.v6.xmi;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for Delete complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Delete">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.omg.org/XMI}Difference">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Delete")
+public class Delete extends Difference {
+
+}


[29/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java
index 0c881e2..3137f1c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java
@@ -1,609 +1,609 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * 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 must be the name
- * of one of the enterprise beans in declared in the deployment descriptor; the
- * optional method-intf element allows to distinguish between a method with the
- * same signature that is defined in both the home and remote interface; the
- * method-name element specifies the method name; and the optional method-params
- * elements identify a
- * <p/>
- * single method among multiple methods with an overloaded method name.
- * <p/>
- * There are three possible styles of the method element syntax:
- * <p/>
- * 1. <method>
- * <p/>
- * <ejb-name>EJBNAME</ejb-name>
- * <p/>
- * <method-name>*</method-name>
- * <p/>
- * </method>
- * <p/>
- * <p/>
- * This style is used to refer to all the methods of the specified enterprise
- * bean's home and remote interfaces.
- * <p/>
- * <p/>
- * 2. <method>
- * <p/>
- * <ejb-name>EJBNAME</ejb-name>
- * <p/>
- * <method-name>METHOD</method-name>
- * <p/>
- * </method>>
- * <p/>
- * This style is used to refer to the specified method of the specified
- * enterprise bean. If there are multiple methods with
- * <p/>
- * the same overloaded name, the element of this style refers to all the methods
- * with the overloaded name.
- * <p/>
- * <p/>
- * <p/>
- * <p/>
- * <p/>
- * 3. <method>
- * <p/>
- * <ejb-name>EJBNAME</ejb-name>
- * <p/>
- * <method-name>METHOD</method-name>
- * <p/>
- * <method-params>
- * <p/>
- * <method-param>PARAM-1</method-param>
- * <p/>
- * <method-param>PARAM-2</method-param>
- * <p/>
- * ...
- * <p/>
- * <method-param>PARAM-n</method-param>
- * <p/>
- * </method-params> <method>
- * <p/>
- * <p/>
- * 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 the method has no input arguments,
- * the method-params element
- * <p/>
- * 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[][]).
- * <p/>
- * <p/>
- * <p/>
- * Used in: method-permission and container-transaction
- * <p/>
- * Examples:
- * <p/>
- * <p/>
- * Style 1: The following method element refers to all the methods of the
- * EmployeeService bean's home and remote interfaces:
- * <p/>
- * <p/>
- * <method>
- * <p/>
- * <ejb-name>EmployeeService</ejb-name>
- * <p/>
- * <method-name>*</method-name>
- * <p/>
- * </method>
- * <p/>
- * <p/>
- * Style 2: The following method element refers to all the create methods of the
- * EmployeeService bean's home interface:
- * <p/>
- * <p/>
- * <method>
- * <p/>
- * <ejb-name>EmployeeService</ejb-name>
- * <p/>
- * <method-name>create</method-name>
- * <p/>
- * </method>
- * <p/>
- * Style 3: The following method element refers to the create(String firstName,
- * String LastName) method of the EmployeeService bean's home interface.
- * <p/>
- * <p/>
- * <method>
- * <p/>
- * <ejb-name>EmployeeService</ejb-name>
- * <p/>
- * <method-name>create</method-name>
- * <p/>
- * <method-params>
- * <p/>
- * <method-param>java.lang.String</method-param>
- * <p/>
- * <method-param>java.lang.String</method-param>
- * <p/>
- * </method-params> </method>
- * <p/>
- * <p/>
- * <p/>
- * 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)
- * <p/>
- * would be specified as:
- * <p/>
- * <p/>
- * <method>
- * <p/>
- * <ejb-name>EmployeeService</ejb-name>
- * <p/>
- * <method-name>foobar</method-name>
- * <p/>
- * <method-params>
- * <p/>
- * <method-param>char</method-param>
- * <p/>
- * <method-param>int</method-param>
- * <p/>
- * <method-param>int[]</method-param>
- * <p/>
- * <method-param>mypackage.MyClass</method-param>
- * <p/>
- * <method-param>mypackage.MyClass[][]</method-param>
- * <p/>
- * </method-params> </method>
- * <p/>
- * <p/>
- * 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 defined in the remote interface.
- * <p/>
- * For example, the method element
- * <p/>
- * <p/>
- * <method>
- * <p/>
- * <ejb-name>EmployeeService</ejb-name>
- * <p/>
- * <method-intf>Remote</method-intf>
- * <p/>
- * <method-name>create</method-name>
- * <p/>
- * <method-params>
- * <p/>
- * <method-param>java.lang.String</method-param>
- * <p/>
- * <method-param>java.lang.String</method-param>
- * <p/>
- * </method-params> </method>
- * <p/>
- * <p/>
- * 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
- * <p/>
- * <p/>
- * <method>
- * <p/>
- * <ejb-name>EmployeeService</ejb-name>
- * <p/>
- * <method-intf>Home</method-intf>
- * <p/>
- * <method-name>create</method-name>
- * <p/>
- * <method-params>
- * <p/>
- * <method-param>java.lang.String</method-param>
- * <p/>
- * <method-param>java.lang.String</method-param>
- * <p/>
- * </method-params> </method>
- * <p/>
- * <p/>
- * <p/>
- * Java class for MethodElement complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MethodElement">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="enterpriseBean" type="{ejb.xmi}EnterpriseBean"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="enterpriseBean" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="parms" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="type" type="{ejb.xmi}MethodElementKind" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MethodElement", propOrder = {"enterpriseBeans",
-    "descriptions", "extensions"})
-public class MethodElement {
-
-    @XmlElement(name = "enterpriseBean")
-    protected List<EnterpriseBean> enterpriseBeans;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String enterpriseBean;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected String parms;
-    @XmlAttribute(name = "type")
-    protected MethodElementEnum methodElementType;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the enterpriseBeans 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 enterpriseBeans property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEnterpriseBeans().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EnterpriseBean }
-     */
-    public List<EnterpriseBean> getEnterpriseBeans() {
-        if (enterpriseBeans == null) {
-            enterpriseBeans = new ArrayList<EnterpriseBean>();
-        }
-        return this.enterpriseBeans;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the enterpriseBean property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEnterpriseBean() {
-        return enterpriseBean;
-    }
-
-    /**
-     * Sets the value of the enterpriseBean property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEnterpriseBean(final String value) {
-        this.enterpriseBean = 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 parms property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getParms() {
-        return parms;
-    }
-
-    /**
-     * Sets the value of the parms property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setParms(final String value) {
-        this.parms = value;
-    }
-
-    /**
-     * Gets the value of the methodElementType property.
-     *
-     * @return possible object is {@link MethodElementEnum }
-     */
-    public MethodElementEnum getMethodElementType() {
-        return methodElementType;
-    }
-
-    /**
-     * Sets the value of the methodElementType property.
-     *
-     * @param value allowed object is {@link MethodElementEnum }
-     */
-    public void setMethodElementType(final MethodElementEnum value) {
-        this.methodElementType = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * 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 must be the name
+ * of one of the enterprise beans in declared in the deployment descriptor; the
+ * optional method-intf element allows to distinguish between a method with the
+ * same signature that is defined in both the home and remote interface; the
+ * method-name element specifies the method name; and the optional method-params
+ * elements identify a
+ * <p/>
+ * single method among multiple methods with an overloaded method name.
+ * <p/>
+ * There are three possible styles of the method element syntax:
+ * <p/>
+ * 1. <method>
+ * <p/>
+ * <ejb-name>EJBNAME</ejb-name>
+ * <p/>
+ * <method-name>*</method-name>
+ * <p/>
+ * </method>
+ * <p/>
+ * <p/>
+ * This style is used to refer to all the methods of the specified enterprise
+ * bean's home and remote interfaces.
+ * <p/>
+ * <p/>
+ * 2. <method>
+ * <p/>
+ * <ejb-name>EJBNAME</ejb-name>
+ * <p/>
+ * <method-name>METHOD</method-name>
+ * <p/>
+ * </method>>
+ * <p/>
+ * This style is used to refer to the specified method of the specified
+ * enterprise bean. If there are multiple methods with
+ * <p/>
+ * the same overloaded name, the element of this style refers to all the methods
+ * with the overloaded name.
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p/>
+ * 3. <method>
+ * <p/>
+ * <ejb-name>EJBNAME</ejb-name>
+ * <p/>
+ * <method-name>METHOD</method-name>
+ * <p/>
+ * <method-params>
+ * <p/>
+ * <method-param>PARAM-1</method-param>
+ * <p/>
+ * <method-param>PARAM-2</method-param>
+ * <p/>
+ * ...
+ * <p/>
+ * <method-param>PARAM-n</method-param>
+ * <p/>
+ * </method-params> <method>
+ * <p/>
+ * <p/>
+ * 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 the method has no input arguments,
+ * the method-params element
+ * <p/>
+ * 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[][]).
+ * <p/>
+ * <p/>
+ * <p/>
+ * Used in: method-permission and container-transaction
+ * <p/>
+ * Examples:
+ * <p/>
+ * <p/>
+ * Style 1: The following method element refers to all the methods of the
+ * EmployeeService bean's home and remote interfaces:
+ * <p/>
+ * <p/>
+ * <method>
+ * <p/>
+ * <ejb-name>EmployeeService</ejb-name>
+ * <p/>
+ * <method-name>*</method-name>
+ * <p/>
+ * </method>
+ * <p/>
+ * <p/>
+ * Style 2: The following method element refers to all the create methods of the
+ * EmployeeService bean's home interface:
+ * <p/>
+ * <p/>
+ * <method>
+ * <p/>
+ * <ejb-name>EmployeeService</ejb-name>
+ * <p/>
+ * <method-name>create</method-name>
+ * <p/>
+ * </method>
+ * <p/>
+ * Style 3: The following method element refers to the create(String firstName,
+ * String LastName) method of the EmployeeService bean's home interface.
+ * <p/>
+ * <p/>
+ * <method>
+ * <p/>
+ * <ejb-name>EmployeeService</ejb-name>
+ * <p/>
+ * <method-name>create</method-name>
+ * <p/>
+ * <method-params>
+ * <p/>
+ * <method-param>java.lang.String</method-param>
+ * <p/>
+ * <method-param>java.lang.String</method-param>
+ * <p/>
+ * </method-params> </method>
+ * <p/>
+ * <p/>
+ * <p/>
+ * 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)
+ * <p/>
+ * would be specified as:
+ * <p/>
+ * <p/>
+ * <method>
+ * <p/>
+ * <ejb-name>EmployeeService</ejb-name>
+ * <p/>
+ * <method-name>foobar</method-name>
+ * <p/>
+ * <method-params>
+ * <p/>
+ * <method-param>char</method-param>
+ * <p/>
+ * <method-param>int</method-param>
+ * <p/>
+ * <method-param>int[]</method-param>
+ * <p/>
+ * <method-param>mypackage.MyClass</method-param>
+ * <p/>
+ * <method-param>mypackage.MyClass[][]</method-param>
+ * <p/>
+ * </method-params> </method>
+ * <p/>
+ * <p/>
+ * 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 defined in the remote interface.
+ * <p/>
+ * For example, the method element
+ * <p/>
+ * <p/>
+ * <method>
+ * <p/>
+ * <ejb-name>EmployeeService</ejb-name>
+ * <p/>
+ * <method-intf>Remote</method-intf>
+ * <p/>
+ * <method-name>create</method-name>
+ * <p/>
+ * <method-params>
+ * <p/>
+ * <method-param>java.lang.String</method-param>
+ * <p/>
+ * <method-param>java.lang.String</method-param>
+ * <p/>
+ * </method-params> </method>
+ * <p/>
+ * <p/>
+ * 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
+ * <p/>
+ * <p/>
+ * <method>
+ * <p/>
+ * <ejb-name>EmployeeService</ejb-name>
+ * <p/>
+ * <method-intf>Home</method-intf>
+ * <p/>
+ * <method-name>create</method-name>
+ * <p/>
+ * <method-params>
+ * <p/>
+ * <method-param>java.lang.String</method-param>
+ * <p/>
+ * <method-param>java.lang.String</method-param>
+ * <p/>
+ * </method-params> </method>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for MethodElement complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MethodElement">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="enterpriseBean" type="{ejb.xmi}EnterpriseBean"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="enterpriseBean" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="parms" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{ejb.xmi}MethodElementKind" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MethodElement", propOrder = {"enterpriseBeans",
+    "descriptions", "extensions"})
+public class MethodElement {
+
+    @XmlElement(name = "enterpriseBean")
+    protected List<EnterpriseBean> enterpriseBeans;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String enterpriseBean;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String parms;
+    @XmlAttribute(name = "type")
+    protected MethodElementEnum methodElementType;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the enterpriseBeans 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 enterpriseBeans property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEnterpriseBeans().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EnterpriseBean }
+     */
+    public List<EnterpriseBean> getEnterpriseBeans() {
+        if (enterpriseBeans == null) {
+            enterpriseBeans = new ArrayList<EnterpriseBean>();
+        }
+        return this.enterpriseBeans;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the enterpriseBean property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEnterpriseBean() {
+        return enterpriseBean;
+    }
+
+    /**
+     * Sets the value of the enterpriseBean property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEnterpriseBean(final String value) {
+        this.enterpriseBean = 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 parms property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getParms() {
+        return parms;
+    }
+
+    /**
+     * Sets the value of the parms property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setParms(final String value) {
+        this.parms = value;
+    }
+
+    /**
+     * Gets the value of the methodElementType property.
+     *
+     * @return possible object is {@link MethodElementEnum }
+     */
+    public MethodElementEnum getMethodElementType() {
+        return methodElementType;
+    }
+
+    /**
+     * Sets the value of the methodElementType property.
+     *
+     * @param value allowed object is {@link MethodElementEnum }
+     */
+    public void setMethodElementType(final MethodElementEnum value) {
+        this.methodElementType = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElementEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElementEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElementEnum.java
index 0735b8d..476c724 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElementEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElementEnum.java
@@ -1,73 +1,73 @@
-/**
- * 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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for MethodElementKind.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="MethodElementKind">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Unspecified"/>
- *     &lt;enumeration value="Remote"/>
- *     &lt;enumeration value="Home"/>
- *     &lt;enumeration value="Local"/>
- *     &lt;enumeration value="LocalHome"/>
- *     &lt;enumeration value="ServiceEndpoint"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum MethodElementEnum {
-
-    @XmlEnumValue("Unspecified")
-    UNSPECIFIED("Unspecified"), @XmlEnumValue("Remote")
-    REMOTE("Remote"), @XmlEnumValue("Home")
-    HOME("Home"), @XmlEnumValue("Local")
-    LOCAL("Local"), @XmlEnumValue("LocalHome")
-    LOCAL_HOME("LocalHome"), @XmlEnumValue("ServiceEndpoint")
-    SERVICE_ENDPOINT("ServiceEndpoint");
-    private final String value;
-
-    MethodElementEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static MethodElementEnum fromValue(final String v) {
-        for (final MethodElementEnum c : MethodElementEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for MethodElementKind.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="MethodElementKind">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Unspecified"/>
+ *     &lt;enumeration value="Remote"/>
+ *     &lt;enumeration value="Home"/>
+ *     &lt;enumeration value="Local"/>
+ *     &lt;enumeration value="LocalHome"/>
+ *     &lt;enumeration value="ServiceEndpoint"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum MethodElementEnum {
+
+    @XmlEnumValue("Unspecified")
+    UNSPECIFIED("Unspecified"), @XmlEnumValue("Remote")
+    REMOTE("Remote"), @XmlEnumValue("Home")
+    HOME("Home"), @XmlEnumValue("Local")
+    LOCAL("Local"), @XmlEnumValue("LocalHome")
+    LOCAL_HOME("LocalHome"), @XmlEnumValue("ServiceEndpoint")
+    SERVICE_ENDPOINT("ServiceEndpoint");
+    private final String value;
+
+    MethodElementEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static MethodElementEnum fromValue(final String v) {
+        for (final MethodElementEnum c : MethodElementEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java
index 2860b80..45b1ca9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java
@@ -1,411 +1,411 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.common.SecurityRole;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The method-permission element specifies that one or more security roles are
- * allowed to invoke one or more enterprise bean methods. The method-permission
- * element consists of an optional description, a list of security role names,
- * and a list of method elements. The security roles used in the
- * method-permission element must be defined in the security-role element of the
- * deployment descriptor, and the methods must be methods defined in the
- * enterprise bean's remote and/or home interfaces.
- * <p/>
- * <p/>
- * <p/>
- * Java class for MethodPermission complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MethodPermission">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="roles" type="{common.xmi}SecurityRole"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="methodElements" type="{ejb.xmi}MethodElement"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="roles" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="unchecked" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MethodPermission", propOrder = {"roles", "methodElements",
-    "descriptions", "extensions"})
-public class MethodPermission {
-
-    protected List<SecurityRole> roles;
-    protected List<MethodElement> methodElements;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute(name = "roles")
-    protected String rolesString;
-    @XmlAttribute
-    protected Boolean unchecked;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the roles 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 roles property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getRoles().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SecurityRole }
-     */
-    public List<SecurityRole> getRoles() {
-        if (roles == null) {
-            roles = new ArrayList<SecurityRole>();
-        }
-        return this.roles;
-    }
-
-    /**
-     * Gets the value of the methodElements 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 methodElements property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMethodElements().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MethodElement }
-     */
-    public List<MethodElement> getMethodElements() {
-        if (methodElements == null) {
-            methodElements = new ArrayList<MethodElement>();
-        }
-        return this.methodElements;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the rolesString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getRolesString() {
-        return rolesString;
-    }
-
-    /**
-     * Sets the value of the rolesString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setRolesString(final String value) {
-        this.rolesString = value;
-    }
-
-    /**
-     * Gets the value of the unchecked property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isUnchecked() {
-        return unchecked;
-    }
-
-    /**
-     * Sets the value of the unchecked property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setUnchecked(final Boolean value) {
-        this.unchecked = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.common.SecurityRole;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The method-permission element specifies that one or more security roles are
+ * allowed to invoke one or more enterprise bean methods. The method-permission
+ * element consists of an optional description, a list of security role names,
+ * and a list of method elements. The security roles used in the
+ * method-permission element must be defined in the security-role element of the
+ * deployment descriptor, and the methods must be methods defined in the
+ * enterprise bean's remote and/or home interfaces.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for MethodPermission complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MethodPermission">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="roles" type="{common.xmi}SecurityRole"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="methodElements" type="{ejb.xmi}MethodElement"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="roles" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="unchecked" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MethodPermission", propOrder = {"roles", "methodElements",
+    "descriptions", "extensions"})
+public class MethodPermission {
+
+    protected List<SecurityRole> roles;
+    protected List<MethodElement> methodElements;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute(name = "roles")
+    protected String rolesString;
+    @XmlAttribute
+    protected Boolean unchecked;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the roles 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 roles property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getRoles().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SecurityRole }
+     */
+    public List<SecurityRole> getRoles() {
+        if (roles == null) {
+            roles = new ArrayList<SecurityRole>();
+        }
+        return this.roles;
+    }
+
+    /**
+     * Gets the value of the methodElements 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 methodElements property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMethodElements().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MethodElement }
+     */
+    public List<MethodElement> getMethodElements() {
+        if (methodElements == null) {
+            methodElements = new ArrayList<MethodElement>();
+        }
+        return this.methodElements;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the rolesString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getRolesString() {
+        return rolesString;
+    }
+
+    /**
+     * Sets the value of the rolesString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setRolesString(final String value) {
+        this.rolesString = value;
+    }
+
+    /**
+     * Gets the value of the unchecked property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isUnchecked() {
+        return unchecked;
+    }
+
+    /**
+     * Sets the value of the unchecked property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setUnchecked(final Boolean value) {
+        this.unchecked = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}


[49/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/main/resources/org/apache/openejb/config/rules/Messages_hi.properties
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/org/apache/openejb/config/rules/Messages_hi.properties b/container/openejb-core/src/main/resources/org/apache/openejb/config/rules/Messages_hi.properties
index e261afa..919c195 100644
--- a/container/openejb-core/src/main/resources/org/apache/openejb/config/rules/Messages_hi.properties
+++ b/container/openejb-core/src/main/resources/org/apache/openejb/config/rules/Messages_hi.properties
@@ -1,856 +1,856 @@
-#
-# 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.
-#
-
-# Format for the different levels follows this spirit:
-#
-# 1. Should be short and fixed such that someone could search/grep for it
-#    without having to know/use regular expressions.  These tend to be similar
-#    to the message key.
-#
-# 2. Intended to contain the issue expressed in 1 with only the essential
-#    details, should not line wrap if possible.  Be terse.
-#
-# 3. Teacher's assistant.  A much more conversational and possibly more detailed
-#    explanation of the issue, should tell the user what to do to fix the problem.
-#    I.e. don't just point out what is wrong, also point out what is right.  Use
-#    several lines if needed.
-#
-
-
-# 0 - Error Message
-# 1 - Stack Trace
-1.cannot.validate        \u091c\u093e\u0930 \u0915\u094b \u092e\u093e\u0928\u094d\u092f \u0928\u0939\u0940\u0902 \u0915\u0930 \u0938\u0915\u0924\u0947
-2.cannot.validate        \u091c\u093e\u0930 \u0915\u094b \u092e\u093e\u0928\u094d\u092f \u0928\u0939\u0940\u0902 \u0915\u0930 \u0938\u0915\u0924\u0947: {0}
-3.cannot.validate        \u091c\u093e\u0930 \u0915\u094b \u092e\u093e\u0928\u094d\u092f \u0928\u0939\u0940\u0902 \u0915\u0930 \u0938\u0915\u0924\u0947: {0}
-
-# 0 - Class name
-# 1 - Element (home, ejb-class, remote)
-# 2 - Bean name
-1.missing.class           \u0932\u093e\u092a\u0924\u093e \u0915\u094d\u0932\u093e\u0938
-2.missing.class           \u0932\u093e\u092a\u0924\u093e \u0915\u094d\u0932\u093e\u0938 <{1}> {0}
-3.missing.class           \u0915\u094d\u0932\u093e\u0938 {0} \u0928\u0939\u0940\u0902 \u092e\u093f\u0932\u0940 . \u091c\u093e\u0902\u091a \u0915\u0930\u0947\u0902 \u0915\u0940 \u092c\u0940\u0928 {2} \u0915\u0947 {1} \u090f\u0932\u0947\u092e\u0947\u0928\u094d\u091f \u092e\u0947\u0902 \u0928\u093f\u0930\u094d\u0926\u093f\u0937\u094d\u091f \u0915\u094d\u0932\u093e\u0938 \u0915\u0940 \u0935\u0930\u094d\u0924\u0928\u0940 \u0920\u0940\u0915 \u0939\u0948 \u0914\u0930 \u0915\u094d\u0932\u093e\u0938 \u091c\u0930 \u092e\u0947\u0902 \u092e\u094c\u091c\u0942\u0926 \u0939\u0948 
-
-# 0 - Class name
-# 1 - EJB Class name
-1.wrong.class.type        \u0917\u0932\u0924 \u092a\u094d\u0930\u0915\u093e\u0930 \u0915\u0940 \u0915\u094d\u0932\u093e\u0938
-2.wrong.class.type        \u0917\u0932\u0924 \u092a\u094d\u0930\u0915\u093e\u0930 \u0915\u0940 \u0915\u094d\u0932\u093e\u0938 {0}
-3.wrong.class.type        \u0915\u094d\u0932\u093e\u0938 {0 } \u0917\u0932\u0924 \u092a\u094d\u0930\u0915\u093e\u0930 \u0915\u0940 \u0939\u0948, \u092f\u0939 {1 } \u0915\u094b \u090f\u0915\u094d\u0938\u091f\u0947\u0902\u0921 \u0928\u0939\u0940\u0902 \u0915\u0930\u0924\u0940
-# 0 - method name
-# 1 - full method
-# 2 - remote|home
-# 3 - interface name
-# 4 - EJB Class name
-1.no.busines.method       \u0910\u0938\u093e \u0915\u094b\u0908 \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921 \u0928\u0939\u0940\u0902
-2.no.busines.method       \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921 {0 } \u0907\u092e\u094d\u092a\u094d\u0932\u0947\u092e\u0947\u0902\u091f \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u0917\u092f\u093e .
-3.no.busines.method       \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921 {1 } \u0907\u092e\u094d\u092a\u094d\u0932\u0947\u092e\u0947\u0902\u091f(\u0932\u093e\u0917\u0942) \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u0917\u092f\u093e . \u092f\u0939 \u092e\u0947\u0925\u0921 {2 } \u0907\u0902\u091f\u0930\u092b\u0947\u0938 {3 } \u092e\u0947\u0902 \u0918\u094b\u0937\u093f\u0924 \u0915\u093f\u092f\u093e \u0917\u092f\u093e \u0925\u093e \u0932\u0947\u0915\u093f\u0928 \u0908.\u091c.\u092c\u0940 \u0915\u094d\u0932\u093e\u0938 \u092e\u0947\u0902 \u0907\u092e\u094d\u092a\u094d\u0932\u0947\u092e\u0947\u0902\u091f(\u0932\u093e\u0917\u0942) \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u0917\u092f\u093e 
-
-# fail(b, "no.busines.method.args", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local", intrface.getName(), beanClass.getName(), differentArgs.size());
-1.no.busines.method.args       \u0910\u0938\u093e \u0915\u094b\u0908 \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921  \u0928\u0939\u0940\u0902 \u0939\u0948. \u0917\u0932\u0924 \u0906\u0930\u094d\u0917\u0941\u092e\u0947\u0902\u091f\u094d\u0938 \u0907\u0938\u094d\u0924\u0947\u092e\u093e\u0932 \u0915\u093f\u092f\u0947 \u0939\u0948 .
-2.no.busines.method.args       \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921 {0 } \u0915\u0947 \u0906\u0930\u094d\u0917\u0941\u092e\u0947\u0902\u091f\u094d\u0938 \u092e\u0948\u091a \u0928\u0939\u0940\u0902 \u0915\u0930\u0924\u0947 .
-3.no.busines.method.args       Business method {1} not implemented. The method was declared in the {2} interface {3}, but not implemented in the ejb class {4}.  There are {5} method that have the same name but different arguments.
-
-# fail(b, "no.busines.method.case", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local", intrface.getName(), beanClass.getName(), differentCase.size());
-1.no.busines.method.case       No such business method.  Possible case-sensitive mismatch.
-2.no.busines.method.case       Business method {0} not implemented.  Possible case-sensitive mismatch.
-3.no.busines.method.case       Business method {1} not implemented. The method was declared in the {2} interface {3}, but not implemented in the ejb class {4}.  There are {5} method that have the same name but using a different case.
-
-# 0 - home interface
-# 1 - remote interface
-1.no.home.create          No create method.
-2.no.home.create          No create method in {0}.
-3.no.home.create          The home interface {0} must declare at least one create method. Example:\n\n\tpublic {1} create() throws javax.ejb.CreateException, java.rmi.RemoteException;
-
-# 1 - EJB Class name
-# 2 - create name
-# 3 - create params
-1.session.no.ejb.create     Create method not implemented.
-2.session.no.ejb.create     Create method not implemented: {1}({2}).
-3.session.no.ejb.create     There should be a create method in the bean class {0} with the following signature:\n\n\tpublic void {1}({2}) throws javax.ejb.CreateException
-
-# 1 - EJB Class name
-# 2 - create name
-# 3 - primary key class
-# 4 - create params
-1.entity.no.ejb.create    Create method not implemented.
-2.entity.no.ejb.create    Create method not implemented: {2}({3}).
-3.entity.no.ejb.create    There should be a create method in the bean class {0} with the following signature:\n\n\tpublic {1} {2}({3}) throws javax.ejb.CreateException
-
-#This is being used in a method which is not called by any other method -- commenting out for now
-# 1 - EJB Class name
-# 2 - create name
-# 3 - create params
-#1.no.ejb.post.create      No ejbPostCreate method
-#2.no.ejb.post.create      Missing create method: {1}({2})
-#3.no.ejb.post.create      Entity create method with no matching ejbPostCreate.  There should be an ejbPostCreate method in the bean class {0} with the following signature:\n\n\tpublic void {1}({2}) throws javax.ejb.CreateException
-
-# warn(b, "unused.ejb.create", b.getEjbClass(), ejbCreate.getName(), paramString, create.toString());
-1.unused.ejb.create       Unused ejbCreate method
-2.unused.ejb.create       Unused ejbCreate method: {1}({2})
-3.unused.ejb.create       Create method will never be called.  The bean class {0} defines the create method {1}({2}), but there is no matching {3}({2}) method in the home or local-home interfaces.
-
-# warn(b, "unused.ejbPostCreate", b.getEjbClass(), postCreate.getName(), paramString, ejbCreate.toString());
-1.unused.ejbPostCreate       Unused ejbPostCreate method
-2.unused.ejbPostCreate       Unused ejbPostCreate method: {1}({2})
-3.unused.ejbPostCreate       PostCreate method will never be called.  The bean class {0} defines the create method {1}({2}), but there is no matching {3}({2}) method defined in the bean class.
-
-
-# 0 - Class name
-# 1 - Element (home, ejb-class, remote)
-# 2 - Bean name
-# 3 - Dependent Class name
-1.misslocated.class           Misslocated class
-2.misslocated.class           Misslocated class {0}
-3.misslocated.class           The class {0} was found in a parent classloader and was loaded from there rather than this jar.  However, a dependent class {3} was not found in the parent classloader.  \n\nThere are two ways to fix this:\n\nOne, remove the class {0} from the jar in the parent classloader to ensure the class is only loaded from this jar.\n\nTwo, move the dependent class {3} and any other dependent classes into the jar in the parent classloader.
-
-# 0 - Referring Class name
-# 1 - Dependent Class name
-# 2 - Element (home, ejb-class, remote)
-# 3 - Bean name
-# fail(b, "missing.dependent.class", className, missingClass, type, b.getEjbName());
-1.missing.dependent.class           Missing dependent class or library
-2.missing.dependent.class           Missing dependent class or library: {1} needed by {0}
-3.missing.dependent.class           The class {1} not found and is referenced by the <{2}> class {0}.  The Check that the class or related library is available in the classpath
-
-
-# CheckAssemblyBindings.java
-# fail("InterceptorBinding", "interceptorBinding.noSuchEjbName", binding.getEjbName(), join(interceptorClasses, ","));
-1.interceptorBinding.noSuchEjbName = Referenced EJB does not exist
-2.interceptorBinding.noSuchEjbName = Referenced EJB does not exist: {0}
-3.interceptorBinding.noSuchEjbName = Binding refers to an EJB, {0}, that does not exist.  Interceptors listed in binding: {1}
-
-# fail("InterceptorBinding", "interceptorBinding.ejbNameRequiredWithMethod", binding.getMethod().getMethodName(), join(interceptorClasses, ","));
-1.interceptorBinding.ejbNameRequiredWithMethod = ejb-name required with method binding
-2.interceptorBinding.ejbNameRequiredWithMethod = ejb-name required with binding on method "{0}".
-3.interceptorBinding.ejbNameRequiredWithMethod = Binding an interceptor to a specific method requires the ejb-name of the bean to also be specified.  Fix binding on method "{0}" for interceptors {1}.
-
-# fail("MethodPermission", "methodPermission.ejbNameRequired", method.getMethodName(), join(permission.getRoleName(), ","));
-1.methodPermission.ejbNameRequired =  ejb-name required for method-permission
-2.methodPermission.ejbNameRequired =  ejb-name required for method-permission: {0}
-3.methodPermission.ejbNameRequired =  Assinging a method-permission requires the ejb-name of the bean to also be specified.  Fix method-permission on method "{0}" for security roles {1}.
-
-# fail("MethodPermission", "methodPermission.noSuchEjbName", method.getEjbName(), method.getMethodName(), join(permission.getRoleName(), ","));
-1.methodPermission.noSuchEjbName = Referenced EJB does not exist
-2.methodPermission.noSuchEjbName = Referenced EJB does not exist: {0} on method "{1}".
-3.methodPermission.noSuchEjbName = Method-permission refers to an EJB, {0}, that does not exist.  Fix method-permission on method "{0}" for security roles {1}.
-
-# fail("ContainerTransaction", "containerTransaction.ejbNameRequired", method.getMethodName(), transaction.getTransAttribute());
-1.containerTransaction.ejbNameRequired = ejb-name required for container-transaction
-2.containerTransaction.ejbNameRequired = ejb-name required for container-transaction: {0}
-3.containerTransaction.ejbNameRequired = Assinging a container-transaction requires the ejb-name of the bean to also be specified.  Fix container-transaction on method "{0}" with transaction attribute {1}.
-
-# fail("ContainerTransaction", "containerTransaction.noSuchEjbName", method.getMethodName(), method.getEjbName(), transaction.getTransAttribute());
-1.containerTransaction.noSuchEjbName = Referenced EJB does not exist
-2.containerTransaction.noSuchEjbName = Referenced EJB does not exist: {0} on method "{1}".
-3.containerTransaction.noSuchEjbName = Container-transaction refers to an EJB, {0}, that does not exist.  Fix container-transaction on method "{0}" with transaction attribute {1}.
-
-# CheckCallbacks.java
-# fail(componentName, "aroundInvoke.badReturnType", aroundType, aroundInvoke.getMethodName(), returnType.getName(), aroundInvoke.getClassName());
-1.aroundInvoke.badReturnType = {0} method must return java.lang.Object
-2.aroundInvoke.badReturnType = {0} method must return java.lang.Object: method "{1}" returns "{2}"
-3.aroundInvoke.badReturnType = {0} method "{1}" in class {3} illegally returns {2} instead of java.lang.Object.  Change the method signature to "java.lang.Object {1}(javax.ejb.InvocationContext) throws java.lang.Exception"
-
-# fail(componentName, "aroundInvoke.mustThrowException", aroundType, aroundInvoke.getMethodName(), aroundInvoke.getClassName());
-1.aroundInvoke.mustThrowException = {0} method must declare 'throws Exception'
-2.aroundInvoke.mustThrowException = {0} method must declare 'throws Exception': method "{1}"
-3.aroundInvoke.mustThrowException = {0} method "{1}" must declare java.lang.Exception in the throws clause.  Change the method signature to "java.lang.Object {1}(javax.ejb.InvocationContext) throws java.lang.Exception"
-
-# fail(componentName, "aroundInvoke.missing", aroundType, aroundInvoke.getMethodName(), aroundInvoke.getClassName());
-1.aroundInvoke.missing = {0} method missing
-2.aroundInvoke.missing = {0} method missing: "{1}" in class {2}
-3.aroundInvoke.missing = {0} method "{1}" not found in class {2}.  The required method signature is "java.lang.Object {1}(javax.ejb.InvocationContext) throws java.lang.Exception"
-
-# fail(componentName, "aroundInvoke.invalidArguments", aroundType, aroundInvoke.getMethodName(), getParameters(possibleMethods.get(0)), aroundInvoke.getClassName());
-1.aroundInvoke.invalidArguments = Invalid {0} arguments
-2.aroundInvoke.invalidArguments = Invalid {0} arguments: {1}({2})
-3.aroundInvoke.invalidArguments = {0} method signature "{1}({2})" in class {3} has invalid arguments.  The required method signature is "java.lang.Object {1}(javax.ejb.InvocationContext) throws java.lang.Exception"
-
-# fail(componentName, "aroundInvoke.missing.possibleTypo", aroundType, aroundInvoke.getMethodName(), possibleMethods.size(), aroundInvoke.getClassName());
-1.aroundInvoke.missing.possibleTypo = {0} method missing or invalid
-2.aroundInvoke.missing.possibleTypo = {0} method missing or invalid: looked for "{1}(javax.ejb.InvocationContext)" in class {3}
-3.aroundInvoke.missing.possibleTypo = {0} method missing or invalid.  There are {2} methods with the name "{1}" visible in class {3}, none have the required signature of "java.lang.Object {1}(javax.ejb.InvocationContext) throws java.lang.Exception"
-
-# fail(bean, "callback.badReturnType", type, callback.getMethodName(), returnType.getName(), callback.getClassName());
-1.callback.badReturnType = {0} method must return 'void'
-2.callback.badReturnType = {0} method must return 'void': method {1} returns {2}
-3.callback.badReturnType = {0} method "{1}" in class {3} illegally returns {2} instead of void.  Change the method signature to "void {1}()"
-
-# fail(bean, "callback.badModifier", type, callback.getMethodName(), callback.getClassName());
-1.callback.badModifier = {0} method must not be final and static
-2.callback.badModifier = {0} method must not be final and static : method {1}
-3.callback.badModifier = {0} method "{1}" in class {2} must not be final and static
-
-# fail(bean, "callback.missing", type, callback.getMethodName(), callback.getClassName());
-1.callback.missing = {0} method missing
-2.callback.missing = {0} method missing: "{1}" in class {2}
-3.callback.missing = {0} method "{1}" not found in class {2}.  The required method signature is "void {1}()"
-
-# fail(bean, "callback.invalidArguments", type, callback.getMethodName(), getParameters(possibleMethods.get(0)), callback.getClassName());
-1.callback.invalidArguments = Invalid {0} arguments
-2.callback.invalidArguments = Invalid {0} arguments. Found: {1}({2}). Required: {1}({4}) 
-3.callback.invalidArguments = {0} method signature "{1}({2})" in class {3} has invalid arguments.  The required method signature is "void {1}(4)"
-
-# fail(bean, "callback.missing.possibleTypo", type, callback.getMethodName(), possibleMethods.size(), callback.getClassName());
-1.callback.missing.possibleTypo = {0} method missing or invalid
-2.callback.missing.possibleTypo = {0} method missing or invalid: looked for "void {1}({4})" in class {3}
-3.callback.missing.possibleTypo = {0} method missing or invalid.  There are {2} methods with the name "{1}" visible in class {3}, none have the required signature of "void {1}(4)"
-
-# fail(bean, "callback.sessionSynchronization.invalidUse", class)
-1.callback.sessionSynchronization.invalidUse = Session synchronization annotations and configurations in deployment plan should not be used while SessionSynchronization interface is implemented by the bean class.
-2.callback.sessionSynchronization.invalidUse = Session synchronization annotations and configurations in deployment plan should not be used while SessionSynchronization interface is implemented by the bean class {0}.
-3.callback.sessionSynchronization.invalidUse = Session synchronization annotations and configurations in deployment plan should not be used while SessionSynchronization interface is implemented by the bean class {0}.
-
-# fail(bean, "callback.missing.possibleTypo", type, callback.getMethodName(), possibleMethods.size(), callback.getClassName());
-1.callback.sessionbean.invalidusage = Invalid usage of @{0} in a class which implements javax.ejb.SessionBean
-2.callback.sessionbean.invalidusage = Invalid usage of @{0} in a class which implements javax.ejb.SessionBean
-3.callback.sessionbean.invalidusage = Invalid usage of @{0} in {2} which implements javax.ejb.SessionBean. @{0} was wrongly used on the method {1}(). The usage would have been correct if {2} did not implement javax.ejb.SessionBean.
-
-# fail(bean, "timeout.badReturnType", callback.getMethodName(), returnType.getName());
-1.timeout.badReturnType = Timeout method must return 'void'
-2.timeout.badReturnType = Timeout method must return 'void': method {0} returns {1}
-3.timeout.badReturnType = Timeout method "{0}" illegally returns {1} instead of void.  Change the method signature to "void {0}(javax.ejb.Timer)"
-
-#Don't think this is ever going to be used, commenting it out for now. If there is a case where this key can be used, please uncomment it and write a test for it
-# fail(bean, "timeout.missing", timeout.getMethodName());
-#1.timeout.missing = Timeout method missing
-#2.timeout.missing = Timeout method missing: "{0}" in class {1}
-#3.timeout.missing = Timeout method "{0}" not found in class {1}.  The required method signature is "void {0}(javax.ejb.Timer)"
-
-# fail(bean, "timeout.invalidArguments", timeout.getMethodName(), getParameters(possibleMethods.get(0)));
-1.timeout.invalidArguments = Invalid Timeout arguments
-2.timeout.invalidArguments = Invalid Timeout arguments: {0}({1})
-3.timeout.invalidArguments = Timeout method signature "{0}({1})" has invalid arguments.  The required method signature is "void {0}(javax.ejb.Timer)"
-
-# fail(bean, "timeout.missing.possibleTypo", timeout.getMethodName(), possibleMethods.size());
-1.timeout.missing.possibleTypo = Timeout method missing or invalid
-2.timeout.missing.possibleTypo = Timeout method missing or invalid: looked for "void {0}(javax.ejb.Timer)"
-3.timeout.missing.possibleTypo = Timeout method missing or invalid.  There are {1} methods with the name "{0}" visible, either the wrong one has been annotated with @Timeout or none have the required signature of "void {0}(javax.ejb.Timer). A bean should have only one method annotated with @Timeout and the method signature must match void {0}(javax.ejb.Timer)"
-
-# fail(componentName,"timeout.tooManyMethods",timeoutMethods.size(),Join.join(",", timeoutMethods));
-1.timeout.tooManyMethods = More than one method annotated with @Timeout
-2.timeout.tooManyMethods = More than one method annotated with @Timeout
-3.timeout.tooManyMethods = More than one method annotated with @Timeout.  There are {0} methods annotated with @Timeout. Make sure you have only one method annotated with @Timeout. Methods annotated with @Timeout are {1}
-# fail("Interceptor", "interceptor.callback.badReturnType", type, callback.getMethodName(), returnType.getName(), interceptorClass.getName());
-1.interceptor.callback.badReturnType = {0} method must return "void"
-2.interceptor.callback.badReturnType = {0} method must return "void": method {2} returns {3} instead
-3.interceptor.callback.badReturnType = method "{2}" in class {0} illegally returns {3} instead of void.  Change the method signature to "void {2}(javax.ejb.InvocationContext)"
-
-# fail("Interceptor", "interceptor.callback.missing", type, callback.getMethodName(), interceptorClass.getName());
-1.interceptor.callback.missing = {0} method missing
-2.interceptor.callback.missing = {0} method missing: "{1}" in class {2}
-3.interceptor.callback.missing = {0} method "{1}" not found in class {2}.  The required method signature is "void {1}(javax.ejb.InvocationContext)"
-
-# fail("Interceptor", "interceptor.callback.invalidArguments", type, callback.getMethodName(), getParameters(possibleMethods.get(0)), interceptorClass.getName());
-1.interceptor.callback.invalidArguments = Invalid {0} arguments
-2.interceptor.callback.invalidArguments = Invalid {0} arguments: {1}({2}) in class {3}
-3.interceptor.callback.invalidArguments = {0} method signature "{1}({2})" in class {3} has invalid arguments.  The required method signature is "void {1}(javax.ejb.InvocationContext)"
-
-# fail("Interceptor", "interceptor.callback.missing.possibleTypo", type, callback.getMethodName(), possibleMethods.size(), interceptorClass.getName());
-1.interceptor.callback.missing.possibleTypo = {0} method missing or invalid
-2.interceptor.callback.missing.possibleTypo = {0} method missing or invalid: looked for "void {1}(javax.ejb.InvocationContext)" in class {3}
-3.interceptor.callback.missing.possibleTypo = {0} method missing or invalid.  There are {2} methods with the name "{1}" visible in class {3}, none have the required signature of "void {1}()"
-
-#CheckAssemblyBindings.java
-# warn("Interceptors", "interceptor.unused", clazz);
-1.interceptor.unused = {0} is not intercepting any bean
-2.interceptor.unused = {0} is not intercepting any bean. It should be used in one of the interceptor-binding elements of the deployment descriptor.
-3.interceptor.unused = {0} is not intercepting any bean. It should be used in one of the interceptor-binding elements of the deployment descriptor. An example usage might be:\r\n\
-<interceptor-binding>\r\n\
-\u0020\u0020<ejb-name>Your ejb name here</ejb-name>\r\n\
-\u0020\u0020<interceptor-class>{0}</interceptor-class>\r\n\
-<interceptor-binding>
-
-# CheckInjectionTargets.java
-# warn(bean, "injectionTarget.nameContainsSet", target.getInjectionTargetName(), shortNameInvalid, shortNameCorrect, correctName, reference.getName(), reference.getClass().getSimpleName());
-1.injectionTarget.nameContainsSet = Corrected invalid injection-target-name
-2.injectionTarget.nameContainsSet = Corrected invalid injection-target-name: {0}
-3.injectionTarget.nameContainsSet = The injection-target-name "{0}" for setter methods should not begin with "set".  The last portion of the name "{1}" has been automatically corrected to "{2}".  Update the descriptor with the correct injection-target-name of "{3}" to avoid receiving this warning.  Resource to be injected is "{4}".
-
-# fail("Asynchronous", "asynchronous.badReturnType", asyncMethod.getMethodName(), returnType.getName(), beanClass.getName());
-1.asynchronous.badReturnType = asynchronous method must return "void" or "Future<V>"
-2.asynchronous.badReturnType = asynchronous} method must return "void" or "Future<V>" : method {0} returns {1} in class {2}
-3.asynchronous.badReturnType = asynchronous method "{0}" in class {2} illegally returns {1} instead of void or Future<V>.  Change the method signature to "void|Future<V> {0}(...)"
-
-# fail("Asynchronous", "asynchronous.missing", asyncMethod.getMethodName(), beanClass.getName(), getParamters(asyncMethod));
-1.asynchronous.missing = asynchronous method {0} missing
-2.asynchronous.missing = asynchronous method missing: "{0}" in class {1}
-3.asynchronous.missing = asynchronous method "{1}" not found in class {1}.  The required method signature is "void|Future<V> {0}({2})"
-
-# fail("Asynchronous", "asynchronous.missing", asyncMethod.getMethodName(), beanClass.getName(), getParamters(asyncMethod));
-1.asynchronous.badExceptionType = asynchronous method {0} should not throw any ApplicationException while its return type is void.
-2.asynchronous.badExceptionType = asynchronous method {0} in class {1} should not throw any ApplicationException while its return type is void.
-3.asynchronous.badExceptionType = asynchronous method {0} in class {1} should not throw ApplicationException "{2}" while its return type is void.
-
-# warn("Asynchronous", "asynchronous.methodignored", beanClass.getName(), methodName);
-1.asynchronous.methodignored = non-public method {1} in class {0} is ignored, although the class is annoated with @Asynchronous
-2.asynchronous.methodignored = non-public method {1} in class {0} is ignored, although the class is annoated with @Asynchronous
-3.asynchronous.methodignored = non-public method {1} in class {0} is ignored, although the class is annoated with @Asynchronous
-
-# AnnotationDeployer.java
-# warn("client.missingMainClass", className)
-# fail("client.missingMainClass", className)
-1.client.missingMainClass = Missing Main-Class
-2.client.missingMainClass = Missing Main-Class: {0}
-3.client.missingMainClass = The Main-Class {0} specified in the MANIFEST.MF file does not exist in the jar.
-
-# fail(ejbName, "xml.localRemote.conflict", interfce);
-1.xml.localRemote.conflict = Interface illegally declared as both <business-local> and <business-remote>.
-2.xml.localRemote.conflict = Interface illegally declared as both <business-local> and <business-remote>: {0}
-3.xml.localRemote.conflict = When declaring business interface as <business-local> in an ejb-jar.xml file, the same interface cannot be listed as <business-remote>.  Revise the declaration of business interface "{0}" so that it is either local or remote, not both.
-
-# fail(ejbName, "xml.localRemote.conflict", interfce);
-1.ann.localRemote.generalconflict = Interface illegally declared as both local and remote in some combination of xml and annotations.
-2.ann.localRemote.generalconflict = Interface illegally declared as both local and remote in some combination of xml and annotations: {0}
-3.ann.localRemote.generalconflict = When declaring business interface as local in xml or annotations, the same interface cannot be listed as remote.  Revise the declaration of business interface "{0}" so that it is either local or remote, not both.
-
-# fail(ejbName, "ann.remote.noAttributes", join(", ", interfaces));
-1.ann.remote.noAttributes = Ambiguous @Remote() usage on bean class
-2.ann.remote.noAttributes = Ambiguous @Remote() usage on bean class.  Must list interfaces explicitly in annotation.
-3.ann.remote.noAttributes = When annotating a bean class as @Remote with no annotation attributes, the bean must implement exactly one business interface, no more and no less.  List the remote interfaces explicitly in the annotation, such as @Remote('{'{0}'}').  Alternatively, apply the @Remote annotation to the individual interfaces and remove it from the bean class.
-
-#This one is the same as ann.localremote.ambiguous -- commenting it out for now
-# fail(ejbName, "ann.remoteLocal.ambiguous", join(", ", interfaces));
-#1.ann.remoteLocal.ambiguous = Ambiguous @Remote and @Local usage on bean class.
-#2.ann.remoteLocal.ambiguous = Ambiguous @Remote and @Local usage on bean class.  Must list interfaces explicitly in @Remote annotation.
-#3.ann.remoteLocal.ambiguous = When annotating a bean class as @Remote with no annotation attributes you must not also annotate it with @Local with no attributes.  List the remote interfaces explicitly in the annotation, such as @Remote(\{{0}\}).  Alternatively, apply the @Remote annotation to the individual interfaces and remove it from the bean class.
-
-# This one is not used anywhere in code and is the same as ann.localRemote.conflict -- commenting it out for now
-# fail(ejbName, "ann.remoteLocal.conflict", join(", ", interfaces));
-#1.ann.remoteLocal.conflict = @Remote annotation in bean class conflicts with @Local in interface.
-#2.ann.remoteLocal.conflict = @Remote annotation in bean class conflicts with @Local in interface "{0}".
-#3.ann.remoteLocal.conflict = When annotating a bean class as @Remote, the corresponding business interfaces cannot be annotated with @Local.  Revise the business interface "{0}".
-
-# fail(ejbName, "ann.local.noAttributes", join(", ", interfaces));
-1.ann.local.noAttributes = Ambiguous @Local() usage on bean class
-2.ann.local.noAttributes = Ambiguous @Local() usage on bean class.  Must list interfaces explicitly in annotation.
-3.ann.local.noAttributes = When annotating a bean class as @Local with no annotation attributes, the bean must implement exactly one business interface, no more and no less.  List the local interfaces explicitly in the annotation, such as @Local('{'{0}'}').  Alternatively, apply the @Local annotation to the individual interfaces and remove it from the bean class.
-
-# fail(ejbName, "ann.localRemote.ambiguous", join(", ", interfaces));
-1.ann.localRemote.ambiguous = Ambiguous @Local and @Remote usage on bean class.
-2.ann.localRemote.ambiguous = Ambiguous @Local and @Remote usage on bean class.  Must list interfaces explicitly in @Local annotation.
-3.ann.localRemote.ambiguous = When annotating a bean class as @Local with no annotation attributes you must not also annotate it with @Remote.  List the local interfaces explicitly in the annotation, such as @Local('{'{0}'}').  Alternatively, apply the @Local annotation to the individual interfaces and remove it from the bean class.
-
-# fail(ejbName, "ann.localRemote.conflict", join(", ", interfaces));
-1.ann.localRemote.conflict = @Local annotation in bean class conflicts with @Remote in interface.
-2.ann.localRemote.conflict = @Local annotation in bean class conflicts with @Remote in interface "{0}".
-3.ann.localRemote.conflict = When annotating a bean class as @Local, the corresponding business interfaces cannot be annotated with @Remote.  Revise the business interface "{0}".
-
-# fail(ejbName, "ann.remoteOrLocal.ejbHome", annotationName, interfce.getName());
-1.ann.remoteOrLocal.ejbHome = @{0} used in bean class lists a javax.ejb.EJBHome interface.
-2.ann.remoteOrLocal.ejbHome = @{0} used in bean class lists a javax.ejb.EJBHome interface. Use @RemoteHome({1})
-3.ann.remoteOrLocal.ejbHome = When applied to a bean class, the @{0} annotation must only list business interfaces and cannot list legacy EJBHome interfaces.  EJBHome interfaces can be annotated on the bean class with @RemoteHome({1})
-
-# fail(ejbName, "ann.remoteOrLocal.ejbLocalHome", annotationName, interfce.getName());
-1.ann.remoteOrLocal.ejbLocalHome = @{0} used in bean class lists a javax.ejb.EJBLocalHome interface.
-2.ann.remoteOrLocal.ejbLocalHome = @{0} used in bean class lists a javax.ejb.EJBLocalHome interface. Use @LocalHome({1})
-3.ann.remoteOrLocal.ejbLocalHome = When applied to a bean class, the @{0} annotation must only list business interfaces and cannot list legacy EJBLocalHome interfaces.  EJBLocalHome interfaces can be annotated on the bean class with @LocalHome({1})
-
-# fail(ejbName, "ann.remoteOrLocal.ejbObject", annotationName, interfce.getName());
-1.ann.remoteOrLocal.ejbObject = @{0} used in bean class lists a javax.ejb.EJBObject interface.
-2.ann.remoteOrLocal.ejbObject = @{0} used in bean class lists a javax.ejb.EJBObject interface. Use @RemoteHome with home interface of "{1}".
-3.ann.remoteOrLocal.ejbObject = When applied to a bean class, the @{0} annotation must only list business interfaces and cannot list legacy EJBObject interfaces.  The EJBHome of interface for "{1}" can be annotated on the bean class with @RemoteHome
-
-# fail(ejbName, "ann.remoteOrLocal.ejbLocalObject", annotationName, interfce.getName());
-1.ann.remoteOrLocal.ejbLocalObject = @{0} used in bean class lists a javax.ejb.EJBLocalObject interface.
-2.ann.remoteOrLocal.ejbLocalObject = @{0} used in bean class lists a javax.ejb.EJBLocalObject interface. Use @LocalHome with home interface of "{1}".
-3.ann.remoteOrLocal.ejbLocalObject = When applied to a bean class, the @{0} annotation must only list business interfaces and cannot list legacy EJBLocalObject interfaces.  The EJBLocalHome of interface for "{1}" can be annotated on the bean class with @LocalHome
-
-# fail(ejbName, "ann.remoteOrLocal.ejbLocalObject", annotationName, interfce.getName());
-1.ann.remoteOrLocal.converse.parent = Interface annotated @Local or @Remote is annotated conversely in parent interface.
-2.ann.remoteOrLocal.converse.parent = Interface annotated @Local or @Remote is annotated conversely in parent interface. Fix it by annotating both the interfaces with the same annotation
-3.ann.remoteOrLocal.converse.parent = Interface {0} is annotated with @{1} whereas its parent interface {2} is annotated with @{3}. Ensure that both the interfaces are either annotated with @{1} or @{3}. An example would be:\r\n\
-@{1}\r\n\
-public interface {2}'{}'\r\n\
-@{1}\r\n\
-public interface {0} extends {2}'{}'
-
-# warn(bean, "ignoredMethodAnnotation", annotationType, beanType, className, methodName);
-1.ignoredMethodAnnotation = @{0} is ignored for beans of type {1}
-2.ignoredMethodAnnotation = @{0} is ignored for beans of type {1}.  Class: {2} Method: {3}
-3.ignoredMethodAnnotation = Beans of type {1} are not allowed to use the @{0} annotation.  This annotation is only permitted on {1} beans.  The usage of @{0} on bean class {2} method {3} will be ignored and the annotation should be removed.
-
-# warn(bean, "ignoredClassAnnotation", annotationType, beanType, className);
-1.ignoredClassAnnotation = @{0} is ignored for beans of type {1}
-2.ignoredClassAnnotation = @{0} is ignored for beans of type {1}.  Class: {2}
-3.ignoredClassAnnotation = Beans of type {1} are not allowed to use the @{0} annotation.  This annotation is only permitted on {1} beans.  The usage of @{0} on bean class {2} will be ignored and the annotation should be removed.
-
-# fail(bean, "persistenceContextExtented.nonStateful", refName, beanType);
-1.persistenceContextExtented.nonStateful = Non-Stateful use of PersistenceContextType.EXTENDED
-2.persistenceContextExtented.nonStateful = Non-Stateful use of PersistenceContextType.EXTENDED in ref {0}
-3.persistenceContextExtented.nonStateful = {1} ejbs are not capable of using EntityManagers with EXTENTED persistence.  Convert your bean to a Stateful ejb or update the "{0}" PersistenceContext reference to PersistenceContextType.TRANSACTION.
-
-# fail(consumer.getJndiConsumerName(), "resourceRef.onEntityManager", refName);
-1.resourceRef.onEntityManager = Mistaken use of @Resource on an EntityManager reference.  Use @PersistenceContext.
-2.resourceRef.onEntityManager = Mistaken use of @Resource on an EntityManager reference.  Use @PersistenceContext for ref "{0}"
-3.resourceRef.onEntityManager = The @Resource annotation cannot be used on references to javax.persistence.EntityManager.  Change the annotation to @PersistenceContext for ref "{0}"
-
-# fail(consumer.getJndiConsumerName(), "resourceRef.onEntityManagerFactory", refName);
-1.resourceRef.onEntityManagerFactory = Mistaken use of @Resource on an EntityManagerFactory reference.  Use @PersistenceUnit.
-2.resourceRef.onEntityManagerFactory = Mistaken use of @Resource on an EntityManagerFactory reference.  Use @PersistenceUnit for ref "{0}"
-3.resourceRef.onEntityManagerFactory = The @Resource annotation cannot be used on references to javax.persistence.EntityManagerFactory.  Change the annotation to @PersistenceUnit for ref "{0}"
-
-# fail(consumer.getJndiConsumerName(), "ejbAnnotation.onClassWithNoBeanInterface");
-1.ejbAnnotation.onClassWithNoBeanInterface = Missing required "beanInterface" attribute on class-level @EJB usage
-2.ejbAnnotation.onClassWithNoBeanInterface = Missing required "beanInterface" attribute on class-level @EJB usage
-3.ejbAnnotation.onClassWithNoBeanInterface = The "beanInterface" attribute was not specified for the class level annotation @EJB. It is mandatory for all class level @EJB annotations.
-
-# fail(consumer.getJndiConsumerName(), "ejbAnnotation.onClassWithNoName");
-1.ejbAnnotation.onClassWithNoName = Missing required "name" attribute on class-level @EJB usage
-2.ejbAnnotation.onClassWithNoName = Missing required "name" attribute on class-level @EJB usage
-3.ejbAnnotation.onClassWithNoName = The "name" attribute was not specified for the class level annotation @EJB. It is mandatory for all class level @EJB annotations.
-
-# fail(consumer.getJndiConsumerName(), "persistenceContextAnnotation.onEntityManagerFactory", persistenceContextRef.getName());
-1.persistenceContextAnnotation.onEntityManagerFactory = Mistaken use of @PersistenceContext on an EntityManagerFactory reference.  Use @PersistenceUnit.
-2.persistenceContextAnnotation.onEntityManagerFactory = Mistaken use of @PersistenceContext on an EntityManagerFactory reference.  Use @PersistenceUnit for ref "{0}"
-3.persistenceContextAnnotation.onEntityManagerFactory =  The @PersistenceContext annotation only applies to javax.persistence.EntityManager and cannot be used on references to javax.persistence.EntityManagerFactory.  Change the annotation to @PersistenceUnit for ref "{0}"
-
-# fail(consumer.getJndiConsumerName(), "persistenceContextAnnotation.onNonEntityManager", persistenceContextRef.getName());
-1.persistenceContextAnnotation.onNonEntityManager = Use of @PersistenceContext only applies to EntityManager references
-2.persistenceContextAnnotation.onNonEntityManager = Use of @PersistenceContext only applies to EntityManager references.  Fix ref "{0}"
-3.persistenceContextAnnotation.onNonEntityManager = The @PersistenceContext annotation only applies to javax.persistence.EntityManager and cannot be used on references of other types.  Change the annotation for ref "{0}"
-
-# fail(consumer.getJndiConsumerName(), "persistenceUnitAnnotation.onEntityManager", persistenceUnitRef.getName());
-1.persistenceUnitAnnotation.onEntityManager = Mistaken use of @PersistenceUnit on an EntityManager reference.  Use @PersistenceContext
-2.persistenceUnitAnnotation.onEntityManager = Mistaken use of @PersistenceUnit on an EntityManager reference.  Use @PersistenceContext for ref "{0}"
-3.persistenceUnitAnnotation.onEntityManager = The @PersistenceUnit annotation only applies to javax.persistence.EntityManagerFactory and cannot be used on references to javax.persistence.EntityManager.  Change the annotation to @PersistenceContext for ref "{0}"
-
-# fail(consumer.getJndiConsumerName(), "persistenceUnitAnnotation.onNonEntityManagerFactory", persistenceUnitRef.getName());
-1.persistenceUnitAnnotation.onNonEntityManagerFactory = Use of @PersistenceUnit only applies to EntityManager references
-2.persistenceUnitAnnotation.onNonEntityManagerFactory = Use of @PersistenceUnit only applies to EntityManager references.  Fix ref "{0}"
-3.persistenceUnitAnnotation.onNonEntityManagerFactory = The @PersistenceUnit annotation only applies to javax.persistence.EntityManagerFactory and cannot be used on references of other types.  Change the annotation for ref "{0}"
-
-# fail(consumer.getJndiConsumerName(), "resourceAnnotation.onClassWithNoName");
-1.resourceAnnotation.onClassWithNoName = Missing required "name" attribute on class-level @Resource usage
-2.resourceAnnotation.onClassWithNoName = Missing required "name" attribute on class-level @Resource usage
-3.resourceAnnotation.onClassWithNoName = The "name" attribute was not specified for the class level annotation @Resource. It is mandatory for all class level @Resource annotations.
-
-# fail(consumer.getJndiConsumerName(), "resourceAnnotation.onClassWithNoType");
-1.resourceAnnotation.onClassWithNoType = Missing required "type" attribute on class-level @Resource usage
-2.resourceAnnotation.onClassWithNoType = Missing required "type" attribute on class-level @Resource usage
-3.resourceAnnotation.onClassWithNoType = The "type" attribute was not specified for the class level annotation @Resource. It is mandatory for all class level @Resource annotations.
-
-# fail(consumer.getJndiConsumerName(), "persistenceContextAnnotation.onClassWithNoName", persistenceContext.unitName());
-1.persistenceContextAnnotation.onClassWithNoName = Missing required "name" attribute on class-level @PersistenceContext usage
-2.persistenceContextAnnotation.onClassWithNoName = Missing required "name" attribute on class-level @PersistenceContext usage.
-3.persistenceContextAnnotation.onClassWithNoName = The "name" attribute was not specified for the class level annotation @PersistenceContext with unitName="{0}". It is mandatory for all class level @PersistenceContext annotations.
-
-# fail(consumer.getJndiConsumerName(), "persistenceUnitAnnotation.onClassWithNoName", persistenceUnit.unitName());
-1.persistenceUnitAnnotation.onClassWithNoName = Missing required "name" attribute on class-level @PersistenceUnit usage
-2.persistenceUnitAnnotation.onClassWithNoName = Missing required "name" attribute on class-level @PersistenceUnit usage.
-3.persistenceUnitAnnotation.onClassWithNoName = The "name" attribute was not specified for the class level annotation @PersistenceUnit with unitName="{0}". It is mandatory for all class level @PersistenceUnit annotations.
-
-
-# AutoConfig.java
-# fail(componentName, "persistenceContextRef.noPersistenceUnits", refShortName, unitName);
-1.persistenceContextRef.noPersistenceUnits = Missing required persistence.xml for @PersistenceContext ref
-2.persistenceContextRef.noPersistenceUnits = Missing required persistence.xml for @PersistenceContext ref "{0}" to unit "{1}"
-3.persistenceContextRef.noPersistenceUnits = A persistence unit must be defined via META-INF/persistence.xml to satisfy @PersistenceContext ref "{0}" to unit "{1}".  An example of a suitable persistence.xml might be:\
-  <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">\
-    <persistence-unit name="{1}">\
-      <jta-data-source>java:openejb/Resource/myDataSource</jta-data-source>\
-      <non-jta-data-source>java:openejb/Resource/myUnmanagedDataSource</non-jta-data-source>\
-\
-        <properties>\
-        <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>\
-      </properties>\
-    </persistence-unit>\
-  </persistence>\
-
-
-# fail(componentName, "persistenceContextRef.noUnitName", refShortName, join(", ", availableUnits), sampleUnitName );
-1.persistenceContextRef.noUnitName = @PersistenceContext unitName required, multiple units available.
-2.persistenceContextRef.noUnitName = @PersistenceContext unitName required, multiple units available: ref "{0}", available units [{1}]
-3.persistenceContextRef.noUnitName = Use of @PersistenceContext without a unitName is only allowed when there is only a single persistence.xml in the entire application defining exactly one persistence-unit.  Available units for ref {0} are [{1}].  Add the unitName to your declaration, for example:\
-    @PersistenceContext(name="{0}", unitName = "{2}")
-
-# fail(componentName, "persistenceContextRef.vagueMatches", refShortName, unitName, possibleUnits.size(), join(", ", possibleUnits));
-1.persistenceContextRef.vagueMatches = @PersistenceContext unitName has multiple matches.
-2.persistenceContextRef.vagueMatches = @PersistenceContext unitName has multiple matches: unitName "{1}" has {2} possible matches.
-3.persistenceContextRef.vagueMatches = The reference @PersistenceContext(name="{0}", unitName="{1}") cannot be resolved as there are {2} units with the same name.  Update your unitName to one of the following:\
-{3}
-
-# fail(componentName, "persistenceContextRef.noMatches", refShortName, unitName, join(", ", availableUnits));
-1.persistenceContextRef.noMatches = Persistence unit not found
-2.persistenceContextRef.noMatches = Persistence unit not found for @PersistenceContext(name="{0}", unitName="{1}").  Available units [{2}]
-3.persistenceContextRef.noMatches = The persistence unit "{1}" does not exist.  Update the "{0}" PersistenceContext ref to one of the available units [{2}] or declare the unit in a persistence.xml like the following:\
-  <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">\
-    <persistence-unit name="{1}">\
-      <jta-data-source>java:openejb/Resource/myDataSource</jta-data-source>\
-      <non-jta-data-source>java:openejb/Resource/myUnmanagedDataSource</non-jta-data-source>\
-\
-        <properties>\
-        <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>\
-      </properties>\
-    </persistence-unit>\
-  </persistence>\
-
-
-# fail(componentName, "persistenceUnitRef.noPersistenceUnits", refShortName, unitName);
-1.persistenceUnitRef.noPersistenceUnits = Missing required persistence.xml for @PersistenceUnit ref
-2.persistenceUnitRef.noPersistenceUnits = Missing required persistence.xml for @PersistenceUnit ref "{0}" to unit "{1}"
-3.persistenceUnitRef.noPersistenceUnits = A persistence unit must be defined via META-INF/persistence.xml to satisfy @PersistenceUnit ref "{0}" to unit "{1}".  An example of a suitable persistence.xml might be:\
-  <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">\
-    <persistence-unit name="{1}">\
-      <jta-data-source>java:openejb/Resource/myDataSource</jta-data-source>\
-      <non-jta-data-source>java:openejb/Resource/myUnmanagedDataSource</non-jta-data-source>\
-\
-        <properties>\
-        <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>\
-      </properties>\
-    </persistence-unit>\
-  </persistence>\
-
-
-# fail(componentName, "persistenceUnitRef.noUnitName", refShortName, join(", ", availableUnits), sampleUnitName );
-1.persistenceUnitRef.noUnitName = @PersistenceUnit unitName required, multiple units available.
-2.persistenceUnitRef.noUnitName = @PersistenceUnit unitName required, multiple units available: ref "{0}", available units [{1}]
-3.persistenceUnitRef.noUnitName = Use of @PersistenceUnit witout a unitName is only allowed when there is only a single persistence.xml in the entire application defining exactly one persistence-unit.  Available units for ref {0} are [{1}].  Add the unitName to your declaration, for example:\
-    @PersistenceUnit(name="{0}", unitName = "{2}")
-
-# fail(componentName, "persistenceUnitRef.vagueMatches", refShortName, unitName, possibleUnits.size(), join(", ", possibleUnits));
-1.persistenceUnitRef.vagueMatches = @PersistenceUnit unitName has multiple matches.
-2.persistenceUnitRef.vagueMatches = @PersistenceUnit unitName has multiple matches: unitName "{1}" has {2} possible matches.
-3.persistenceUnitRef.vagueMatches = The reference @PersistenceUnit(name="{0}", unitName="{1}") cannot be resolved as there are {2} units with the same name.  Update your unitName to one of the following:\
-{3}
-
-# fail(componentName, "persistenceUnitRef.noMatches", refShortName, unitName, join(", ", availableUnits));
-1.persistenceUnitRef.noMatches = Persistence unit not found
-2.persistenceUnitRef.noMatches = Persistence unit not found for ref @PersistenceUnit(name="{0}", unitName="{1}").  Available units [{2}]
-3.persistenceUnitRef.noMatches = The persistence unit "{1}" does not exist.  Update the "{0}" PersistenceUnit ref to one of the available units [{2}] or declare the unit in a persistence.xml like the following:\
-  <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">\
-    <persistence-unit name="{1}">\
-      <jta-data-source>java:openejb/Resource/myDataSource</jta-data-source>\
-      <non-jta-data-source>java:openejb/Resource/myUnmanagedDataSource</non-jta-data-source>\
-\
-        <properties>\
-        <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>\
-      </properties>\
-    </persistence-unit>\
-  </persistence>\
-
-
-# fail(ejbName, "interfaceAnnotatedAsBean", annotationClass.getSimpleName(), beanClass.getName());
-1.interfaceAnnotatedAsBean = @{0} cannot be applied to an interface.
-2.interfaceAnnotatedAsBean = @{0} cannot be applied to an interface: {1}
-3.interfaceAnnotatedAsBean = Only concrete classes, not interfaces, are allowed to use the @{0} annotation.  Either convert the interface {1} to a class so that it may be used as a valid bean or move the @{0} annotation to the classes that implement this interface.
-
-# fail(ejbName, "abstractAnnotatedAsBean", annotationClass.getSimpleName(), beanClass.getName());
-1.abstractAnnotatedAsBean = @{0} cannot be applied to abstract classes.
-2.abstractAnnotatedAsBean = @{0} cannot be applied to an abstract class: {1}
-3.abstractAnnotatedAsBean = Only concrete classes, not abstract classes, are allowed to use the @{0} annotation.  Either convert the abstract class {1} to a concrete class so that it may be used as a valid bean or move the @{0} annotation to the classes that subclass from this class.
-
-# fail(ejbName, "multiplyAnnotatedAsBean", annotationClass.getSimpleName(), secondAnnotation.getSimpleName(), ejbName, beanClass.getName())
-1.multiplyAnnotatedAsBean = Identical 'name' used in both @{0} and @{1} annotations.
-2.multiplyAnnotatedAsBean = Identical 'name' used in both @{0} and @{1} annotations: name={2}
-3.multiplyAnnotatedAsBean = When attempting to deploy a bean as both @{0} and @{1} different values must be used for the 'name' attributes as all ejb-names must be unique within a given ejb-jar.  Update the @{1} annotation to explicitly set the 'name' attribute to a different value.  For example: @{1}(name = "{1}{2}")
-
-# fail(b, "noInterfaceDeclared.entity", ejbClass.getSimpleName());
-1.noInterfaceDeclared.entity = EJBHome or EJBLocalHome interface required.
-2.noInterfaceDeclared.entity = EJBHome or EJBLocalHome interface required.
-3.noInterfaceDeclared.entity = EJB 2.x and 1.x entity beans require EJBHome or EJBLocalHome interfaces to be accessed.  An example of valid component (i.e. pre-EJB 3.0) interfaces for this bean might be:\
-    public interface {0}Home extends javax.ejb.EJBLocalHome '\u007B' \
-        {0}Object create() throws javax.ejb.CreateException;        \
-    '\u007D' \
-\
-    public interface {0}Object extends javax.ejb.EJBLocalObject '\u007B' \
-        \
-    '\u007D' \
-
-#This is no longer used in code -- commenting out for now
-# fail(b, "noInterfaceDeclared.session", ejbClass.getSimpleName());
-#1.noInterfaceDeclared.session = Business Interface or @WebService annotation required.
-#2.noInterfaceDeclared.session = Business Interface or @WebService annotation required.
-#3.noInterfaceDeclared.session = All EJB 3.0 and earlier Session beans must either implement an interface, declare one via annotation or xml, or be annotated with @javax.jws.WebService.  An example interface for this bean might be:\
-#    @Local\
-#    public interface {0}Local '\u007B' \
-#        // add the methods from {0} you'd like to expose  \
-#    '\u007D' \
-#\
-#Which can then be implemented by the {0} class.\
-
-
-# fail(ejbName, "ann.notAnInterface", annotationName, interfce.getName());
-1.ann.notAnInterface = @{0} lists a non-interface.
-2.ann.notAnInterface = @{0} lists a non-interface: {1}
-3.ann.notAnInterface = All business remote and business local views must be java interfaces.  Classes, abstract classes or enums are not allowed.  Either convert {1} to an interface or remove it from the @{0} list in the bean class.
-
-# warn(b, "interface.beanOnlyAnnotation", annotation.getSimpleName(), interfce.getName(), b.getEjbClass());
-1.interface.beanOnlyAnnotation = Ignoring @{0}.  Annotation only usable on the bean class.
-2.interface.beanOnlyAnnotation = Ignoring @{0} used on interface {1}.  Annotation only usable on the bean class.
-3.interface.beanOnlyAnnotation = @{0} is only usable on the bean classes, not its interfaces.  This annotation will be ignored unless it is moved to the bean class {2}.
-
-# warn(b, "interfaceMethod.beanOnlyAnnotation", annotation.getSimpleName(), interfce.getName(), method.getName(), b.getEjbClass());
-1.interfaceMethod.beanOnlyAnnotation = Ignoring @{0}.  Annotation only usable on the bean class.
-2.interfaceMethod.beanOnlyAnnotation = Ignoring @{0} used on interface {1} method {2}.  Annotation only usable on the bean class.
-3.interfaceMethod.beanOnlyAnnotation = @{0} is only usable on the bean classes, not its interfaces.  This annotation will be ignored unless it is moved to the {2} method in the bean class {3}.
-
-# fail(ejbName, "permitAllAndRolesAllowedOnClass", clazz.getName());
-1.permitAllAndRolesAllowedOnClass = @RolesAllowed and @PermitAll cannot be used on the same class
-2.permitAllAndRolesAllowedOnClass = @RolesAllowed and @PermitAll cannot be used on the same class: {0}
-3.permitAllAndRolesAllowedOnClass = The @RolesAllowed and @PermitAll annotations are mutually exclussive and cannot be used together on the same class.  Choose between @RolesAllowed, which will restrict access to the listed authenticated roles, and @PermitAll, which will allow access to anyone authenticated or not, then update class {0} by deleting the annotation you do not wish to use.  Alternatively, @RolesAllowed can be used at the class level and @PermitAll can be used on individual methods and vice versa.
-
-# fail(ejbName, "conflictingSecurityAnnotations", method.getName(), join(" and ", annotations), method.getDeclaringClass());
-1.conflictingSecurityAnnotations = Method has conflicting security annotations.
-2.conflictingSecurityAnnotations = Method has conflicting security annotations: "{0}" uses {1}
-3.conflictingSecurityAnnotations = The {1} annotations are mutually exclussive and cannot be used together on the same method.  Choose the security annotation you want and delete the others from method {0} in class {2}.  @RolesAllowed will restrict access to the listed authenticated roles.  @PermitAll will allow access to anyone authenticated or not.  @DenyAll will deny access to anyone authenticated or not.
-
-# warn(ejbName, "xml.invalidTransactionAttribute", count);
-1.xml.invalidTransactionAttribute = Ignoring invalid <container-transaction> declarations.  Bean not using Container-Managed Transactions.
-2.xml.invalidTransactionAttribute = Ignoring {0} invalid <container-transaction> declarations.  Bean not using Container-Managed Transactions.
-3.xml.invalidTransactionAttribute = The <container-transaction> element applies only to beans using Container-Managed Transactions.  Beans marked as <transaction-type>Bean</transaction-type> are responsible for their own transactions and may not use the <container-transaction> element.  There are {0} such invalid declarations in the deployment descriptor that will be ignored and should be removed.
-
-# warn(ejbName, "ann.invalidTransactionAttribute", count);
-1.ann.invalidTransactionAttribute = Ignoring invalid @TransactionAttribute annotations.  Bean not using Container-Managed Transactions.
-2.ann.invalidTransactionAttribute = Ignoring {0} invalid @TransactionAttribute annotations.  Bean not using Container-Managed Transactions.
-3.ann.invalidTransactionAttribute = The @TransactionAttribute annotation applies only to beans using Container-Managed Transactions.  Beans marked as @TransactionManagement(BEAN) are responsible for their own transactions and may not use the @TransactionAttribute annotation.  There are {0} such invalid annotations in the bean class that will be ignored and should be removed.
-#TODO
-# warn(ejbName, "xml.invalidConcurrencyAttribute", count);
-#1.xml.invalidConcurrencyAttribute = Ignoring invalid <container-concurrency> declarations.  Bean not using Container-Managed Concurrency.
-#2.xml.invalidConcurrencyAttribute = Ignoring {0} invalid <container-concurrency> declarations.  Bean not using Container-Managed Concurrency.
-#3.xml.invalidConcurrencyAttribute = The <container-concurrency> element applies only to beans using Container-Managed Concurrency.  Beans marked as <concurrency-type>Bean</concurrency-type> are responsible for thier own concurrency and may not use the <container-concurrency> element.  There are {0} such invalid declarations in the deployment descriptor that will be ignored and should be removed.
-
-# warn(ejbName, "ann.invalidConcurrencyAttribute", count);
-1.ann.invalidConcurrencyAttribute = Ignoring invalid @Lock annotations.  Bean not using Container-Managed Concurrencys.
-2.ann.invalidConcurrencyAttribute = Ignoring {0} invalid @Lock annotations.  Bean not using Container-Managed Concurrencys.
-3.ann.invalidConcurrencyAttribute = The @Lock annotation applies only to beans using Container-Managed Concurrencys.  Beans marked as @ConcurrencyManagement(BEAN) are responsible for thier own concurrency and may not use the @Lock annotation.  There are {0} such invalid annotations in the bean class that will be ignored and should be removed.
-
-
-1.xml.home.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <home>. Use <local-home>{0}</local-home>
-2.xml.home.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <home>. Use <local-home>{0}</local-home>
-3.xml.home.ejbLocalHome = The <home> element is for interfaces extending javax.ejb.EJBHome.  The interface supplied is a javax.ejb.EJBLocalHome and should be declared with the <local-home> element as in: <local-home>{0}</local-home>
-
-1.xml.home.ejbObject = javax.ejb.EJBObject interface declared as <home>. Use <remote>{0}</remote>
-2.xml.home.ejbObject = javax.ejb.EJBObject interface declared as <home>. Use <remote>{0}</remote>
-3.xml.home.ejbObject = The <home> element is for interfaces extending javax.ejb.EJBHome.  The interface supplied is a javax.ejb.EJBObject and should be declared with the <remote> element as in: <remote>{0}</remote>
-
-1.xml.home.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <home>. Use <local>{0}</local>
-2.xml.home.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <home>. Use <local>{0}</local>
-3.xml.home.ejbLocalObject = The <home> element is for interfaces extending javax.ejb.EJBHome.  The interface supplied is a javax.ejb.EJBLocalObject and should be declared with the <local> element as in: <local>{0}</local>
-
-1.xml.home.businessLocal = EJB 3.0 business interface declared as <home>. Use <business-local>{0}</business-local>
-2.xml.home.businessLocal = EJB 3.0 business interface declared as <home>. Use <business-local>{0}</business-local>
-3.xml.home.businessLocal = The <home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBHome.  EJB 3.0 simplified business interfaces can be decalred via <business-local>{0}</business-local> or via the @Remote annotation on the bean class or interface class.
-
-1.xml.home.businessRemote = EJB 3.0 business interface declared as <home>. Use <business-remote>{0}</business-remote>
-2.xml.home.businessRemote = EJB 3.0 business interface declared as <home>. Use <business-remote>{0}</business-remote>
-3.xml.home.businessRemote = The <home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBHome.  EJB 3.0 simplified business interfaces can be decalred via <business-remote>{0}</business-remote> or via the @Remote annotation on the bean class or interface class.
-
-1.xml.home.beanClass = Bean class mistakenly declared as <home>
-2.xml.home.beanClass = Bean class mistakenly declared as <home>
-3.xml.home.beanClass = The <home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBHome.  The bean class cannot be used as a home interface.
-
-1.xml.home.notInterface = The value of <home> is not an interface
-2.xml.home.notInterface = The value of <home> is not an interface: {0}
-3.xml.home.notInterface = The <home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBHome.  Classes, abstract classes or enums are not allowed.  Either convert {0} to an interface or remove the related <home> xml tag from your ejb-jar.xml
-
-1.xml.home.unknown = The value of <home> must be an interface extending javax.ejb.EJBHome
-2.xml.home.unknown = The value of <home> must be an interface extending javax.ejb.EJBHome
-3.xml.home.unknown = The <home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBHome.  If this interface is intended to be an EJB 3.0 business remote view, declare this interface as <business-remote>{0}</business-remote> or via the @Remote annotation on the bean class or interface class.
-
-
-
-1.xml.remote.ejbHome = javax.ejb.EJBHome interface declared as <remote>. Use <home>{0}</home>
-2.xml.remote.ejbHome = javax.ejb.EJBHome interface declared as <remote>. Use <home>{0}</home>
-3.xml.remote.ejbHome = The <remote> element is for interfaces extending javax.ejb.EJBObject.  The interface supplied is a javax.ejb.EJBHome and should be declared with the <home> element as in: <home>{0}</home>
-
-1.xml.remote.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <remote>. Use <local-home>{0}</local-home>
-2.xml.remote.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <remote>. Use <local-home>{0}</local-home>
-3.xml.remote.ejbLocalHome = The <remote> element is for interfaces extending javax.ejb.EJBHome.  The interface supplied is a javax.ejb.EJBLocalHome and should be declared with the <local-home> element as in: <local-home>{0}</local-home>
-
-1.xml.remote.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <remote>. Use <local>{0}</local>
-2.xml.remote.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <remote>. Use <local>{0}</local>
-3.xml.remote.ejbLocalObject = The <remote> element is for interfaces extending javax.ejb.EJBObject.  The interface supplied is a javax.ejb.EJBLocalObject and should be declared with the <local> element as in: <local>{0}</local>
-
-# must be attempting an override
-1.xml.remote.businessLocal = EJB 3.0 business interface declared as <remote>. Use <business-remote>{0}</business-remote>
-2.xml.remote.businessLocal = EJB 3.0 business interface declared as <remote>. Use <business-remote>{0}</business-remote>
-3.xml.remote.businessLocal = The <remote> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBObject.  EJB 3.0 simplified business interfaces can be decalred via <business-local>{0}</business-local> or via the @Remote annotation on the bean class or interface class.
-
-1.xml.remote.businessRemote = EJB 3.0 business interface declared as <remote>. Use <business-remote>{0}</business-remote>
-2.xml.remote.businessRemote = EJB 3.0 business interface declared as <remote>. Use <business-remote>{0}</business-remote>
-3.xml.remote.businessRemote = The <remote> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBObject.  EJB 3.0 simplified business interfaces can be decalred via <business-remote>{0}</business-remote> or via the @Remote annotation on the bean class or interface class.
-
-1.xml.remote.beanClass = Bean class mistakenly declared as <remote>
-2.xml.remote.beanClass = Bean class mistakenly declared as <remote>
-3.xml.remote.beanClass = The <remote> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBObject.  The bean class cannot be used as a home interface.
-
-1.xml.remote.notInterface = The value of <remote> is not an interface
-2.xml.remote.notInterface = The value of <remote> is not an interface: {0}
-3.xml.remote.notInterface = The <remote> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBObject.  Classes, abstract classes or enums are not allowed.  Either convert {0} to an interface or remove the related <remote> xml tag from your ejb-jar.xml
-
-1.xml.remote.unknown = The value of <remote> must be an interface extending javax.ejb.EJBObject
-2.xml.remote.unknown = The value of <remote> must be an interface extending javax.ejb.EJBObject.  Perhaps you meant to use <business-remote>{0}</business-remote>
-3.xml.remote.unknown = The <remote> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBObject.  If this interface is intended to be an EJB 3.0 business remote view, declare this interface as <business-remote>{0}</business-remote> or via the @Remote annotation on the bean class or interface class.
-
-
-
-
-1.xml.localHome.ejbHome = javax.ejb.EJBHome interface declared as <local-home>. Use <home>{0}</home>
-2.xml.localHome.ejbHome = javax.ejb.EJBHome interface declared as <local-home>. Use <home>{0}</home>
-3.xml.localHome.ejbHome = The <local-home> element is for interfaces extending javax.ejb.EJBLocalHome.  The interface supplied is a javax.ejb.EJBHome and should be declared with the <home> element as in: <home>{0}</home>
-
-1.xml.localHome.ejbObject = javax.ejb.EJBObject interface declared as <local-home>. Use <remote>{0}</remote>
-2.xml.localHome.ejbObject = javax.ejb.EJBObject interface declared as <local-home>. Use <remote>{0}</remote>
-3.xml.localHome.ejbObject = The <local-home> element is for interfaces extending javax.ejb.EJBLocalHome.  The interface supplied is a javax.ejb.EJBObject and should be declared with the <remote> element as in: <remote>{0}</remote>
-
-1.xml.localHome.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <local-home>. Use <local>{0}</local>
-2.xml.localHome.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <local-home>. Use <local>{0}</local>
-3.xml.localHome.ejbLocalObject = The <local-home> element is for interfaces extending javax.ejb.EJBLocalHome.  The interface supplied is a javax.ejb.EJBLocalObject and should be declared with the <local> element as in: <local>{0}</local>
-
-1.xml.localHome.businessLocal = EJB 3.0 business interface declared as <local-home>. Use <business-local>{0}</business-local>
-2.xml.localHome.businessLocal = EJB 3.0 business interface declared as <local-home>. Use <business-local>{0}</business-local>
-3.xml.localHome.businessLocal = The <local-home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalHome.  EJB 3.0 simplified business interfaces can be decalred via <business-local>{0}</business-local> or via the @Remote annotation on the bean class or interface class.
-
-1.xml.localHome.businessRemote = EJB 3.0 business interface declared as <local-home>. Use <business-remote>{0}</business-remote>
-2.xml.localHome.businessRemote = EJB 3.0 business interface declared as <local-home>. Use <business-remote>{0}</business-remote>
-3.xml.localHome.businessRemote = The <local-home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalHome.  EJB 3.0 simplified business interfaces can be decalred via <business-remote>{0}</business-remote> or via the @Remote annotation on the bean class or interface class.
-
-1.xml.localHome.beanClass = Bean class mistakenly declared as <local-home>
-2.xml.localHome.beanClass = Bean class mistakenly declared as <local-home>
-3.xml.localHome.beanClass = The <local-home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalHome.  The bean class cannot be used as a home interface.
-
-1.xml.localHome.notInterface = The value of <local-home> is not an interface
-2.xml.localHome.notInterface = The value of <local-home> is not an interface: {0}
-3.xml.localHome.notInterface = The <local-home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalHome.  Classes, abstract classes or enums are not allowed.  Either convert {0} to an interface or remove the related <local-home> xml tag from your ejb-jar.xml
-
-1.xml.localHome.unknown = The value of <local-home> must be an interface extending javax.ejb.EJBLocalHome
-2.xml.localHome.unknown = The value of <local-home> must be an interface extending javax.ejb.EJBLocalHome
-3.xml.localHome.unknown =  The <local-home> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalHome.  If this interface is intended to be an EJB 3.0 business local view, declare this interface as <business-local>{0}</business-local> or via the @Local annotation on the bean class or interface class.
-
-
-
-
-1.xml.local.ejbHome = javax.ejb.EJBHome interface declared as <local>. Use <home>{0}</home>
-2.xml.local.ejbHome = javax.ejb.EJBHome interface declared as <local>. Use <home>{0}</home>
-3.xml.local.ejbHome = The <local> element is for interfaces extending javax.ejb.EJBLocalObject.  The interface supplied is a javax.ejb.EJBHome and should be declared with the <home> element as in: <home>{0}</home>
-
-1.xml.local.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <local>. Use <local-home>{0}</local-home>
-2.xml.local.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <local>. Use <local-home>{0}</local-home>
-3.xml.local.ejbLocalHome = The <local> element is for interfaces extending javax.ejb.EJBLocalObject.  The interface supplied is a javax.ejb.EJBLocalHome and should be declared with the <local-home> element as in: <local-home>{0}</local-home>
-
-1.xml.local.ejbObject = javax.ejb.EJBObject interface declared as <local>. Use <remote>{0}</remote>
-2.xml.local.ejbObject = javax.ejb.EJBObject interface declared as <local>. Use <remote>{0}</remote>
-3.xml.local.ejbObject = The <local> element is for interfaces extending javax.ejb.EJBLocalObject.  The interface supplied is a javax.ejb.EJBObject and should be declared with the <remote> element as in: <remote>{0}</remote>
-
-1.xml.local.businessLocal = EJB 3.0 business interface declared as <local>. Use <business-local>{0}</business-local>
-2.xml.local.businessLocal = EJB 3.0 business interface declared as <local>. Use <business-local>{0}</business-local>
-3.xml.local.businessLocal = The <local> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalObject.  EJB 3.0 simplified business interfaces can be decalred via <business-local>{0}</business-local> or via the @Remote annotation on the bean class or interface class.
-
-# must be attempting an override
-1.xml.local.businessRemote = EJB 3.0 business interface declared as <local>. Use <business-local>{0}</business-local>
-2.xml.local.businessRemote = EJB 3.0 business interface declared as <local>. Use <business-local>{0}</business-local>
-3.xml.local.businessRemote = The <local> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalObject.  EJB 3.0 simplified business interfaces can be decalred via <business-remote>{0}</business-remote> or via the @Remote annotation on the bean class or interface class.
-
-1.xml.local.beanClass = Bean class mistakenly declared as <local>
-2.xml.local.beanClass = Bean class mistakenly declared as <local>
-3.xml.local.beanClass = The <local> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalObject.  The bean class cannot be used as a home interface.
-
-1.xml.local.notInterface = The value of <local> is not an interface
-2.xml.local.notInterface = The value of <local> is not an interface: {0}
-3.xml.local.notInterface = The <local> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalObject.  Classes, abstract classes or enums are not allowed.  Either convert {0} to an interface or remove the related <local> xml tag from your ejb-jar.xml
-
-1.xml.local.unknown = The value of <local> must be an interface extending javax.ejb.EJBLocalObject
-2.xml.local.unknown = The value of <local> must be an interface extending javax.ejb.EJBLocalObject.  Perhaps you meant to use <business-local>{0}</business-local>
-3.xml.local.unknown = The <local> element of the ejb-jar.xml is for interfaces extending javax.ejb.EJBLocalObject.  If this interface is intended to be an EJB 3.0 business local view, declare this interface as <business-local>{0}</business-local> or via the @Local annotation on the bean class or interface class.
-
-
-
-
-1.xml.businessRemote.ejbHome = javax.ejb.EJBHome interface declared as <business-remote>. Use <home>{0}</home>
-2.xml.businessRemote.ejbHome = javax.ejb.EJBHome interface declared as <business-remote>. Use <home>{0}</home>
-3.xml.businessRemote.ejbHome = Interfaces extending javax.ejb.EJBHome must use the <home> tag, not the <business-remote> tag, when declared in the ejb-jar.xml.  Declare this interface as <home>{0}</home> or alternatively add @RemoteHome({0}.class) to the top of your bean class.
-
-1.xml.businessRemote.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <business-remote>. Use <local-home>{0}</local-home>
-2.xml.businessRemote.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <business-remote>. Use <local-home>{0}</local-home>
-3.xml.businessRemote.ejbLocalHome = Interfaces extending javax.ejb.EJBLocalHome must use the <local-home> tag, not the <business-remote> tag, when declared in the ejb-jar.xml.  Declare this interface as <local-home>{0}</local-home> or alternatively add @LocalHome({0}.class) to the top of your bean class.
-
-1.xml.businessRemote.ejbObject = javax.ejb.EJBObject interface declared as <business-remote>. Use <remote>{0}</remote>
-2.xml.businessRemote.ejbObject = javax.ejb.EJBObject interface declared as <business-remote>. Use <remote>{0}</remote>
-3.xml.businessRemote.ejbObject = Interfaces extending javax.ejb.EJBObject must use the <remote> tag, not the <business-remote> tag, when declared in the ejb-jar.xml.  Declare this interface as <remote>{0}</remote>.
-
-1.xml.businessRemote.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <business-remote>. Use <local>{0}</local>
-2.xml.businessRemote.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <business-remote>. Use <local>{0}</local>
-3.xml.businessRemote.ejbLocalObject = Interfaces extending javax.ejb.EJBLocalObject must use the <local> tag, not the <business-remote> tag, when declared in the ejb-jar.xml.  Declare this interface as <local>{0}</local>.
-
-1.xml.businessRemote.beanClass = Bean class mistakenly declared as <business-remote>
-2.xml.businessRemote.beanClass = Bean class mistakenly declared as <business-remote>
-3.xml.businessRemote.beanClass = The bean class cannot itself be used as the value of the <business-remote> element of the ejb-jar.xml.  Either list a valid java interface or delete this element and annotate the intended interface with the @Remote annotation.
-
-1.xml.businessRemote.notInterface = The value of <business-remote> is not an interface
-2.xml.businessRemote.notInterface = The value of <business-remote> is not an interface: {0}
-3.xml.businessRemote.notInterface = The <business-remote> element of the ejb-jar.xml must be an interface.  Classes, abstract classes or enums are not allowed.  Either convert {0} to an interface or remove the related <business-remote> xml tag from your ejb-jar.xml
-
-1.xml.businessLocal.ejbHome = javax.ejb.EJBHome interface declared as <business-local>. Use <home>{0}</home>
-2.xml.businessLocal.ejbHome = javax.ejb.EJBHome interface declared as <business-local>. Use <home>{0}</home>
-3.xml.businessLocal.ejbHome = Interfaces extending javax.ejb.EJBHome must use the <home> tag, not the <business-local> tag, when declared in the ejb-jar.xml.  Declare this interface as <home>{0}</home> or alternatively add @RemoteHome({0}.class) to the top of your bean class.
-
-1.xml.businessLocal.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <business-local>. Use <local-home>{0}</local-home>
-2.xml.businessLocal.ejbLocalHome = javax.ejb.EJBLocalHome interface declared as <business-local>. Use <local-home>{0}</local-home>
-3.xml.businessLocal.ejbLocalHome = Interfaces extending javax.ejb.EJBLocalHome must use the <local-home> tag, not the <business-local> tag, when declared in the ejb-jar.xml.  Declare this interface as <local-home>{0}</local-home> or alternatively add @LocalHome({0}.class) to the top of your bean class.
-
-1.xml.businessLocal.ejbObject = javax.ejb.EJBObject interface declared as <business-local>. Use <remote>{0}</remote>
-2.xml.businessLocal.ejbObject = javax.ejb.EJBObject interface declared as <business-local>. Use <remote>{0}</remote>
-3.xml.businessLocal.ejbObject = Interfaces extending javax.ejb.EJBObject must use the <remote> tag, not the <business-local> tag, when declared in the ejb-jar.xml.  Declare this interface as <remote>{0}</remote>.
-
-1.xml.businessLocal.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <business-local>. Use <local>{0}</local>
-2.xml.businessLocal.ejbLocalObject = javax.ejb.EJBLocalObject interface declared as <business-local>. Use <local>{0}</local>
-3.xml.businessLocal.ejbLocalObject = Interfaces extending javax.ejb.EJBLocalObject must use the <local> tag, not the <business-local> tag, when declared in the ejb-jar.xml.  Declare this interface as <local>{0}</local>.
-
-1.xml.businessLocal.beanClass = Bean class mistakenly declared as <business-local>
-2.xml.businessLocal.beanClass = Bean class mistakenly declared as <business-local>
-3.xml.businessLocal.beanClass = The bean class cannot itself be used as the value of the <business-local> element of the ejb-jar.xml.  Either 1) list a valid java interface or 2) delete this element and annotate the intended interface with the @Local annotation.
-
-1.xml.businessLocal.notInterface = The value of <business-local> is not an interface
-2.xml.businessLocal.notInterface = The value of <business-local> is not an interface: {0}
-3.xml.businessLocal.notInterface = The <business-local> element of the ejb-jar.xml must be an interface.  Classes, abstract classes or enums are not allowed.  Either convert {0} to an interface or remove the related <business-local> xml tag from your ejb-jar.xml
-
-
-# TODO: add the apostrophes back in "beans"
-1.ann.ejb.ejbObject = @EJB mistakenly refers to a beans javax.ejb.EJBObject interface
-2.ann.ejb.ejbObject = @EJB mistakenly refers to a beans javax.ejb.EJBObject interface {0}.  Use the EJBHome interface instead.
-3.ann.ejb.ejbObject = When using the @EJB annotation to refer to older EJB 2.x component interfaces, it is the the home interface should be referenced/injected via @EJB.  The home interface is then used in code to create a reference to the {0} interface.  Change the reference type of {1} to the beans home interface.
-
-1.ann.ejb.ejbLocalObject = @EJB mistakenly refers to a beans javax.ejb.EJBLocalObject interface
-2.ann.ejb.ejbLocalObject = @EJB mistakenly refers to a beans javax.ejb.EJBLocalObject interface {0}.  Use the EJBLocalHome interface instead.
-3.ann.ejb.ejbLocalObject = When using the @EJB annotation to refer to older EJB 2.x component interfaces, it is the the local home interface should be referenced/injected via @EJB.  The local home interface is then used in code to create a reference to the {0} interface.  Change the reference type of {1} to the beans local home interface.
-
-1.ann.ejb.beanClass = @EJB mistakenly refers to a bean class
-2.ann.ejb.beanClass = @EJB mistakenly refers to a bean class {0}.  Use the beans business interface instead
-3.ann.ejb.beanClass = The @EJB annotation cannot be used to directly refer to the bean class itself and must instead refer to the bean using one of its business interfaces.  Change the type of the {1} reference from {0} to a business interface of that bean.
-
-1.ann.ejb.notInterface = @EJB mistakenly refers to a non-interface
-2.ann.ejb.notInterface = @EJB mistakenly refers to a non-interface.  Use the beans business interface instead
-3.ann.ejb.notInterface = The @EJB annotation cannot be used to directly refer to the bean class itself and must instead refer to the bean using one of its business interfaces.  Change the type of the {1} reference from {0} to a business interface of that bean.
-
-# fail(enterpriseBean.getEjbName(), "dependsOn.noSuchEjb", ejbName);
-1.dependsOn.noSuchEjb = Singleton @DependsOn refers to non-existant EJB:
-2.dependsOn.noSuchEjb = Singleton @DependsOn refers to non-existant EJB: {0}
-3.dependsOn.noSuchEjb = The @DependsOn annotation or <depends-on> descriptor data for this Singeton bean lists an EJB "{0}" which does not exist in any of the modules of the ear.
-
-# fail("EAR", "dependsOn.circuit", Join.join(" -> ", ejbNames), ejbNames.get(0));
-1.dependsOn.circuit = Singleton circular dependency detected
-2.dependsOn.circuit = Singleton circular dependency detected: {0}
-3.dependsOn.circuit = A Singleton circular dependency has been detected in the application.  Bean "{1}" refers to one or more other singleton beans via @DependsOn which directly or indirectly refer back to bean "{1}".  This circle must be broken befor the application can be built: {0}
-
-# CheckUserTransactionRefs.java
-# warn(bean, "userResourceRef.forbiddenForCmtdBeans", resRef.getResourceEnvRefName());
-1.userTransactionRef.forbiddenForCmtdBeans = Container-Managed Transaction beans cannot use UserTransaction
-2.userTransactionRef.forbiddenForCmtdBeans = Container-Managed Transaction beans cannot use UserTransaction: fix ref {0}
-3.userTransactionRef.forbiddenForCmtdBeans = Only session and message-driven beans with bean-managed transaction demarcation are allowed to use UserTransaction.  Fix @Resource or resource-env-ref {0}
-
-1.xml.noEjbClass = Element <ejb-class> unspecified.
-2.xml.noEjbClass = Element <ejb-class> unspecified.  No annotated bean discovered with <ejb-name>{0}</ejb-name>
-3.xml.noEjbClass = The <ejb-class> element is only optional if there is a matching annotated bean in the module with the bean name {0}.  No such bean was found.  Other beans in this module are: {1}  
+#
+# 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.
+#
+
+# Format for the different levels follows this spirit:
+#
+# 1. Should be short and fixed such that someone could search/grep for it
+#    without having to know/use regular expressions.  These tend to be similar
+#    to the message key.
+#
+# 2. Intended to contain the issue expressed in 1 with only the essential
+#    details, should not line wrap if possible.  Be terse.
+#
+# 3. Teacher's assistant.  A much more conversational and possibly more detailed
+#    explanation of the issue, should tell the user what to do to fix the problem.
+#    I.e. don't just point out what is wrong, also point out what is right.  Use
+#    several lines if needed.
+#
+
+
+# 0 - Error Message
+# 1 - Stack Trace
+1.cannot.validate        \u091c\u093e\u0930 \u0915\u094b \u092e\u093e\u0928\u094d\u092f \u0928\u0939\u0940\u0902 \u0915\u0930 \u0938\u0915\u0924\u0947
+2.cannot.validate        \u091c\u093e\u0930 \u0915\u094b \u092e\u093e\u0928\u094d\u092f \u0928\u0939\u0940\u0902 \u0915\u0930 \u0938\u0915\u0924\u0947: {0}
+3.cannot.validate        \u091c\u093e\u0930 \u0915\u094b \u092e\u093e\u0928\u094d\u092f \u0928\u0939\u0940\u0902 \u0915\u0930 \u0938\u0915\u0924\u0947: {0}
+
+# 0 - Class name
+# 1 - Element (home, ejb-class, remote)
+# 2 - Bean name
+1.missing.class           \u0932\u093e\u092a\u0924\u093e \u0915\u094d\u0932\u093e\u0938
+2.missing.class           \u0932\u093e\u092a\u0924\u093e \u0915\u094d\u0932\u093e\u0938 <{1}> {0}
+3.missing.class           \u0915\u094d\u0932\u093e\u0938 {0} \u0928\u0939\u0940\u0902 \u092e\u093f\u0932\u0940 . \u091c\u093e\u0902\u091a \u0915\u0930\u0947\u0902 \u0915\u0940 \u092c\u0940\u0928 {2} \u0915\u0947 {1} \u090f\u0932\u0947\u092e\u0947\u0928\u094d\u091f \u092e\u0947\u0902 \u0928\u093f\u0930\u094d\u0926\u093f\u0937\u094d\u091f \u0915\u094d\u0932\u093e\u0938 \u0915\u0940 \u0935\u0930\u094d\u0924\u0928\u0940 \u0920\u0940\u0915 \u0939\u0948 \u0914\u0930 \u0915\u094d\u0932\u093e\u0938 \u091c\u0930 \u092e\u0947\u0902 \u092e\u094c\u091c\u0942\u0926 \u0939\u0948 
+
+# 0 - Class name
+# 1 - EJB Class name
+1.wrong.class.type        \u0917\u0932\u0924 \u092a\u094d\u0930\u0915\u093e\u0930 \u0915\u0940 \u0915\u094d\u0932\u093e\u0938
+2.wrong.class.type        \u0917\u0932\u0924 \u092a\u094d\u0930\u0915\u093e\u0930 \u0915\u0940 \u0915\u094d\u0932\u093e\u0938 {0}
+3.wrong.class.type        \u0915\u094d\u0932\u093e\u0938 {0 } \u0917\u0932\u0924 \u092a\u094d\u0930\u0915\u093e\u0930 \u0915\u0940 \u0939\u0948, \u092f\u0939 {1 } \u0915\u094b \u090f\u0915\u094d\u0938\u091f\u0947\u0902\u0921 \u0928\u0939\u0940\u0902 \u0915\u0930\u0924\u0940
+# 0 - method name
+# 1 - full method
+# 2 - remote|home
+# 3 - interface name
+# 4 - EJB Class name
+1.no.busines.method       \u0910\u0938\u093e \u0915\u094b\u0908 \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921 \u0928\u0939\u0940\u0902
+2.no.busines.method       \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921 {0 } \u0907\u092e\u094d\u092a\u094d\u0932\u0947\u092e\u0947\u0902\u091f \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u0917\u092f\u093e .
+3.no.busines.method       \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921 {1 } \u0907\u092e\u094d\u092a\u094d\u0932\u0947\u092e\u0947\u0902\u091f(\u0932\u093e\u0917\u0942) \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u0917\u092f\u093e . \u092f\u0939 \u092e\u0947\u0925\u0921 {2 } \u0907\u0902\u091f\u0930\u092b\u0947\u0938 {3 } \u092e\u0947\u0902 \u0918\u094b\u0937\u093f\u0924 \u0915\u093f\u092f\u093e \u0917\u092f\u093e \u0925\u093e \u0932\u0947\u0915\u093f\u0928 \u0908.\u091c.\u092c\u0940 \u0915\u094d\u0932\u093e\u0938 \u092e\u0947\u0902 \u0907\u092e\u094d\u092a\u094d\u0932\u0947\u092e\u0947\u0902\u091f(\u0932\u093e\u0917\u0942) \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u0917\u092f\u093e 
+
+# fail(b, "no.busines.method.args", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local", intrface.getName(), beanClass.getName(), differentArgs.size());
+1.no.busines.method.args       \u0910\u0938\u093e \u0915\u094b\u0908 \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921  \u0928\u0939\u0940\u0902 \u0939\u0948. \u0917\u0932\u0924 \u0906\u0930\u094d\u0917\u0941\u092e\u0947\u0902\u091f\u094d\u0938 \u0907\u0938\u094d\u0924\u0947\u092e\u093e\u0932 \u0915\u093f\u092f\u0947 \u0939\u0948 .
+2.no.busines.method.args       \u092c\u093f\u091c\u093c\u0928\u0938 \u092e\u0947\u0925\u0921 {0 } \u0915\u0947 \u0906\u0930\u094d\u0917\u0941\u092e\u0947\u0902\u091f\u094d\u0938 \u092e\u0948

<TRUNCATED>

[36/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java
index 6a8dd66..2e85d12 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java
@@ -1,317 +1,317 @@
-/**
- * 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.was.v6.commonbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.ResourceEnvRef;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for ResourceEnvRefBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ResourceEnvRefBinding">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="bindingResourceEnvRef" type="{common.xmi}ResourceEnvRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="bindingResourceEnvRef" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ResourceEnvRefBinding", propOrder = {
-    "bindingResourceEnvRefs", "extensions"})
-public class ResourceEnvRefBinding {
-
-    @XmlElement(name = "bindingResourceEnvRef")
-    protected List<ResourceEnvRef> bindingResourceEnvRefs;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String bindingResourceEnvRef;
-    @XmlAttribute
-    protected String jndiName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the bindingResourceEnvRefs 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 bindingResourceEnvRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getBindingResourceEnvRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceEnvRef }
-     */
-    public List<ResourceEnvRef> getBindingResourceEnvRefs() {
-        if (bindingResourceEnvRefs == null) {
-            bindingResourceEnvRefs = new ArrayList<ResourceEnvRef>();
-        }
-        return this.bindingResourceEnvRefs;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the bindingResourceEnvRef property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getBindingResourceEnvRef() {
-        return bindingResourceEnvRef;
-    }
-
-    /**
-     * Sets the value of the bindingResourceEnvRef property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setBindingResourceEnvRef(final String value) {
-        this.bindingResourceEnvRef = value;
-    }
-
-    /**
-     * Gets the value of the jndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJndiName() {
-        return jndiName;
-    }
-
-    /**
-     * Sets the value of the jndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJndiName(final String value) {
-        this.jndiName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.commonbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.ResourceEnvRef;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for ResourceEnvRefBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ResourceEnvRefBinding">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="bindingResourceEnvRef" type="{common.xmi}ResourceEnvRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="bindingResourceEnvRef" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ResourceEnvRefBinding", propOrder = {
+    "bindingResourceEnvRefs", "extensions"})
+public class ResourceEnvRefBinding {
+
+    @XmlElement(name = "bindingResourceEnvRef")
+    protected List<ResourceEnvRef> bindingResourceEnvRefs;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String bindingResourceEnvRef;
+    @XmlAttribute
+    protected String jndiName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the bindingResourceEnvRefs 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 bindingResourceEnvRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getBindingResourceEnvRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceEnvRef }
+     */
+    public List<ResourceEnvRef> getBindingResourceEnvRefs() {
+        if (bindingResourceEnvRefs == null) {
+            bindingResourceEnvRefs = new ArrayList<ResourceEnvRef>();
+        }
+        return this.bindingResourceEnvRefs;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the bindingResourceEnvRef property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getBindingResourceEnvRef() {
+        return bindingResourceEnvRef;
+    }
+
+    /**
+     * Sets the value of the bindingResourceEnvRef property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setBindingResourceEnvRef(final String value) {
+        this.bindingResourceEnvRef = value;
+    }
+
+    /**
+     * Gets the value of the jndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJndiName() {
+        return jndiName;
+    }
+
+    /**
+     * Sets the value of the jndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJndiName(final String value) {
+        this.jndiName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java
index 9f74595..04d2228 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java
@@ -1,402 +1,402 @@
-/**
- * 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.was.v6.commonbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.ResourceRef;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for ResourceRefBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ResourceRefBinding">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="defaultAuth" type="{commonbnd.xmi}AbstractAuthData"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="bindingResourceRef" type="{common.xmi}ResourceRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="properties" type="{commonbnd.xmi}Property"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="bindingResourceRef" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="loginConfigurationName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ResourceRefBinding", propOrder = {"defaultAuths",
-    "bindingResourceRefs", "properties", "extensions"})
-public class ResourceRefBinding {
-
-    @XmlElement(name = "defaultAuth")
-    protected List<AbstractAuthData> defaultAuths;
-    @XmlElement(name = "bindingResourceRef")
-    protected List<ResourceRef> bindingResourceRefs;
-    protected List<Property> properties;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String bindingResourceRef;
-    @XmlAttribute
-    protected String jndiName;
-    @XmlAttribute
-    protected String loginConfigurationName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the defaultAuths 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 defaultAuths property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDefaultAuths().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AbstractAuthData }
-     */
-    public List<AbstractAuthData> getDefaultAuths() {
-        if (defaultAuths == null) {
-            defaultAuths = new ArrayList<AbstractAuthData>();
-        }
-        return this.defaultAuths;
-    }
-
-    /**
-     * Gets the value of the bindingResourceRefs 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 bindingResourceRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getBindingResourceRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceRef }
-     */
-    public List<ResourceRef> getBindingResourceRefs() {
-        if (bindingResourceRefs == null) {
-            bindingResourceRefs = new ArrayList<ResourceRef>();
-        }
-        return this.bindingResourceRefs;
-    }
-
-    /**
-     * Gets the value of the properties 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 properties property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getProperties().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Property }
-     */
-    public List<Property> getProperties() {
-        if (properties == null) {
-            properties = new ArrayList<Property>();
-        }
-        return this.properties;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the bindingResourceRef property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getBindingResourceRef() {
-        return bindingResourceRef;
-    }
-
-    /**
-     * Sets the value of the bindingResourceRef property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setBindingResourceRef(final String value) {
-        this.bindingResourceRef = value;
-    }
-
-    /**
-     * Gets the value of the jndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJndiName() {
-        return jndiName;
-    }
-
-    /**
-     * Sets the value of the jndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJndiName(final String value) {
-        this.jndiName = value;
-    }
-
-    /**
-     * Gets the value of the loginConfigurationName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLoginConfigurationName() {
-        return loginConfigurationName;
-    }
-
-    /**
-     * Sets the value of the loginConfigurationName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLoginConfigurationName(final String value) {
-        this.loginConfigurationName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.commonbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.ResourceRef;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for ResourceRefBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ResourceRefBinding">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="defaultAuth" type="{commonbnd.xmi}AbstractAuthData"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="bindingResourceRef" type="{common.xmi}ResourceRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="properties" type="{commonbnd.xmi}Property"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="bindingResourceRef" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="loginConfigurationName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ResourceRefBinding", propOrder = {"defaultAuths",
+    "bindingResourceRefs", "properties", "extensions"})
+public class ResourceRefBinding {
+
+    @XmlElement(name = "defaultAuth")
+    protected List<AbstractAuthData> defaultAuths;
+    @XmlElement(name = "bindingResourceRef")
+    protected List<ResourceRef> bindingResourceRefs;
+    protected List<Property> properties;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String bindingResourceRef;
+    @XmlAttribute
+    protected String jndiName;
+    @XmlAttribute
+    protected String loginConfigurationName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the defaultAuths 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 defaultAuths property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDefaultAuths().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AbstractAuthData }
+     */
+    public List<AbstractAuthData> getDefaultAuths() {
+        if (defaultAuths == null) {
+            defaultAuths = new ArrayList<AbstractAuthData>();
+        }
+        return this.defaultAuths;
+    }
+
+    /**
+     * Gets the value of the bindingResourceRefs 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 bindingResourceRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getBindingResourceRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceRef }
+     */
+    public List<ResourceRef> getBindingResourceRefs() {
+        if (bindingResourceRefs == null) {
+            bindingResourceRefs = new ArrayList<ResourceRef>();
+        }
+        return this.bindingResourceRefs;
+    }
+
+    /**
+     * Gets the value of the properties 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 properties property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getProperties().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Property }
+     */
+    public List<Property> getProperties() {
+        if (properties == null) {
+            properties = new ArrayList<Property>();
+        }
+        return this.properties;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the bindingResourceRef property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getBindingResourceRef() {
+        return bindingResourceRef;
+    }
+
+    /**
+     * Sets the value of the bindingResourceRef property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setBindingResourceRef(final String value) {
+        this.bindingResourceRef = value;
+    }
+
+    /**
+     * Gets the value of the jndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJndiName() {
+        return jndiName;
+    }
+
+    /**
+     * Sets the value of the jndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJndiName(final String value) {
+        this.jndiName = value;
+    }
+
+    /**
+     * Gets the value of the loginConfigurationName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLoginConfigurationName() {
+        return loginConfigurationName;
+    }
+
+    /**
+     * Sets the value of the loginConfigurationName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLoginConfigurationName(final String value) {
+        this.loginConfigurationName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/package-info.java
index e478e5a..cabc27e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "commonbnd.xmi") package org.apache.openejb.jee.was.v6.commonbnd;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "commonbnd.xmi") package org.apache.openejb.jee.was.v6.commonbnd;
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAnnotation.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAnnotation.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAnnotation.java
index ffef97c..a944e58 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAnnotation.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAnnotation.java
@@ -1,189 +1,189 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-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;
-
-/**
- * <p/>
- * Java class for EAnnotation complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EAnnotation">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EModelElement">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="details" type="{http://www.eclipse.org/emf/2002/Ecore}EStringToStringMapEntry"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="contents" type="{http://www.eclipse.org/emf/2002/Ecore}EObject"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="references" type="{http://www.eclipse.org/emf/2002/Ecore}EObject"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="references" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EAnnotation", propOrder = {"details", "contents",
-    "eObjectReferences"})
-public class EAnnotation extends EModelElement {
-
-    protected List<EStringToStringMapEntry> details;
-    protected List<EObject> contents;
-    @XmlElement(name = "references")
-    protected List<EObject> eObjectReferences;
-    @XmlAttribute
-    protected String references;
-    @XmlAttribute
-    protected String source;
-
-    /**
-     * Gets the value of the details 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 details property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDetails().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EStringToStringMapEntry }
-     */
-    public List<EStringToStringMapEntry> getDetails() {
-        if (details == null) {
-            details = new ArrayList<EStringToStringMapEntry>();
-        }
-        return this.details;
-    }
-
-    /**
-     * Gets the value of the contents 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 contents property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getContents().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link EObject }
-     */
-    public List<EObject> getContents() {
-        if (contents == null) {
-            contents = new ArrayList<EObject>();
-        }
-        return this.contents;
-    }
-
-    /**
-     * Gets the value of the eObjectReferences 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 eObjectReferences property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEObjectReferences().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link EObject }
-     */
-    public List<EObject> getEObjectReferences() {
-        if (eObjectReferences == null) {
-            eObjectReferences = new ArrayList<EObject>();
-        }
-        return this.eObjectReferences;
-    }
-
-    /**
-     * Gets the value of the references property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getReferences() {
-        return references;
-    }
-
-    /**
-     * Sets the value of the references property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setReferences(final String value) {
-        this.references = value;
-    }
-
-    /**
-     * Gets the value of the source property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getSource() {
-        return source;
-    }
-
-    /**
-     * Sets the value of the source property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setSource(final String value) {
-        this.source = 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+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;
+
+/**
+ * <p/>
+ * Java class for EAnnotation complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EAnnotation">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EModelElement">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="details" type="{http://www.eclipse.org/emf/2002/Ecore}EStringToStringMapEntry"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="contents" type="{http://www.eclipse.org/emf/2002/Ecore}EObject"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="references" type="{http://www.eclipse.org/emf/2002/Ecore}EObject"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="references" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EAnnotation", propOrder = {"details", "contents",
+    "eObjectReferences"})
+public class EAnnotation extends EModelElement {
+
+    protected List<EStringToStringMapEntry> details;
+    protected List<EObject> contents;
+    @XmlElement(name = "references")
+    protected List<EObject> eObjectReferences;
+    @XmlAttribute
+    protected String references;
+    @XmlAttribute
+    protected String source;
+
+    /**
+     * Gets the value of the details 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 details property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDetails().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EStringToStringMapEntry }
+     */
+    public List<EStringToStringMapEntry> getDetails() {
+        if (details == null) {
+            details = new ArrayList<EStringToStringMapEntry>();
+        }
+        return this.details;
+    }
+
+    /**
+     * Gets the value of the contents 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 contents property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getContents().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link EObject }
+     */
+    public List<EObject> getContents() {
+        if (contents == null) {
+            contents = new ArrayList<EObject>();
+        }
+        return this.contents;
+    }
+
+    /**
+     * Gets the value of the eObjectReferences 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 eObjectReferences property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEObjectReferences().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link EObject }
+     */
+    public List<EObject> getEObjectReferences() {
+        if (eObjectReferences == null) {
+            eObjectReferences = new ArrayList<EObject>();
+        }
+        return this.eObjectReferences;
+    }
+
+    /**
+     * Gets the value of the references property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getReferences() {
+        return references;
+    }
+
+    /**
+     * Sets the value of the references property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setReferences(final String value) {
+        this.references = value;
+    }
+
+    /**
+     * Gets the value of the source property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Sets the value of the source property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setSource(final String value) {
+        this.source = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAttribute.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAttribute.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAttribute.java
index fc91167..2cd47c3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAttribute.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EAttribute.java
@@ -1,67 +1,67 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EAttribute complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EAttribute">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EStructuralFeature">
- *       &lt;attribute name="iD" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EAttribute")
-public class EAttribute extends EStructuralFeature {
-
-    @XmlAttribute(name = "iD")
-    protected Boolean id;
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isID() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setID(final Boolean value) {
-        this.id = 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.was.v6.ecore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EAttribute complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EAttribute">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EStructuralFeature">
+ *       &lt;attribute name="iD" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EAttribute")
+public class EAttribute extends EStructuralFeature {
+
+    @XmlAttribute(name = "iD")
+    protected Boolean id;
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isID() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setID(final Boolean value) {
+        this.id = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClass.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClass.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClass.java
index b7c3b71..e6e35fc 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClass.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClass.java
@@ -1,211 +1,211 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-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;
-
-/**
- * <p/>
- * Java class for EClass complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EClass">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EClassifier">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="eSuperTypes" type="{http://www.eclipse.org/emf/2002/Ecore}EClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="eOperations" type="{http://www.eclipse.org/emf/2002/Ecore}EOperation"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="eStructuralFeatures" type="{http://www.eclipse.org/emf/2002/Ecore}EStructuralFeature"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="abstract" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="eSuperTypes" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="interface" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EClass", propOrder = {"eClassESuperTypes", "eOperations",
-    "eStructuralFeatures"})
-public class EClass extends EClassifier {
-
-    @XmlElement(name = "eSuperTypes")
-    protected List<EClass> eClassESuperTypes;
-    protected List<EOperation> eOperations;
-    protected List<EStructuralFeature> eStructuralFeatures;
-    @XmlAttribute(name = "abstract")
-    protected Boolean isAbstract;
-    @XmlAttribute
-    protected String eSuperTypes;
-    @XmlAttribute(name = "interface")
-    protected Boolean isInterface;
-
-    /**
-     * Gets the value of the eClassESuperTypes 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 eClassESuperTypes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEClassESuperTypes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link EClass }
-     */
-    public List<EClass> getEClassESuperTypes() {
-        if (eClassESuperTypes == null) {
-            eClassESuperTypes = new ArrayList<EClass>();
-        }
-        return this.eClassESuperTypes;
-    }
-
-    /**
-     * Gets the value of the eOperations 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 eOperations property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEOperations().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EOperation }
-     */
-    public List<EOperation> getEOperations() {
-        if (eOperations == null) {
-            eOperations = new ArrayList<EOperation>();
-        }
-        return this.eOperations;
-    }
-
-    /**
-     * Gets the value of the eStructuralFeatures 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 eStructuralFeatures property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEStructuralFeatures().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EStructuralFeature }
-     */
-    public List<EStructuralFeature> getEStructuralFeatures() {
-        if (eStructuralFeatures == null) {
-            eStructuralFeatures = new ArrayList<EStructuralFeature>();
-        }
-        return this.eStructuralFeatures;
-    }
-
-    /**
-     * Gets the value of the isAbstract property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsAbstract() {
-        return isAbstract;
-    }
-
-    /**
-     * Sets the value of the isAbstract property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsAbstract(final Boolean value) {
-        this.isAbstract = value;
-    }
-
-    /**
-     * Gets the value of the eSuperTypes property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getESuperTypes() {
-        return eSuperTypes;
-    }
-
-    /**
-     * Sets the value of the eSuperTypes property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setESuperTypes(final String value) {
-        this.eSuperTypes = value;
-    }
-
-    /**
-     * Gets the value of the isInterface property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsInterface() {
-        return isInterface;
-    }
-
-    /**
-     * Sets the value of the isInterface property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsInterface(final Boolean value) {
-        this.isInterface = 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+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;
+
+/**
+ * <p/>
+ * Java class for EClass complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EClass">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EClassifier">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="eSuperTypes" type="{http://www.eclipse.org/emf/2002/Ecore}EClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="eOperations" type="{http://www.eclipse.org/emf/2002/Ecore}EOperation"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="eStructuralFeatures" type="{http://www.eclipse.org/emf/2002/Ecore}EStructuralFeature"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="abstract" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="eSuperTypes" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="interface" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EClass", propOrder = {"eClassESuperTypes", "eOperations",
+    "eStructuralFeatures"})
+public class EClass extends EClassifier {
+
+    @XmlElement(name = "eSuperTypes")
+    protected List<EClass> eClassESuperTypes;
+    protected List<EOperation> eOperations;
+    protected List<EStructuralFeature> eStructuralFeatures;
+    @XmlAttribute(name = "abstract")
+    protected Boolean isAbstract;
+    @XmlAttribute
+    protected String eSuperTypes;
+    @XmlAttribute(name = "interface")
+    protected Boolean isInterface;
+
+    /**
+     * Gets the value of the eClassESuperTypes 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 eClassESuperTypes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEClassESuperTypes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link EClass }
+     */
+    public List<EClass> getEClassESuperTypes() {
+        if (eClassESuperTypes == null) {
+            eClassESuperTypes = new ArrayList<EClass>();
+        }
+        return this.eClassESuperTypes;
+    }
+
+    /**
+     * Gets the value of the eOperations 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 eOperations property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEOperations().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EOperation }
+     */
+    public List<EOperation> getEOperations() {
+        if (eOperations == null) {
+            eOperations = new ArrayList<EOperation>();
+        }
+        return this.eOperations;
+    }
+
+    /**
+     * Gets the value of the eStructuralFeatures 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 eStructuralFeatures property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEStructuralFeatures().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EStructuralFeature }
+     */
+    public List<EStructuralFeature> getEStructuralFeatures() {
+        if (eStructuralFeatures == null) {
+            eStructuralFeatures = new ArrayList<EStructuralFeature>();
+        }
+        return this.eStructuralFeatures;
+    }
+
+    /**
+     * Gets the value of the isAbstract property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsAbstract() {
+        return isAbstract;
+    }
+
+    /**
+     * Sets the value of the isAbstract property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsAbstract(final Boolean value) {
+        this.isAbstract = value;
+    }
+
+    /**
+     * Gets the value of the eSuperTypes property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getESuperTypes() {
+        return eSuperTypes;
+    }
+
+    /**
+     * Sets the value of the eSuperTypes property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setESuperTypes(final String value) {
+        this.eSuperTypes = value;
+    }
+
+    /**
+     * Gets the value of the isInterface property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsInterface() {
+        return isInterface;
+    }
+
+    /**
+     * Sets the value of the isInterface property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsInterface(final Boolean value) {
+        this.isInterface = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClassifier.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClassifier.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClassifier.java
index 6fa59b3..eb40a0c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClassifier.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EClassifier.java
@@ -1,67 +1,67 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EClassifier complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EClassifier">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ENamedElement">
- *       &lt;attribute name="instanceClassName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EClassifier")
-public class EClassifier extends ENamedElement {
-
-    @XmlAttribute
-    protected String instanceClassName;
-
-    /**
-     * Gets the value of the instanceClassName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getInstanceClassName() {
-        return instanceClassName;
-    }
-
-    /**
-     * Sets the value of the instanceClassName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setInstanceClassName(final String value) {
-        this.instanceClassName = 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.was.v6.ecore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EClassifier complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EClassifier">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ENamedElement">
+ *       &lt;attribute name="instanceClassName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EClassifier")
+public class EClassifier extends ENamedElement {
+
+    @XmlAttribute
+    protected String instanceClassName;
+
+    /**
+     * Gets the value of the instanceClassName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getInstanceClassName() {
+        return instanceClassName;
+    }
+
+    /**
+     * Sets the value of the instanceClassName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setInstanceClassName(final String value) {
+        this.instanceClassName = value;
+    }
+
+}


[30/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java
index 62667c4..2a079be 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java
@@ -1,334 +1,334 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The exclude list element defines a set of methods which the Assembler marks
- * to be uncallable. It contains one or more methods.
- * <p/>
- * If the method permission relation contains methods that are in the exclude
- * list, the Deployer must consider those methods to be uncallable.
- * <p/>
- * <p/>
- * <p/>
- * Java class for ExcludeList complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ExcludeList">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="methodElements" type="{ejb.xmi}MethodElement"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ExcludeList", propOrder = {"methodElements", "descriptions",
-    "extensions"})
-public class ExcludeList {
-
-    protected List<MethodElement> methodElements;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the methodElements 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 methodElements property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMethodElements().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MethodElement }
-     */
-    public List<MethodElement> getMethodElements() {
-        if (methodElements == null) {
-            methodElements = new ArrayList<MethodElement>();
-        }
-        return this.methodElements;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The exclude list element defines a set of methods which the Assembler marks
+ * to be uncallable. It contains one or more methods.
+ * <p/>
+ * If the method permission relation contains methods that are in the exclude
+ * list, the Deployer must consider those methods to be uncallable.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for ExcludeList complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ExcludeList">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="methodElements" type="{ejb.xmi}MethodElement"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ExcludeList", propOrder = {"methodElements", "descriptions",
+    "extensions"})
+public class ExcludeList {
+
+    protected List<MethodElement> methodElements;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the methodElements 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 methodElements property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMethodElements().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MethodElement }
+     */
+    public List<MethodElement> getMethodElements() {
+        if (methodElements == null) {
+            methodElements = new ArrayList<MethodElement>();
+        }
+        return this.methodElements;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDriven.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDriven.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDriven.java
index 19af29d..408ad1f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDriven.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDriven.java
@@ -1,333 +1,333 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.java.JavaClass;
-
-/**
- * The message-driven element declares a message-driven bean. The declaration
- * consists of:
- * <p/>
- * - an optional description - an optional display name - an optional icon
- * element that contains a small and a large icon file name. - a name assigned
- * to the enterprise bean in the deployment descriptor - the message-driven
- * bean's implementation class - an optional declaration of the bean's messaging
- * type - the message-driven bean's transaction management type - an optional
- * declaration of the bean's message-destination-type - an optional declaration
- * of the bean's message-destination-link - an optional declaration of the
- * message-driven bean's activation configuration properties - an optional
- * declaration of the bean's environment entries - an optional declaration of
- * the bean's EJB references - an optional declaration of the bean's local EJB
- * references - an optional declaration of the bean's web service references -
- * an optional declaration of the security identity to be used for the execution
- * of the bean's methods - an optional declaration of the bean's resource
- * manager connection factory references - an optional declaration of the bean's
- * resource environment references. - an optional declaration of the bean's
- * message destination references
- * <p/>
- * <p/>
- * <p/>
- * Java class for MessageDriven complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MessageDriven">
- *   &lt;complexContent>
- *     &lt;extension base="{ejb.xmi}EnterpriseBean">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="destination" type="{ejb.xmi}MessageDrivenDestination"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="activationConfig" type="{ejb.xmi}ActivationConfig"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="messageDestination" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="messagingType" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="acknowledgeMode" type="{ejb.xmi}AcknowledgeMode" />
- *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="messageDestination" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="messageSelector" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="messagingType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="transactionType" type="{ejb.xmi}TransactionType" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageDriven", propOrder = {"destinations",
-    "activationConfigs", "messageDestinations", "messagingTypes"})
-public class MessageDriven extends EnterpriseBean {
-
-    @XmlElement(name = "destination")
-    protected List<MessageDrivenDestination> destinations;
-    @XmlElement(name = "activationConfig")
-    protected List<ActivationConfig> activationConfigs;
-    @XmlElement(name = "messageDestination")
-    protected List<JavaClass> messageDestinations;
-    @XmlElement(name = "messagingType")
-    protected List<JavaClass> messagingTypes;
-    @XmlAttribute
-    protected AcknowledgeModeEnum acknowledgeMode;
-    @XmlAttribute
-    protected String link;
-    @XmlAttribute
-    protected String messageDestination;
-    @XmlAttribute
-    protected String messageSelector;
-    @XmlAttribute
-    protected String messagingType;
-    @XmlAttribute
-    protected TransactionEnum transactionType;
-
-    /**
-     * Gets the value of the destinations 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 destinations property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDestinations().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MessageDrivenDestination }
-     */
-    public List<MessageDrivenDestination> getDestinations() {
-        if (destinations == null) {
-            destinations = new ArrayList<MessageDrivenDestination>();
-        }
-        return this.destinations;
-    }
-
-    /**
-     * Gets the value of the activationConfigs 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 activationConfigs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getActivationConfigs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ActivationConfig }
-     */
-    public List<ActivationConfig> getActivationConfigs() {
-        if (activationConfigs == null) {
-            activationConfigs = new ArrayList<ActivationConfig>();
-        }
-        return this.activationConfigs;
-    }
-
-    /**
-     * Gets the value of the messageDestinations 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 messageDestinations property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMessageDestinations().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getMessageDestinations() {
-        if (messageDestinations == null) {
-            messageDestinations = new ArrayList<JavaClass>();
-        }
-        return this.messageDestinations;
-    }
-
-    /**
-     * Gets the value of the messagingTypes 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 messagingTypes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMessagingTypes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getMessagingTypes() {
-        if (messagingTypes == null) {
-            messagingTypes = new ArrayList<JavaClass>();
-        }
-        return this.messagingTypes;
-    }
-
-    /**
-     * Gets the value of the acknowledgeMode property.
-     *
-     * @return possible object is {@link AcknowledgeModeEnum }
-     */
-    public AcknowledgeModeEnum getAcknowledgeMode() {
-        return acknowledgeMode;
-    }
-
-    /**
-     * Sets the value of the acknowledgeMode property.
-     *
-     * @param value allowed object is {@link AcknowledgeModeEnum }
-     */
-    public void setAcknowledgeMode(final AcknowledgeModeEnum value) {
-        this.acknowledgeMode = value;
-    }
-
-    /**
-     * Gets the value of the link property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLink() {
-        return link;
-    }
-
-    /**
-     * Sets the value of the link property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLink(final String value) {
-        this.link = value;
-    }
-
-    /**
-     * Gets the value of the messageDestination property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getMessageDestination() {
-        return messageDestination;
-    }
-
-    /**
-     * Sets the value of the messageDestination property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setMessageDestination(final String value) {
-        this.messageDestination = value;
-    }
-
-    /**
-     * Gets the value of the messageSelector property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getMessageSelector() {
-        return messageSelector;
-    }
-
-    /**
-     * Sets the value of the messageSelector property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setMessageSelector(final String value) {
-        this.messageSelector = value;
-    }
-
-    /**
-     * Gets the value of the messagingType property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getMessagingType() {
-        return messagingType;
-    }
-
-    /**
-     * Sets the value of the messagingType property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setMessagingType(final String value) {
-        this.messagingType = value;
-    }
-
-    /**
-     * Gets the value of the transactionType property.
-     *
-     * @return possible object is {@link TransactionEnum }
-     */
-    public TransactionEnum getTransactionType() {
-        return transactionType;
-    }
-
-    /**
-     * Sets the value of the transactionType property.
-     *
-     * @param value allowed object is {@link TransactionEnum }
-     */
-    public void setTransactionType(final TransactionEnum value) {
-        this.transactionType = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.java.JavaClass;
+
+/**
+ * The message-driven element declares a message-driven bean. The declaration
+ * consists of:
+ * <p/>
+ * - an optional description - an optional display name - an optional icon
+ * element that contains a small and a large icon file name. - a name assigned
+ * to the enterprise bean in the deployment descriptor - the message-driven
+ * bean's implementation class - an optional declaration of the bean's messaging
+ * type - the message-driven bean's transaction management type - an optional
+ * declaration of the bean's message-destination-type - an optional declaration
+ * of the bean's message-destination-link - an optional declaration of the
+ * message-driven bean's activation configuration properties - an optional
+ * declaration of the bean's environment entries - an optional declaration of
+ * the bean's EJB references - an optional declaration of the bean's local EJB
+ * references - an optional declaration of the bean's web service references -
+ * an optional declaration of the security identity to be used for the execution
+ * of the bean's methods - an optional declaration of the bean's resource
+ * manager connection factory references - an optional declaration of the bean's
+ * resource environment references. - an optional declaration of the bean's
+ * message destination references
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for MessageDriven complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MessageDriven">
+ *   &lt;complexContent>
+ *     &lt;extension base="{ejb.xmi}EnterpriseBean">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="destination" type="{ejb.xmi}MessageDrivenDestination"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="activationConfig" type="{ejb.xmi}ActivationConfig"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="messageDestination" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="messagingType" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="acknowledgeMode" type="{ejb.xmi}AcknowledgeMode" />
+ *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="messageDestination" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="messageSelector" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="messagingType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="transactionType" type="{ejb.xmi}TransactionType" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageDriven", propOrder = {"destinations",
+    "activationConfigs", "messageDestinations", "messagingTypes"})
+public class MessageDriven extends EnterpriseBean {
+
+    @XmlElement(name = "destination")
+    protected List<MessageDrivenDestination> destinations;
+    @XmlElement(name = "activationConfig")
+    protected List<ActivationConfig> activationConfigs;
+    @XmlElement(name = "messageDestination")
+    protected List<JavaClass> messageDestinations;
+    @XmlElement(name = "messagingType")
+    protected List<JavaClass> messagingTypes;
+    @XmlAttribute
+    protected AcknowledgeModeEnum acknowledgeMode;
+    @XmlAttribute
+    protected String link;
+    @XmlAttribute
+    protected String messageDestination;
+    @XmlAttribute
+    protected String messageSelector;
+    @XmlAttribute
+    protected String messagingType;
+    @XmlAttribute
+    protected TransactionEnum transactionType;
+
+    /**
+     * Gets the value of the destinations 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 destinations property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDestinations().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MessageDrivenDestination }
+     */
+    public List<MessageDrivenDestination> getDestinations() {
+        if (destinations == null) {
+            destinations = new ArrayList<MessageDrivenDestination>();
+        }
+        return this.destinations;
+    }
+
+    /**
+     * Gets the value of the activationConfigs 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 activationConfigs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getActivationConfigs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ActivationConfig }
+     */
+    public List<ActivationConfig> getActivationConfigs() {
+        if (activationConfigs == null) {
+            activationConfigs = new ArrayList<ActivationConfig>();
+        }
+        return this.activationConfigs;
+    }
+
+    /**
+     * Gets the value of the messageDestinations 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 messageDestinations property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMessageDestinations().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getMessageDestinations() {
+        if (messageDestinations == null) {
+            messageDestinations = new ArrayList<JavaClass>();
+        }
+        return this.messageDestinations;
+    }
+
+    /**
+     * Gets the value of the messagingTypes 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 messagingTypes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMessagingTypes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getMessagingTypes() {
+        if (messagingTypes == null) {
+            messagingTypes = new ArrayList<JavaClass>();
+        }
+        return this.messagingTypes;
+    }
+
+    /**
+     * Gets the value of the acknowledgeMode property.
+     *
+     * @return possible object is {@link AcknowledgeModeEnum }
+     */
+    public AcknowledgeModeEnum getAcknowledgeMode() {
+        return acknowledgeMode;
+    }
+
+    /**
+     * Sets the value of the acknowledgeMode property.
+     *
+     * @param value allowed object is {@link AcknowledgeModeEnum }
+     */
+    public void setAcknowledgeMode(final AcknowledgeModeEnum value) {
+        this.acknowledgeMode = value;
+    }
+
+    /**
+     * Gets the value of the link property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLink() {
+        return link;
+    }
+
+    /**
+     * Sets the value of the link property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLink(final String value) {
+        this.link = value;
+    }
+
+    /**
+     * Gets the value of the messageDestination property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getMessageDestination() {
+        return messageDestination;
+    }
+
+    /**
+     * Sets the value of the messageDestination property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setMessageDestination(final String value) {
+        this.messageDestination = value;
+    }
+
+    /**
+     * Gets the value of the messageSelector property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getMessageSelector() {
+        return messageSelector;
+    }
+
+    /**
+     * Sets the value of the messageSelector property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setMessageSelector(final String value) {
+        this.messageSelector = value;
+    }
+
+    /**
+     * Gets the value of the messagingType property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getMessagingType() {
+        return messagingType;
+    }
+
+    /**
+     * Sets the value of the messagingType property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setMessagingType(final String value) {
+        this.messagingType = value;
+    }
+
+    /**
+     * Gets the value of the transactionType property.
+     *
+     * @return possible object is {@link TransactionEnum }
+     */
+    public TransactionEnum getTransactionType() {
+        return transactionType;
+    }
+
+    /**
+     * Sets the value of the transactionType property.
+     *
+     * @param value allowed object is {@link TransactionEnum }
+     */
+    public void setTransactionType(final TransactionEnum value) {
+        this.transactionType = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java
index 63dfb25..8262d7e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java
@@ -1,287 +1,287 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The message-driven-destination element provides advice to the Deployer as to
- * whether a message-driven bean is intended for a Queue or a Topic. The
- * declaration consists of: the type of the message-driven bean's intended
- * destination and an optional declaration of whether a durable or non-durable
- * subscription should be used if the destination-type is javax.jms.Topic.
- * <p/>
- * <p/>
- * <p/>
- * Java class for MessageDrivenDestination complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MessageDrivenDestination">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="subscriptionDurability" type="{ejb.xmi}SubscriptionDurabilityKind" />
- *       &lt;attribute name="type" type="{ejb.xmi}DestinationType" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageDrivenDestination", propOrder = {"extensions"})
-public class MessageDrivenDestination {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected SubscriptionDurabilityEnum subscriptionDurability;
-    @XmlAttribute(name = "type")
-    protected DestinationEnum destinationType;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the subscriptionDurability property.
-     *
-     * @return possible object is {@link SubscriptionDurabilityEnum }
-     */
-    public SubscriptionDurabilityEnum getSubscriptionDurability() {
-        return subscriptionDurability;
-    }
-
-    /**
-     * Sets the value of the subscriptionDurability property.
-     *
-     * @param value allowed object is {@link SubscriptionDurabilityEnum }
-     */
-    public void setSubscriptionDurability(final SubscriptionDurabilityEnum value) {
-        this.subscriptionDurability = value;
-    }
-
-    /**
-     * Gets the value of the destinationType property.
-     *
-     * @return possible object is {@link DestinationEnum }
-     */
-    public DestinationEnum getDestinationType() {
-        return destinationType;
-    }
-
-    /**
-     * Sets the value of the destinationType property.
-     *
-     * @param value allowed object is {@link DestinationEnum }
-     */
-    public void setDestinationType(final DestinationEnum value) {
-        this.destinationType = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The message-driven-destination element provides advice to the Deployer as to
+ * whether a message-driven bean is intended for a Queue or a Topic. The
+ * declaration consists of: the type of the message-driven bean's intended
+ * destination and an optional declaration of whether a durable or non-durable
+ * subscription should be used if the destination-type is javax.jms.Topic.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for MessageDrivenDestination complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MessageDrivenDestination">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="subscriptionDurability" type="{ejb.xmi}SubscriptionDurabilityKind" />
+ *       &lt;attribute name="type" type="{ejb.xmi}DestinationType" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageDrivenDestination", propOrder = {"extensions"})
+public class MessageDrivenDestination {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected SubscriptionDurabilityEnum subscriptionDurability;
+    @XmlAttribute(name = "type")
+    protected DestinationEnum destinationType;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the subscriptionDurability property.
+     *
+     * @return possible object is {@link SubscriptionDurabilityEnum }
+     */
+    public SubscriptionDurabilityEnum getSubscriptionDurability() {
+        return subscriptionDurability;
+    }
+
+    /**
+     * Sets the value of the subscriptionDurability property.
+     *
+     * @param value allowed object is {@link SubscriptionDurabilityEnum }
+     */
+    public void setSubscriptionDurability(final SubscriptionDurabilityEnum value) {
+        this.subscriptionDurability = value;
+    }
+
+    /**
+     * Gets the value of the destinationType property.
+     *
+     * @return possible object is {@link DestinationEnum }
+     */
+    public DestinationEnum getDestinationType() {
+        return destinationType;
+    }
+
+    /**
+     * Sets the value of the destinationType property.
+     *
+     * @param value allowed object is {@link DestinationEnum }
+     */
+    public void setDestinationType(final DestinationEnum value) {
+        this.destinationType = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}


[16/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/async-methods/README.md
----------------------------------------------------------------------
diff --git a/examples/async-methods/README.md b/examples/async-methods/README.md
index 69c93ad..ad5744a 100644
--- a/examples/async-methods/README.md
+++ b/examples/async-methods/README.md
@@ -1,154 +1,154 @@
-Title: @Asynchronous Methods
-
-The @Asynchronous annotation was introduced in EJB 3.1 as a simple way of creating asynchronous processing.
-
-Every time a method annotated `@Asynchronous` is invoked by anyone it will immediately return regardless of how long the method actually takes.  Each invocation returns a [Future][1] object that essentially starts out *empty* and will later have its value filled in by the container when the related method call actually completes.  Returning a `Future` object is not required and `@Asynchronous` methods can of course return `void`.
-
-# Example
-
-Here, in `JobProcessorTest`,
-
-`final Future<String> red = processor.addJob("red");`
-proceeds to the next statement,
-
-`final Future<String> orange = processor.addJob("orange");`
-
-without waiting for the addJob() method to complete. And later we could ask for the result using the `Future<?>.get()` method like
-
-`assertEquals("blue", blue.get());`
-
-It waits for the processing to complete (if its not completed already) and gets the result. If you did not care about the result, you could simply have your asynchronous method as a void method.
-
-[Future][1] Object from docs,
-
-> A Future represents the result of an asynchronous computation. Methods are provided to check if the computation is complete, to wait for its completion, and to retrieve the result of the computation. The result can only be retrieved using method get when the computation has completed, blocking if necessary until it is ready. Cancellation is performed by the cancel method. Additional methods are provided to determine if the task completed normally or was cancelled. Once a computation has completed, the computation cannot be cancelled. If you would like to use a Future for the sake of cancellability but not provide a usable result, you can declare types of the form Future<?> and return null as a result of the underlying task
-
-
-
-# The code
-    @Singleton
-    public class JobProcessor {
-    @Asynchronous
-    @Lock(READ)
-    @AccessTimeout(-1)
-    public Future<String> addJob(String jobName) {
-
-        // Pretend this job takes a while
-        doSomeHeavyLifting();
-
-        // Return our result
-        return new AsyncResult<String>(jobName);
-    }
-
-    private void doSomeHeavyLifting() {
-        try {
-            Thread.sleep(SECONDS.toMillis(10));
-        } catch (InterruptedException e) {
-            Thread.interrupted();
-            throw new IllegalStateException(e);
-        }
-      }
-    }
-# Test
-    public class JobProcessorTest extends TestCase {
-
-    public void test() throws Exception {
-
-        final Context context = EJBContainer.createEJBContainer().getContext();
-
-        final JobProcessor processor = (JobProcessor) context.lookup("java:global/async-methods/JobProcessor");
-
-        final long start = System.nanoTime();
-
-        // Queue up a bunch of work
-        final Future<String> red = processor.addJob("red");
-        final Future<String> orange = processor.addJob("orange");
-        final Future<String> yellow = processor.addJob("yellow");
-        final Future<String> green = processor.addJob("green");
-        final Future<String> blue = processor.addJob("blue");
-        final Future<String> violet = processor.addJob("violet");
-
-        // Wait for the result -- 1 minute worth of work
-        assertEquals("blue", blue.get());
-        assertEquals("orange", orange.get());
-        assertEquals("green", green.get());
-        assertEquals("red", red.get());
-        assertEquals("yellow", yellow.get());
-        assertEquals("violet", violet.get());
-
-        // How long did it take?
-        final long total = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start);
-
-        // Execution should be around 9 - 21 seconds
-		// The execution time depends on the number of threads available for asynchronous execution.
-		// In the best case it is 10s plus some minimal processing time. 
-        assertTrue("Expected > 9 but was: " + total, total > 9);
-        assertTrue("Expected < 21 but was: " + total, total < 21);
-
-      }
-    }
-#Running
-    -------------------------------------------------------
-     T E S T S
-    -------------------------------------------------------
-    Running org.superbiz.async.JobProcessorTest
-    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20110801-04:02
-    http://tomee.apache.org/
-    INFO - openejb.home = G:\Workspace\fullproject\openejb3\examples\async-methods
-    INFO - openejb.base = G:\Workspace\fullproject\openejb3\examples\async-methods
-    INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
-    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
-    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    INFO - Found EjbModule in classpath: g:\Workspace\fullproject\openejb3\examples\async-methods\target\classes
-    INFO - Beginning load: g:\Workspace\fullproject\openejb3\examples\async-methods\target\classes
-    INFO - Configuring enterprise application: g:\Workspace\fullproject\openejb3\examples\async-methods
-    INFO - Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
-    INFO - Auto-creating a container for bean JobProcessor: Container(type=SINGLETON, id=Default Singleton Container)
-    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-    INFO - Auto-creating a container for bean org.superbiz.async.JobProcessorTest: Container(type=MANAGED, id=Default Managed Container)
-    INFO - Enterprise application "g:\Workspace\fullproject\openejb3\examples\async-methods" loaded.
-    INFO - Assembling app: g:\Workspace\fullproject\openejb3\examples\async-methods
-    INFO - Jndi(name="java:global/async-methods/JobProcessor!org.superbiz.async.JobProcessor")
-    INFO - Jndi(name="java:global/async-methods/JobProcessor")
-    INFO - Jndi(name="java:global/EjbModule100568296/org.superbiz.async.JobProcessorTest!org.superbiz.async.JobProcessorTest")
-    INFO - Jndi(name="java:global/EjbModule100568296/org.superbiz.async.JobProcessorTest")
-    INFO - Created Ejb(deployment-id=org.superbiz.async.JobProcessorTest, ejb-name=org.superbiz.async.JobProcessorTest, container=Default Managed Container)
-    INFO - Created Ejb(deployment-id=JobProcessor, ejb-name=JobProcessor, container=Default Singleton Container)
-    INFO - Started Ejb(deployment-id=org.superbiz.async.JobProcessorTest, ejb-name=org.superbiz.async.JobProcessorTest, container=Default Managed Container)
-    INFO - Started Ejb(deployment-id=JobProcessor, ejb-name=JobProcessor, container=Default Singleton Container)
-    INFO - Deployed Application(path=g:\Workspace\fullproject\openejb3\examples\async-methods)
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.305 sec
-
-    Results :
-
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-    [INFO] ------------------------------------------------------------------------
-    [INFO] BUILD SUCCESS
-    [INFO] ------------------------------------------------------------------------
-    [INFO] Total time: 21.097s
-    [INFO] Finished at: Wed Aug 03 22:48:26 IST 2011
-    [INFO] Final Memory: 13M/145M
-    [INFO] ------------------------------------------------------------------------
-
-# How it works <small>under the covers</small>
-
-Under the covers what makes this work is:
-
-  - The `JobProcessor` the caller sees is not actually an instance of `JobProcessor`.  Rather it's a subclass or proxy that has all the methods overridden.  Methods that are supposed to be asynchronous are handled differently.
-  - Calls to an asynchronous method simply result in a `Runnable` being created that wraps the method and parameters you gave.  This runnable is given to an [Executor][3] which is simply a work queue attached to a thread pool.
-  - After adding the work to the queue, the proxied version of the method returns an implementation of `Future` that is linked to the `Runnable` which is now waiting on the queue.
-  - When the `Runnable` finally executes the method on the *real* `JobProcessor` instance, it will take the return value and set it into the `Future` making it available to the caller.
-
-Important to note that the `AsyncResult` object the `JobProcessor` returns is not the same `Future` object the caller is holding.  It would have been neat if the real `JobProcessor` could just return `String` and the caller's version of `JobProcessor` could return `Future<String>`, but we didn't see any way to do that without adding more complexity.  So the `AsyncResult` is a simple wrapper object.  The container will pull the `String` out, throw the `AsyncResult` away, then put the `String` in the *real* `Future` that the caller is holding.
-
-To get progress along the way, simply pass a thread-safe object like [AtomicInteger][4] to the `@Asynchronous` method and have the bean code periodically update it with the percent complete.
-
-#Related Examples
-
-For complex asynchronous processing, JavaEE's answer is `@MessageDrivenBean`. Have a look at the [simple-mdb](../simple-mdb/README.html) example
-
-[1]: http://download.oracle.com/javase/6/docs/api/java/util/concurrent/Future.html
-[3]: http://download.oracle.com/javase/6/docs/api/java/util/concurrent/Executor.html
-[4]: http://download.oracle.com/javase/6/docs/api/java/util/concurrent/atomic/AtomicInteger.html
-
+Title: @Asynchronous Methods
+
+The @Asynchronous annotation was introduced in EJB 3.1 as a simple way of creating asynchronous processing.
+
+Every time a method annotated `@Asynchronous` is invoked by anyone it will immediately return regardless of how long the method actually takes.  Each invocation returns a [Future][1] object that essentially starts out *empty* and will later have its value filled in by the container when the related method call actually completes.  Returning a `Future` object is not required and `@Asynchronous` methods can of course return `void`.
+
+# Example
+
+Here, in `JobProcessorTest`,
+
+`final Future<String> red = processor.addJob("red");`
+proceeds to the next statement,
+
+`final Future<String> orange = processor.addJob("orange");`
+
+without waiting for the addJob() method to complete. And later we could ask for the result using the `Future<?>.get()` method like
+
+`assertEquals("blue", blue.get());`
+
+It waits for the processing to complete (if its not completed already) and gets the result. If you did not care about the result, you could simply have your asynchronous method as a void method.
+
+[Future][1] Object from docs,
+
+> A Future represents the result of an asynchronous computation. Methods are provided to check if the computation is complete, to wait for its completion, and to retrieve the result of the computation. The result can only be retrieved using method get when the computation has completed, blocking if necessary until it is ready. Cancellation is performed by the cancel method. Additional methods are provided to determine if the task completed normally or was cancelled. Once a computation has completed, the computation cannot be cancelled. If you would like to use a Future for the sake of cancellability but not provide a usable result, you can declare types of the form Future<?> and return null as a result of the underlying task
+
+
+
+# The code
+    @Singleton
+    public class JobProcessor {
+    @Asynchronous
+    @Lock(READ)
+    @AccessTimeout(-1)
+    public Future<String> addJob(String jobName) {
+
+        // Pretend this job takes a while
+        doSomeHeavyLifting();
+
+        // Return our result
+        return new AsyncResult<String>(jobName);
+    }
+
+    private void doSomeHeavyLifting() {
+        try {
+            Thread.sleep(SECONDS.toMillis(10));
+        } catch (InterruptedException e) {
+            Thread.interrupted();
+            throw new IllegalStateException(e);
+        }
+      }
+    }
+# Test
+    public class JobProcessorTest extends TestCase {
+
+    public void test() throws Exception {
+
+        final Context context = EJBContainer.createEJBContainer().getContext();
+
+        final JobProcessor processor = (JobProcessor) context.lookup("java:global/async-methods/JobProcessor");
+
+        final long start = System.nanoTime();
+
+        // Queue up a bunch of work
+        final Future<String> red = processor.addJob("red");
+        final Future<String> orange = processor.addJob("orange");
+        final Future<String> yellow = processor.addJob("yellow");
+        final Future<String> green = processor.addJob("green");
+        final Future<String> blue = processor.addJob("blue");
+        final Future<String> violet = processor.addJob("violet");
+
+        // Wait for the result -- 1 minute worth of work
+        assertEquals("blue", blue.get());
+        assertEquals("orange", orange.get());
+        assertEquals("green", green.get());
+        assertEquals("red", red.get());
+        assertEquals("yellow", yellow.get());
+        assertEquals("violet", violet.get());
+
+        // How long did it take?
+        final long total = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start);
+
+        // Execution should be around 9 - 21 seconds
+		// The execution time depends on the number of threads available for asynchronous execution.
+		// In the best case it is 10s plus some minimal processing time. 
+        assertTrue("Expected > 9 but was: " + total, total > 9);
+        assertTrue("Expected < 21 but was: " + total, total < 21);
+
+      }
+    }
+#Running
+    -------------------------------------------------------
+     T E S T S
+    -------------------------------------------------------
+    Running org.superbiz.async.JobProcessorTest
+    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20110801-04:02
+    http://tomee.apache.org/
+    INFO - openejb.home = G:\Workspace\fullproject\openejb3\examples\async-methods
+    INFO - openejb.base = G:\Workspace\fullproject\openejb3\examples\async-methods
+    INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
+    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    INFO - Found EjbModule in classpath: g:\Workspace\fullproject\openejb3\examples\async-methods\target\classes
+    INFO - Beginning load: g:\Workspace\fullproject\openejb3\examples\async-methods\target\classes
+    INFO - Configuring enterprise application: g:\Workspace\fullproject\openejb3\examples\async-methods
+    INFO - Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
+    INFO - Auto-creating a container for bean JobProcessor: Container(type=SINGLETON, id=Default Singleton Container)
+    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+    INFO - Auto-creating a container for bean org.superbiz.async.JobProcessorTest: Container(type=MANAGED, id=Default Managed Container)
+    INFO - Enterprise application "g:\Workspace\fullproject\openejb3\examples\async-methods" loaded.
+    INFO - Assembling app: g:\Workspace\fullproject\openejb3\examples\async-methods
+    INFO - Jndi(name="java:global/async-methods/JobProcessor!org.superbiz.async.JobProcessor")
+    INFO - Jndi(name="java:global/async-methods/JobProcessor")
+    INFO - Jndi(name="java:global/EjbModule100568296/org.superbiz.async.JobProcessorTest!org.superbiz.async.JobProcessorTest")
+    INFO - Jndi(name="java:global/EjbModule100568296/org.superbiz.async.JobProcessorTest")
+    INFO - Created Ejb(deployment-id=org.superbiz.async.JobProcessorTest, ejb-name=org.superbiz.async.JobProcessorTest, container=Default Managed Container)
+    INFO - Created Ejb(deployment-id=JobProcessor, ejb-name=JobProcessor, container=Default Singleton Container)
+    INFO - Started Ejb(deployment-id=org.superbiz.async.JobProcessorTest, ejb-name=org.superbiz.async.JobProcessorTest, container=Default Managed Container)
+    INFO - Started Ejb(deployment-id=JobProcessor, ejb-name=JobProcessor, container=Default Singleton Container)
+    INFO - Deployed Application(path=g:\Workspace\fullproject\openejb3\examples\async-methods)
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.305 sec
+
+    Results :
+
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+    [INFO] ------------------------------------------------------------------------
+    [INFO] BUILD SUCCESS
+    [INFO] ------------------------------------------------------------------------
+    [INFO] Total time: 21.097s
+    [INFO] Finished at: Wed Aug 03 22:48:26 IST 2011
+    [INFO] Final Memory: 13M/145M
+    [INFO] ------------------------------------------------------------------------
+
+# How it works <small>under the covers</small>
+
+Under the covers what makes this work is:
+
+  - The `JobProcessor` the caller sees is not actually an instance of `JobProcessor`.  Rather it's a subclass or proxy that has all the methods overridden.  Methods that are supposed to be asynchronous are handled differently.
+  - Calls to an asynchronous method simply result in a `Runnable` being created that wraps the method and parameters you gave.  This runnable is given to an [Executor][3] which is simply a work queue attached to a thread pool.
+  - After adding the work to the queue, the proxied version of the method returns an implementation of `Future` that is linked to the `Runnable` which is now waiting on the queue.
+  - When the `Runnable` finally executes the method on the *real* `JobProcessor` instance, it will take the return value and set it into the `Future` making it available to the caller.
+
+Important to note that the `AsyncResult` object the `JobProcessor` returns is not the same `Future` object the caller is holding.  It would have been neat if the real `JobProcessor` could just return `String` and the caller's version of `JobProcessor` could return `Future<String>`, but we didn't see any way to do that without adding more complexity.  So the `AsyncResult` is a simple wrapper object.  The container will pull the `String` out, throw the `AsyncResult` away, then put the `String` in the *real* `Future` that the caller is holding.
+
+To get progress along the way, simply pass a thread-safe object like [AtomicInteger][4] to the `@Asynchronous` method and have the bean code periodically update it with the percent complete.
+
+#Related Examples
+
+For complex asynchronous processing, JavaEE's answer is `@MessageDrivenBean`. Have a look at the [simple-mdb](../simple-mdb/README.html) example
+
+[1]: http://download.oracle.com/javase/6/docs/api/java/util/concurrent/Future.html
+[3]: http://download.oracle.com/javase/6/docs/api/java/util/concurrent/Executor.html
+[4]: http://download.oracle.com/javase/6/docs/api/java/util/concurrent/atomic/AtomicInteger.html
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/async-methods/src/main/java/org/superbiz/async/JobProcessor.java
----------------------------------------------------------------------
diff --git a/examples/async-methods/src/main/java/org/superbiz/async/JobProcessor.java b/examples/async-methods/src/main/java/org/superbiz/async/JobProcessor.java
index 8389fcf..9713c91 100644
--- a/examples/async-methods/src/main/java/org/superbiz/async/JobProcessor.java
+++ b/examples/async-methods/src/main/java/org/superbiz/async/JobProcessor.java
@@ -1,55 +1,55 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.async;
-
-import javax.ejb.AccessTimeout;
-import javax.ejb.AsyncResult;
-import javax.ejb.Asynchronous;
-import javax.ejb.Lock;
-import javax.ejb.Singleton;
-import java.util.concurrent.Future;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static javax.ejb.LockType.READ;
-
-/**
- * @version $Revision$ $Date$
- */
-@Singleton
-public class JobProcessor {
-
-    @Asynchronous
-    @Lock(READ)
-    @AccessTimeout(-1)
-    public Future<String> addJob(String jobName) {
-
-        // Pretend this job takes a while
-        doSomeHeavyLifting();
-
-        // Return our result
-        return new AsyncResult<String>(jobName);
-    }
-
-    private void doSomeHeavyLifting() {
-        try {
-            Thread.sleep(SECONDS.toMillis(10));
-        } catch (InterruptedException e) {
-            Thread.interrupted();
-            throw new IllegalStateException(e);
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.async;
+
+import javax.ejb.AccessTimeout;
+import javax.ejb.AsyncResult;
+import javax.ejb.Asynchronous;
+import javax.ejb.Lock;
+import javax.ejb.Singleton;
+import java.util.concurrent.Future;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static javax.ejb.LockType.READ;
+
+/**
+ * @version $Revision$ $Date$
+ */
+@Singleton
+public class JobProcessor {
+
+    @Asynchronous
+    @Lock(READ)
+    @AccessTimeout(-1)
+    public Future<String> addJob(String jobName) {
+
+        // Pretend this job takes a while
+        doSomeHeavyLifting();
+
+        // Return our result
+        return new AsyncResult<String>(jobName);
+    }
+
+    private void doSomeHeavyLifting() {
+        try {
+            Thread.sleep(SECONDS.toMillis(10));
+        } catch (InterruptedException e) {
+            Thread.interrupted();
+            throw new IllegalStateException(e);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/async-methods/src/test/java/org/superbiz/async/JobProcessorTest.java
----------------------------------------------------------------------
diff --git a/examples/async-methods/src/test/java/org/superbiz/async/JobProcessorTest.java b/examples/async-methods/src/test/java/org/superbiz/async/JobProcessorTest.java
index e3bf30f..47c6902 100644
--- a/examples/async-methods/src/test/java/org/superbiz/async/JobProcessorTest.java
+++ b/examples/async-methods/src/test/java/org/superbiz/async/JobProcessorTest.java
@@ -1,66 +1,66 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.async;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @version $Revision$ $Date$
- */
-public class JobProcessorTest extends TestCase {
-
-    public void test() throws Exception {
-
-        final Context context = EJBContainer.createEJBContainer().getContext();
-
-        final JobProcessor processor = (JobProcessor) context.lookup("java:global/async-methods/JobProcessor");
-
-        final long start = System.nanoTime();
-
-        // Queue up a bunch of work
-        final Future<String> red = processor.addJob("red");
-        final Future<String> orange = processor.addJob("orange");
-        final Future<String> yellow = processor.addJob("yellow");
-        final Future<String> green = processor.addJob("green");
-        final Future<String> blue = processor.addJob("blue");
-        final Future<String> violet = processor.addJob("violet");
-
-        // Wait for the result -- 1 minute worth of work
-        assertEquals("blue", blue.get());
-        assertEquals("orange", orange.get());
-        assertEquals("green", green.get());
-        assertEquals("red", red.get());
-        assertEquals("yellow", yellow.get());
-        assertEquals("violet", violet.get());
-
-        // How long did it take?
-        final long total = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start);
-
-        // Execution should be around 9 - 21 seconds
-        // The execution time depends on the number of threads available for asynchronous execution.
-        // In the best case it is 10s plus some minimal processing time.
-        assertTrue("Expected > 9 but was: " + total, total > 9);
-        assertTrue("Expected < 21 but was: " + total, total < 21);
-
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.async;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public class JobProcessorTest extends TestCase {
+
+    public void test() throws Exception {
+
+        final Context context = EJBContainer.createEJBContainer().getContext();
+
+        final JobProcessor processor = (JobProcessor) context.lookup("java:global/async-methods/JobProcessor");
+
+        final long start = System.nanoTime();
+
+        // Queue up a bunch of work
+        final Future<String> red = processor.addJob("red");
+        final Future<String> orange = processor.addJob("orange");
+        final Future<String> yellow = processor.addJob("yellow");
+        final Future<String> green = processor.addJob("green");
+        final Future<String> blue = processor.addJob("blue");
+        final Future<String> violet = processor.addJob("violet");
+
+        // Wait for the result -- 1 minute worth of work
+        assertEquals("blue", blue.get());
+        assertEquals("orange", orange.get());
+        assertEquals("green", green.get());
+        assertEquals("red", red.get());
+        assertEquals("yellow", yellow.get());
+        assertEquals("violet", violet.get());
+
+        // How long did it take?
+        final long total = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start);
+
+        // Execution should be around 9 - 21 seconds
+        // The execution time depends on the number of threads available for asynchronous execution.
+        // In the best case it is 10s plus some minimal processing time.
+        assertTrue("Expected > 9 but was: " + total, total > 9);
+        assertTrue("Expected < 21 but was: " + total, total < 21);
+
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/OlympicGamesManager.java
----------------------------------------------------------------------
diff --git a/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/OlympicGamesManager.java b/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/OlympicGamesManager.java
index 11ae3d3..704c04b 100755
--- a/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/OlympicGamesManager.java
+++ b/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/OlympicGamesManager.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.designbycontract;
-
-import javax.ejb.Stateless;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-@Stateless
-public class OlympicGamesManager {
-
-    public String addSportMan(@Pattern(regexp = "^[A-Za-z]+$") String name, @Size(min = 2, max = 4) String country) {
-        if (country.equals("USA")) {
-            return null;
-        }
-        return new StringBuilder(name).append(" [").append(country).append("]").toString();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.designbycontract;
+
+import javax.ejb.Stateless;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+@Stateless
+public class OlympicGamesManager {
+
+    public String addSportMan(@Pattern(regexp = "^[A-Za-z]+$") String name, @Size(min = 2, max = 4) String country) {
+        if (country.equals("USA")) {
+            return null;
+        }
+        return new StringBuilder(name).append(" [").append(country).append("]").toString();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManager.java
----------------------------------------------------------------------
diff --git a/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManager.java b/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManager.java
index fd4a963..4380bc6 100755
--- a/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManager.java
+++ b/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManager.java
@@ -1,26 +1,26 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.designbycontract;
-
-import javax.ejb.Local;
-import javax.validation.constraints.Min;
-
-@Local
-public interface PoleVaultingManager {
-
-    int points(@Min(120) int centimeters);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.designbycontract;
+
+import javax.ejb.Local;
+import javax.validation.constraints.Min;
+
+@Local
+public interface PoleVaultingManager {
+
+    int points(@Min(120) int centimeters);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManagerBean.java
----------------------------------------------------------------------
diff --git a/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManagerBean.java b/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManagerBean.java
index 7e4ddfb..a66979e 100755
--- a/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManagerBean.java
+++ b/examples/bean-validation-design-by-contract/src/main/java/org/superbiz/designbycontract/PoleVaultingManagerBean.java
@@ -1,28 +1,28 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.designbycontract;
-
-import javax.ejb.Stateless;
-
-@Stateless
-public class PoleVaultingManagerBean implements PoleVaultingManager {
-
-    @Override
-    public int points(int centimeters) {
-        return centimeters - 120;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.designbycontract;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class PoleVaultingManagerBean implements PoleVaultingManager {
+
+    @Override
+    public int points(int centimeters) {
+        return centimeters - 120;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java
index 0f49ed8..853a967 100644
--- a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java
+++ b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java
@@ -1,29 +1,29 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp1.ejb;
-
-import javax.ejb.Stateless;
-import javax.validation.constraints.Pattern;
-
-@Stateless
-public class BusinessBean {
-
-    public void doStuff(@Pattern(regexp = "valid") final String txt) {
-        System.out.println("Received: " + txt);
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp1.ejb;
+
+import javax.ejb.Stateless;
+import javax.validation.constraints.Pattern;
+
+@Stateless
+public class BusinessBean {
+
+    public void doStuff(@Pattern(regexp = "valid") final String txt) {
+        System.out.println("Received: " + txt);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java
index b5354da..ac7d12f 100644
--- a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java
+++ b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp1.messages;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import java.util.ArrayList;
-import java.util.Collection;
-
-@XmlRootElement
-@XmlSeeAlso(ErrorResponse.class)
-public class ErrorList<T> extends ArrayList<T> {
-
-    private static final long serialVersionUID = -8861634470374757349L;
-
-    public ErrorList() {
-    }
-
-    public ErrorList(final Collection<? extends T> clctn) {
-        addAll(clctn);
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp1.messages;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import java.util.ArrayList;
+import java.util.Collection;
+
+@XmlRootElement
+@XmlSeeAlso(ErrorResponse.class)
+public class ErrorList<T> extends ArrayList<T> {
+
+    private static final long serialVersionUID = -8861634470374757349L;
+
+    public ErrorList() {
+    }
+
+    public ErrorList(final Collection<? extends T> clctn) {
+        addAll(clctn);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java
index b544f06..d37f314 100644
--- a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java
+++ b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java
@@ -1,77 +1,77 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp1.messages;
-
-import javax.ws.rs.core.Response;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Date;
-
-@XmlRootElement
-public class ErrorResponse implements Serializable {
-    private static final long serialVersionUID = 8888101217538645771L;
-
-    private Long id;
-    private Response.Status status;
-    private String message;
-
-    public ErrorResponse() {
-        this.id = new Date().getTime();
-    }
-
-    public ErrorResponse(final Response.Status status, final String message) {
-        this.id = new Date().getTime();
-        this.status = status;
-        this.message = message;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(final Long id) {
-        this.id = id;
-    }
-
-    public Response.Status getStatus() {
-        return status;
-    }
-
-    @XmlAttribute
-    public void setStatus(final Response.Status status) {
-        this.status = status;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    @XmlAttribute
-    public void setMessage(final String message) {
-        this.message = message;
-    }
-
-    //    @Override
-//    public String toString() {
-//        return "{" + "id:" + id + ", status:" + status + ", message:" + message + '}';
-//    }
-    @Override
-    public String toString() {
-        return "ErrorResponse:" + "id=" + id + ", status=" + status + ", message=" + message;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp1.messages;
+
+import javax.ws.rs.core.Response;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.Date;
+
+@XmlRootElement
+public class ErrorResponse implements Serializable {
+    private static final long serialVersionUID = 8888101217538645771L;
+
+    private Long id;
+    private Response.Status status;
+    private String message;
+
+    public ErrorResponse() {
+        this.id = new Date().getTime();
+    }
+
+    public ErrorResponse(final Response.Status status, final String message) {
+        this.id = new Date().getTime();
+        this.status = status;
+        this.message = message;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(final Long id) {
+        this.id = id;
+    }
+
+    public Response.Status getStatus() {
+        return status;
+    }
+
+    @XmlAttribute
+    public void setStatus(final Response.Status status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    @XmlAttribute
+    public void setMessage(final String message) {
+        this.message = message;
+    }
+
+    //    @Override
+//    public String toString() {
+//        return "{" + "id:" + id + ", status:" + status + ", message:" + message + '}';
+//    }
+    @Override
+    public String toString() {
+        return "ErrorResponse:" + "id=" + id + ", status=" + status + ", message=" + message;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java
index 1dc9496..0cc7aad 100644
--- a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java
+++ b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java
@@ -1,61 +1,61 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp1.provider;
-
-import org.superbiz.webapp1.messages.ErrorList;
-import org.superbiz.webapp1.messages.ErrorResponse;
-
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-@Provider
-@Produces(MediaType.APPLICATION_JSON)
-public class ConstraintViolationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
-
-    @Context
-    private HttpHeaders headers;
-
-    @Override
-    public Response toResponse(final ConstraintViolationException t) {
-        final MediaType type = headers.getMediaType();
-        final Locale locale = headers.getLanguage();
-
-        final Object responsObject = getConstraintViolationErrors(t);
-        return Response.status(Response.Status.NOT_ACCEPTABLE).type(type).language(locale).entity(responsObject).build();
-    }
-
-    private static Object getConstraintViolationErrors(final ConstraintViolationException ex) {
-        final List<ErrorResponse> errors = new ArrayList<ErrorResponse>();
-        for (final ConstraintViolation violation : ex.getConstraintViolations()) {
-            final ErrorResponse error = new ErrorResponse();
-            error.setMessage(violation.getMessage());
-            errors.add(error);
-        }
-        return new ErrorList<ErrorResponse>(errors);
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp1.provider;
+
+import org.superbiz.webapp1.messages.ErrorList;
+import org.superbiz.webapp1.messages.ErrorResponse;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+@Provider
+@Produces(MediaType.APPLICATION_JSON)
+public class ConstraintViolationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
+
+    @Context
+    private HttpHeaders headers;
+
+    @Override
+    public Response toResponse(final ConstraintViolationException t) {
+        final MediaType type = headers.getMediaType();
+        final Locale locale = headers.getLanguage();
+
+        final Object responsObject = getConstraintViolationErrors(t);
+        return Response.status(Response.Status.NOT_ACCEPTABLE).type(type).language(locale).entity(responsObject).build();
+    }
+
+    private static Object getConstraintViolationErrors(final ConstraintViolationException ex) {
+        final List<ErrorResponse> errors = new ArrayList<ErrorResponse>();
+        for (final ConstraintViolation violation : ex.getConstraintViolations()) {
+            final ErrorResponse error = new ErrorResponse();
+            error.setMessage(violation.getMessage());
+            errors.add(error);
+        }
+        return new ErrorList<ErrorResponse>(errors);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java
index cb03bde..4514a4c 100644
--- a/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java
+++ b/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp1.service;
-
-import javax.ejb.Singleton;
-import javax.validation.constraints.Pattern;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-@Path("test")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-@Singleton
-public class WebApp1Service {
-
-    @POST
-    public Response getInfo(@Pattern(regexp = "valid") final String input) {
-        return Response.ok().build();
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp1.service;
+
+import javax.ejb.Singleton;
+import javax.validation.constraints.Pattern;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("test")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class WebApp1Service {
+
+    @POST
+    public Response getInfo(@Pattern(regexp = "valid") final String input) {
+        return Response.ok().build();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java b/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java
index 9e555ca..556f78e 100644
--- a/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java
+++ b/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp2.messages;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import java.util.ArrayList;
-import java.util.Collection;
-
-@XmlRootElement
-@XmlSeeAlso(ErrorResponse.class)
-public class ErrorList<T> extends ArrayList<T> {
-
-    private static final long serialVersionUID = -8861634470374757349L;
-
-    public ErrorList() {
-    }
-
-    public ErrorList(final Collection<? extends T> clctn) {
-        addAll(clctn);
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp2.messages;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import java.util.ArrayList;
+import java.util.Collection;
+
+@XmlRootElement
+@XmlSeeAlso(ErrorResponse.class)
+public class ErrorList<T> extends ArrayList<T> {
+
+    private static final long serialVersionUID = -8861634470374757349L;
+
+    public ErrorList() {
+    }
+
+    public ErrorList(final Collection<? extends T> clctn) {
+        addAll(clctn);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java b/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java
index 12fbb5f..b647393 100644
--- a/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java
+++ b/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java
@@ -1,77 +1,77 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp2.messages;
-
-import javax.ws.rs.core.Response;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Date;
-
-@XmlRootElement
-public class ErrorResponse implements Serializable {
-    private static final long serialVersionUID = 8888101217538645771L;
-
-    private Long id;
-    private Response.Status status;
-    private String message;
-
-    public ErrorResponse() {
-        this.id = new Date().getTime();
-    }
-
-    public ErrorResponse(final Response.Status status, final String message) {
-        this.id = new Date().getTime();
-        this.status = status;
-        this.message = message;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(final Long id) {
-        this.id = id;
-    }
-
-    public Response.Status getStatus() {
-        return status;
-    }
-
-    @XmlAttribute
-    public void setStatus(final Response.Status status) {
-        this.status = status;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    @XmlAttribute
-    public void setMessage(final String message) {
-        this.message = message;
-    }
-
-    //    @Override
-//    public String toString() {
-//        return "{" + "id:" + id + ", status:" + status + ", message:" + message + '}';
-//    }
-    @Override
-    public String toString() {
-        return "ErrorResponse:" + "id=" + id + ", status=" + status + ", message=" + message;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp2.messages;
+
+import javax.ws.rs.core.Response;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.Date;
+
+@XmlRootElement
+public class ErrorResponse implements Serializable {
+    private static final long serialVersionUID = 8888101217538645771L;
+
+    private Long id;
+    private Response.Status status;
+    private String message;
+
+    public ErrorResponse() {
+        this.id = new Date().getTime();
+    }
+
+    public ErrorResponse(final Response.Status status, final String message) {
+        this.id = new Date().getTime();
+        this.status = status;
+        this.message = message;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(final Long id) {
+        this.id = id;
+    }
+
+    public Response.Status getStatus() {
+        return status;
+    }
+
+    @XmlAttribute
+    public void setStatus(final Response.Status status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    @XmlAttribute
+    public void setMessage(final String message) {
+        this.message = message;
+    }
+
+    //    @Override
+//    public String toString() {
+//        return "{" + "id:" + id + ", status:" + status + ", message:" + message + '}';
+//    }
+    @Override
+    public String toString() {
+        return "ErrorResponse:" + "id=" + id + ", status=" + status + ", message=" + message;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java b/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java
index 2d12935..4732fba 100644
--- a/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java
+++ b/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java
@@ -1,61 +1,61 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp2.provider;
-
-import org.superbiz.webapp2.messages.ErrorList;
-import org.superbiz.webapp2.messages.ErrorResponse;
-
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-@Provider
-@Produces(MediaType.APPLICATION_JSON)
-public class ConstraintViolationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
-
-    @Context
-    private HttpHeaders headers;
-
-    @Override
-    public Response toResponse(final ConstraintViolationException t) {
-        final MediaType type = headers.getMediaType();
-        final Locale locale = headers.getLanguage();
-
-        final Object responsObject = getConstraintViolationErrors(t);
-        return Response.status(Response.Status.NOT_ACCEPTABLE).type(type).language(locale).entity(responsObject).build();
-    }
-
-    private static Object getConstraintViolationErrors(final ConstraintViolationException ex) {
-        final List<ErrorResponse> errors = new ArrayList<ErrorResponse>();
-        for (final ConstraintViolation violation : ex.getConstraintViolations()) {
-            final ErrorResponse error = new ErrorResponse();
-            error.setMessage(violation.getMessage());
-            errors.add(error);
-        }
-        return new ErrorList<ErrorResponse>(errors);
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp2.provider;
+
+import org.superbiz.webapp2.messages.ErrorList;
+import org.superbiz.webapp2.messages.ErrorResponse;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+@Provider
+@Produces(MediaType.APPLICATION_JSON)
+public class ConstraintViolationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
+
+    @Context
+    private HttpHeaders headers;
+
+    @Override
+    public Response toResponse(final ConstraintViolationException t) {
+        final MediaType type = headers.getMediaType();
+        final Locale locale = headers.getLanguage();
+
+        final Object responsObject = getConstraintViolationErrors(t);
+        return Response.status(Response.Status.NOT_ACCEPTABLE).type(type).language(locale).entity(responsObject).build();
+    }
+
+    private static Object getConstraintViolationErrors(final ConstraintViolationException ex) {
+        final List<ErrorResponse> errors = new ArrayList<ErrorResponse>();
+        for (final ConstraintViolation violation : ex.getConstraintViolations()) {
+            final ErrorResponse error = new ErrorResponse();
+            error.setMessage(violation.getMessage());
+            errors.add(error);
+        }
+        return new ErrorList<ErrorResponse>(errors);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java b/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java
index 0c55163..f0c55d1 100644
--- a/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java
+++ b/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.webapp2.service;
-
-import javax.ejb.Singleton;
-import javax.validation.constraints.Pattern;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-@Singleton
-@Path("test")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-public class WebApp2Service {
-
-    @POST
-    public Response getInfo(@Pattern(regexp = "valid") final String input) {
-        return Response.ok().build();
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.webapp2.service;
+
+import javax.ejb.Singleton;
+import javax.validation.constraints.Pattern;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Singleton
+@Path("test")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public class WebApp2Service {
+
+    @POST
+    public Response getInfo(@Pattern(regexp = "valid") final String input) {
+        return Response.ok().build();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java b/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java
index c7f3dd9..5ea9046 100644
--- a/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java
+++ b/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java
@@ -1,87 +1,87 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.jboss.arquillian.container.test.api.Deployer;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.ws.rs.core.MediaType;
-import java.io.File;
-
-@RunWith(Arquillian.class)
-public class RedeploymentTest {
-
-    public RedeploymentTest() {
-    }
-
-    @Deployment(name = "webapp1", managed = false)
-    public static Archive<?> webapp1() {
-        return ShrinkWrap.createFromZipFile(WebArchive.class, new File("../WebApp1/target/WebApp1-1.1.0-SNAPSHOT.war"));
-    }
-
-    @Deployment(name = "webapp2", managed = false)
-    public static Archive<?> webapp2() {
-        return ShrinkWrap.createFromZipFile(WebArchive.class, new File("../WebApp2/target/WebApp2-1.1.0-SNAPSHOT.war"));
-    }
-
-    @ArquillianResource
-    private Deployer deployer;
-
-    @Test
-    public void validateTest() throws Exception {
-
-        final String port = System.getProperty("server.http.port", "8080");
-        System.out.println("");
-        System.out.println("===========================================");
-        System.out.println("Running test on port: " + port);
-
-        deployer.deploy("webapp1");
-        int result = WebClient.create("http://localhost:" + port + "/WebApp1/test/")
-                .type(MediaType.APPLICATION_JSON_TYPE).post("validd").getStatus();
-        System.out.println(result);
-        Assert.assertEquals(406, result);
-
-        //Not interested in webapp2 output
-        // deployer.undeploy("webapp2");
-        deployer.deploy("webapp2");
-
-        result = WebClient.create("http://localhost:" + port + "/WebApp1/test/")
-                .type(MediaType.APPLICATION_JSON_TYPE).post("validd").getStatus();
-        System.out.println(result);
-        Assert.assertEquals(406, result);
-        deployer.undeploy("webapp2");
-        result = WebClient.create("http://localhost:" + port + "/WebApp1/test/")
-                .type(MediaType.APPLICATION_JSON_TYPE).post("validd").getStatus();
-        System.out.println(result);
-        Assert.assertEquals(406, result);
-        result = WebClient.create("http://localhost:" + port + "/WebApp1/test/")
-                .type(MediaType.APPLICATION_JSON_TYPE).post("valid").getStatus();
-        System.out.println(result);
-        Assert.assertEquals(200, result);
-        System.out.println("===========================================");
-        System.out.println("");
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.jboss.arquillian.container.test.api.Deployer;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.ws.rs.core.MediaType;
+import java.io.File;
+
+@RunWith(Arquillian.class)
+public class RedeploymentTest {
+
+    public RedeploymentTest() {
+    }
+
+    @Deployment(name = "webapp1", managed = false)
+    public static Archive<?> webapp1() {
+        return ShrinkWrap.createFromZipFile(WebArchive.class, new File("../WebApp1/target/WebApp1-1.1.0-SNAPSHOT.war"));
+    }
+
+    @Deployment(name = "webapp2", managed = false)
+    public static Archive<?> webapp2() {
+        return ShrinkWrap.createFromZipFile(WebArchive.class, new File("../WebApp2/target/WebApp2-1.1.0-SNAPSHOT.war"));
+    }
+
+    @ArquillianResource
+    private Deployer deployer;
+
+    @Test
+    public void validateTest() throws Exception {
+
+        final String port = System.getProperty("server.http.port", "8080");
+        System.out.println("");
+        System.out.println("===========================================");
+        System.out.println("Running test on port: " + port);
+
+        deployer.deploy("webapp1");
+        int result = WebClient.create("http://localhost:" + port + "/WebApp1/test/")
+                .type(MediaType.APPLICATION_JSON_TYPE).post("validd").getStatus();
+        System.out.println(result);
+        Assert.assertEquals(406, result);
+
+        //Not interested in webapp2 output
+        // deployer.undeploy("webapp2");
+        deployer.deploy("webapp2");
+
+        result = WebClient.create("http://localhost:" + port + "/WebApp1/test/")
+                .type(MediaType.APPLICATION_JSON_TYPE).post("validd").getStatus();
+        System.out.println(result);
+        Assert.assertEquals(406, result);
+        deployer.undeploy("webapp2");
+        result = WebClient.create("http://localhost:" + port + "/WebApp1/test/")
+                .type(MediaType.APPLICATION_JSON_TYPE).post("validd").getStatus();
+        System.out.println(result);
+        Assert.assertEquals(406, result);
+        result = WebClient.create("http://localhost:" + port + "/WebApp1/test/")
+                .type(MediaType.APPLICATION_JSON_TYPE).post("valid").getStatus();
+        System.out.println(result);
+        Assert.assertEquals(200, result);
+        System.out.println("===========================================");
+        System.out.println("");
+    }
+
+}


[28/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java
index ff64a27..63fe60d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java
@@ -1,354 +1,354 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * Specifies how the container must manage transaction scopes for the enterprise
- * bean's method invocations. It consists of an optional description, a list of
- * method elements, and a transaction attribute.The transaction attribute is to
- * be applied to all the specified methods.
- * <p/>
- * <p/>
- * <p/>
- * Java class for MethodTransaction complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MethodTransaction">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="methodElements" type="{ejb.xmi}MethodElement"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="transactionAttribute" type="{ejb.xmi}TransactionAttributeType" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MethodTransaction", propOrder = {"methodElements",
-    "descriptions", "extensions"})
-public class MethodTransaction {
-
-    protected List<MethodElement> methodElements;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected TransactionAttributeEnum transactionAttribute;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the methodElements 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 methodElements property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMethodElements().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MethodElement }
-     */
-    public List<MethodElement> getMethodElements() {
-        if (methodElements == null) {
-            methodElements = new ArrayList<MethodElement>();
-        }
-        return this.methodElements;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the transactionAttribute property.
-     *
-     * @return possible object is {@link TransactionAttributeEnum }
-     */
-    public TransactionAttributeEnum getTransactionAttribute() {
-        return transactionAttribute;
-    }
-
-    /**
-     * Sets the value of the transactionAttribute property.
-     *
-     * @param value allowed object is {@link TransactionAttributeEnum }
-     */
-    public void setTransactionAttribute(final TransactionAttributeEnum value) {
-        this.transactionAttribute = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * Specifies how the container must manage transaction scopes for the enterprise
+ * bean's method invocations. It consists of an optional description, a list of
+ * method elements, and a transaction attribute.The transaction attribute is to
+ * be applied to all the specified methods.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for MethodTransaction complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MethodTransaction">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="methodElements" type="{ejb.xmi}MethodElement"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="transactionAttribute" type="{ejb.xmi}TransactionAttributeType" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MethodTransaction", propOrder = {"methodElements",
+    "descriptions", "extensions"})
+public class MethodTransaction {
+
+    protected List<MethodElement> methodElements;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected TransactionAttributeEnum transactionAttribute;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the methodElements 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 methodElements property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMethodElements().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MethodElement }
+     */
+    public List<MethodElement> getMethodElements() {
+        if (methodElements == null) {
+            methodElements = new ArrayList<MethodElement>();
+        }
+        return this.methodElements;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the transactionAttribute property.
+     *
+     * @return possible object is {@link TransactionAttributeEnum }
+     */
+    public TransactionAttributeEnum getTransactionAttribute() {
+        return transactionAttribute;
+    }
+
+    /**
+     * Sets the value of the transactionAttribute property.
+     *
+     * @param value allowed object is {@link TransactionAttributeEnum }
+     */
+    public void setTransactionAttribute(final TransactionAttributeEnum value) {
+        this.transactionAttribute = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MultiplicityEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MultiplicityEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MultiplicityEnum.java
index dab3ae1..c19a37b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MultiplicityEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MultiplicityEnum.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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for MultiplicityKind.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="MultiplicityKind">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="One"/>
- *     &lt;enumeration value="Many"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum MultiplicityEnum {
-
-    @XmlEnumValue("One")
-    ONE("One"), @XmlEnumValue("Many")
-    MANY("Many");
-    private final String value;
-
-    MultiplicityEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static MultiplicityEnum fromValue(final String v) {
-        for (final MultiplicityEnum c : MultiplicityEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for MultiplicityKind.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="MultiplicityKind">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="One"/>
+ *     &lt;enumeration value="Many"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum MultiplicityEnum {
+
+    @XmlEnumValue("One")
+    ONE("One"), @XmlEnumValue("Many")
+    MANY("Many");
+    private final String value;
+
+    MultiplicityEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static MultiplicityEnum fromValue(final String v) {
+        for (final MultiplicityEnum c : MultiplicityEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java
index 506e9bd..1ec3c1d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java
@@ -1,484 +1,484 @@
-/**
- * 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.was.v6.ejb;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the org.apache.openejb.jee.was.v6.ejb package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _CMPAttribute_QNAME = new QName("ejb.xmi",
-        "CMPAttribute");
-    private final static QName _ExcludeList_QNAME = new QName("ejb.xmi",
-        "ExcludeList");
-    private final static QName _EJBJar_QNAME = new QName("ejb.xmi", "EJBJar");
-    private final static QName _MessageDriven_QNAME = new QName("ejb.xmi",
-        "MessageDriven");
-    private final static QName _EJBMethodCategory_QNAME = new QName("ejb.xmi",
-        "EJBMethodCategory");
-    private final static QName _EnterpriseBean_QNAME = new QName("ejb.xmi",
-        "EnterpriseBean");
-    private final static QName _ContainerManagedEntity_QNAME = new QName(
-        "ejb.xmi", "ContainerManagedEntity");
-    private final static QName _MessageDrivenDestination_QNAME = new QName(
-        "ejb.xmi", "MessageDrivenDestination");
-    private final static QName _EJBRelation_QNAME = new QName("ejb.xmi",
-        "EJBRelation");
-    private final static QName _EJBRelationshipRole_QNAME = new QName(
-        "ejb.xmi", "EJBRelationshipRole");
-    private final static QName _RoleSource_QNAME = new QName("ejb.xmi",
-        "RoleSource");
-    private final static QName _ActivationConfigProperty_QNAME = new QName(
-        "ejb.xmi", "ActivationConfigProperty");
-    private final static QName _Session_QNAME = new QName("ejb.xmi", "Session");
-    private final static QName _MethodElement_QNAME = new QName("ejb.xmi",
-        "MethodElement");
-    private final static QName _MethodTransaction_QNAME = new QName("ejb.xmi",
-        "MethodTransaction");
-    private final static QName _AssemblyDescriptor_QNAME = new QName("ejb.xmi",
-        "AssemblyDescriptor");
-    private final static QName _Entity_QNAME = new QName("ejb.xmi", "Entity");
-    private final static QName _Query_QNAME = new QName("ejb.xmi", "Query");
-    private final static QName _MethodPermission_QNAME = new QName("ejb.xmi",
-        "MethodPermission");
-    private final static QName _Relationships_QNAME = new QName("ejb.xmi",
-        "Relationships");
-    private final static QName _CMRField_QNAME = new QName("ejb.xmi",
-        "CMRField");
-    private final static QName _QueryMethod_QNAME = new QName("ejb.xmi",
-        "QueryMethod");
-    private final static QName _ActivationConfig_QNAME = new QName("ejb.xmi",
-        "ActivationConfig");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package: org.apache.openejb.jee.was.v6.ejb
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ActivationConfig }
-     */
-    public ActivationConfig createActivationConfig() {
-        return new ActivationConfig();
-    }
-
-    /**
-     * Create an instance of {@link MessageDrivenDestination }
-     */
-    public MessageDrivenDestination createMessageDrivenDestination() {
-        return new MessageDrivenDestination();
-    }
-
-    /**
-     * Create an instance of {@link Session }
-     */
-    public Session createSession() {
-        return new Session();
-    }
-
-    /**
-     * Create an instance of {@link EnterpriseBean }
-     */
-    public EnterpriseBean createEnterpriseBean() {
-        return new EnterpriseBean();
-    }
-
-    /**
-     * Create an instance of {@link Query }
-     */
-    public Query createQuery() {
-        return new Query();
-    }
-
-    /**
-     * Create an instance of {@link MessageDriven }
-     */
-    public MessageDriven createMessageDriven() {
-        return new MessageDriven();
-    }
-
-    /**
-     * Create an instance of {@link EJBRelation }
-     */
-    public EJBRelation createEJBRelation() {
-        return new EJBRelation();
-    }
-
-    /**
-     * Create an instance of {@link AssemblyDescriptor }
-     */
-    public AssemblyDescriptor createAssemblyDescriptor() {
-        return new AssemblyDescriptor();
-    }
-
-    /**
-     * Create an instance of {@link EJBMethodCategory }
-     */
-    public EJBMethodCategory createEJBMethodCategory() {
-        return new EJBMethodCategory();
-    }
-
-    /**
-     * Create an instance of {@link MethodTransaction }
-     */
-    public MethodTransaction createMethodTransaction() {
-        return new MethodTransaction();
-    }
-
-    /**
-     * Create an instance of {@link CMRField }
-     */
-    public CMRField createCMRField() {
-        return new CMRField();
-    }
-
-    /**
-     * Create an instance of {@link MethodElement }
-     */
-    public MethodElement createMethodElement() {
-        return new MethodElement();
-    }
-
-    /**
-     * Create an instance of {@link ContainerManagedEntity }
-     */
-    public ContainerManagedEntity createContainerManagedEntity() {
-        return new ContainerManagedEntity();
-    }
-
-    /**
-     * Create an instance of {@link MethodPermission }
-     */
-    public MethodPermission createMethodPermission() {
-        return new MethodPermission();
-    }
-
-    /**
-     * Create an instance of {@link Relationships }
-     */
-    public Relationships createRelationships() {
-        return new Relationships();
-    }
-
-    /**
-     * Create an instance of {@link QueryMethod }
-     */
-    public QueryMethod createQueryMethod() {
-        return new QueryMethod();
-    }
-
-    /**
-     * Create an instance of {@link ExcludeList }
-     */
-    public ExcludeList createExcludeList() {
-        return new ExcludeList();
-    }
-
-    /**
-     * Create an instance of {@link RoleSource }
-     */
-    public RoleSource createRoleSource() {
-        return new RoleSource();
-    }
-
-    /**
-     * Create an instance of {@link EJBJar }
-     */
-    public EJBJar createEJBJar() {
-        return new EJBJar();
-    }
-
-    /**
-     * Create an instance of {@link Entity }
-     */
-    public Entity createEntity() {
-        return new Entity();
-    }
-
-    /**
-     * Create an instance of {@link ActivationConfigProperty }
-     */
-    public ActivationConfigProperty createActivationConfigProperty() {
-        return new ActivationConfigProperty();
-    }
-
-    /**
-     * Create an instance of {@link CMPAttribute }
-     */
-    public CMPAttribute createCMPAttribute() {
-        return new CMPAttribute();
-    }
-
-    /**
-     * Create an instance of {@link EJBRelationshipRole }
-     */
-    public EJBRelationshipRole createEJBRelationshipRole() {
-        return new EJBRelationshipRole();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CMPAttribute }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "CMPAttribute")
-    public JAXBElement<CMPAttribute> createCMPAttribute(final CMPAttribute value) {
-        return new JAXBElement<CMPAttribute>(_CMPAttribute_QNAME,
-            CMPAttribute.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExcludeList }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "ExcludeList")
-    public JAXBElement<ExcludeList> createExcludeList(final ExcludeList value) {
-        return new JAXBElement<ExcludeList>(_ExcludeList_QNAME,
-            ExcludeList.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EJBJar }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "EJBJar")
-    public JAXBElement<EJBJar> createEJBJar(final EJBJar value) {
-        return new JAXBElement<EJBJar>(_EJBJar_QNAME, EJBJar.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MessageDriven }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "MessageDriven")
-    public JAXBElement<MessageDriven> createMessageDriven(final MessageDriven value) {
-        return new JAXBElement<MessageDriven>(_MessageDriven_QNAME,
-            MessageDriven.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link EJBMethodCategory }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "EJBMethodCategory")
-    public JAXBElement<EJBMethodCategory> createEJBMethodCategory(
-        final EJBMethodCategory value) {
-        return new JAXBElement<EJBMethodCategory>(_EJBMethodCategory_QNAME,
-            EJBMethodCategory.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnterpriseBean }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "EnterpriseBean")
-    public JAXBElement<EnterpriseBean> createEnterpriseBean(final EnterpriseBean value) {
-        return new JAXBElement<EnterpriseBean>(_EnterpriseBean_QNAME,
-            EnterpriseBean.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link ContainerManagedEntity }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "ContainerManagedEntity")
-    public JAXBElement<ContainerManagedEntity> createContainerManagedEntity(
-        final ContainerManagedEntity value) {
-        return new JAXBElement<ContainerManagedEntity>(
-            _ContainerManagedEntity_QNAME, ContainerManagedEntity.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link MessageDrivenDestination }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "MessageDrivenDestination")
-    public JAXBElement<MessageDrivenDestination> createMessageDrivenDestination(
-        final MessageDrivenDestination value) {
-        return new JAXBElement<MessageDrivenDestination>(
-            _MessageDrivenDestination_QNAME,
-            MessageDrivenDestination.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EJBRelation }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "EJBRelation")
-    public JAXBElement<EJBRelation> createEJBRelation(final EJBRelation value) {
-        return new JAXBElement<EJBRelation>(_EJBRelation_QNAME,
-            EJBRelation.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link EJBRelationshipRole }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "EJBRelationshipRole")
-    public JAXBElement<EJBRelationshipRole> createEJBRelationshipRole(
-        final EJBRelationshipRole value) {
-        return new JAXBElement<EJBRelationshipRole>(_EJBRelationshipRole_QNAME,
-            EJBRelationshipRole.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RoleSource }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "RoleSource")
-    public JAXBElement<RoleSource> createRoleSource(final RoleSource value) {
-        return new JAXBElement<RoleSource>(_RoleSource_QNAME, RoleSource.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link ActivationConfigProperty }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "ActivationConfigProperty")
-    public JAXBElement<ActivationConfigProperty> createActivationConfigProperty(
-        final ActivationConfigProperty value) {
-        return new JAXBElement<ActivationConfigProperty>(
-            _ActivationConfigProperty_QNAME,
-            ActivationConfigProperty.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Session }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "Session")
-    public JAXBElement<Session> createSession(final Session value) {
-        return new JAXBElement<Session>(_Session_QNAME, Session.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MethodElement }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "MethodElement")
-    public JAXBElement<MethodElement> createMethodElement(final MethodElement value) {
-        return new JAXBElement<MethodElement>(_MethodElement_QNAME,
-            MethodElement.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link MethodTransaction }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "MethodTransaction")
-    public JAXBElement<MethodTransaction> createMethodTransaction(
-        final MethodTransaction value) {
-        return new JAXBElement<MethodTransaction>(_MethodTransaction_QNAME,
-            MethodTransaction.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link AssemblyDescriptor }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "AssemblyDescriptor")
-    public JAXBElement<AssemblyDescriptor> createAssemblyDescriptor(
-        final AssemblyDescriptor value) {
-        return new JAXBElement<AssemblyDescriptor>(_AssemblyDescriptor_QNAME,
-            AssemblyDescriptor.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Entity }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "Entity")
-    public JAXBElement<Entity> createEntity(final Entity value) {
-        return new JAXBElement<Entity>(_Entity_QNAME, Entity.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Query }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "Query")
-    public JAXBElement<Query> createQuery(final Query value) {
-        return new JAXBElement<Query>(_Query_QNAME, Query.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link MethodPermission }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "MethodPermission")
-    public JAXBElement<MethodPermission> createMethodPermission(
-        final MethodPermission value) {
-        return new JAXBElement<MethodPermission>(_MethodPermission_QNAME,
-            MethodPermission.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Relationships }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "Relationships")
-    public JAXBElement<Relationships> createRelationships(final Relationships value) {
-        return new JAXBElement<Relationships>(_Relationships_QNAME,
-            Relationships.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CMRField }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "CMRField")
-    public JAXBElement<CMRField> createCMRField(final CMRField value) {
-        return new JAXBElement<CMRField>(_CMRField_QNAME, CMRField.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QueryMethod }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "QueryMethod")
-    public JAXBElement<QueryMethod> createQueryMethod(final QueryMethod value) {
-        return new JAXBElement<QueryMethod>(_QueryMethod_QNAME,
-            QueryMethod.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link ActivationConfig }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejb.xmi", name = "ActivationConfig")
-    public JAXBElement<ActivationConfig> createActivationConfig(
-        final ActivationConfig value) {
-        return new JAXBElement<ActivationConfig>(_ActivationConfig_QNAME,
-            ActivationConfig.class, null, 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.was.v6.ejb;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the org.apache.openejb.jee.was.v6.ejb package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _CMPAttribute_QNAME = new QName("ejb.xmi",
+        "CMPAttribute");
+    private final static QName _ExcludeList_QNAME = new QName("ejb.xmi",
+        "ExcludeList");
+    private final static QName _EJBJar_QNAME = new QName("ejb.xmi", "EJBJar");
+    private final static QName _MessageDriven_QNAME = new QName("ejb.xmi",
+        "MessageDriven");
+    private final static QName _EJBMethodCategory_QNAME = new QName("ejb.xmi",
+        "EJBMethodCategory");
+    private final static QName _EnterpriseBean_QNAME = new QName("ejb.xmi",
+        "EnterpriseBean");
+    private final static QName _ContainerManagedEntity_QNAME = new QName(
+        "ejb.xmi", "ContainerManagedEntity");
+    private final static QName _MessageDrivenDestination_QNAME = new QName(
+        "ejb.xmi", "MessageDrivenDestination");
+    private final static QName _EJBRelation_QNAME = new QName("ejb.xmi",
+        "EJBRelation");
+    private final static QName _EJBRelationshipRole_QNAME = new QName(
+        "ejb.xmi", "EJBRelationshipRole");
+    private final static QName _RoleSource_QNAME = new QName("ejb.xmi",
+        "RoleSource");
+    private final static QName _ActivationConfigProperty_QNAME = new QName(
+        "ejb.xmi", "ActivationConfigProperty");
+    private final static QName _Session_QNAME = new QName("ejb.xmi", "Session");
+    private final static QName _MethodElement_QNAME = new QName("ejb.xmi",
+        "MethodElement");
+    private final static QName _MethodTransaction_QNAME = new QName("ejb.xmi",
+        "MethodTransaction");
+    private final static QName _AssemblyDescriptor_QNAME = new QName("ejb.xmi",
+        "AssemblyDescriptor");
+    private final static QName _Entity_QNAME = new QName("ejb.xmi", "Entity");
+    private final static QName _Query_QNAME = new QName("ejb.xmi", "Query");
+    private final static QName _MethodPermission_QNAME = new QName("ejb.xmi",
+        "MethodPermission");
+    private final static QName _Relationships_QNAME = new QName("ejb.xmi",
+        "Relationships");
+    private final static QName _CMRField_QNAME = new QName("ejb.xmi",
+        "CMRField");
+    private final static QName _QueryMethod_QNAME = new QName("ejb.xmi",
+        "QueryMethod");
+    private final static QName _ActivationConfig_QNAME = new QName("ejb.xmi",
+        "ActivationConfig");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package: org.apache.openejb.jee.was.v6.ejb
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ActivationConfig }
+     */
+    public ActivationConfig createActivationConfig() {
+        return new ActivationConfig();
+    }
+
+    /**
+     * Create an instance of {@link MessageDrivenDestination }
+     */
+    public MessageDrivenDestination createMessageDrivenDestination() {
+        return new MessageDrivenDestination();
+    }
+
+    /**
+     * Create an instance of {@link Session }
+     */
+    public Session createSession() {
+        return new Session();
+    }
+
+    /**
+     * Create an instance of {@link EnterpriseBean }
+     */
+    public EnterpriseBean createEnterpriseBean() {
+        return new EnterpriseBean();
+    }
+
+    /**
+     * Create an instance of {@link Query }
+     */
+    public Query createQuery() {
+        return new Query();
+    }
+
+    /**
+     * Create an instance of {@link MessageDriven }
+     */
+    public MessageDriven createMessageDriven() {
+        return new MessageDriven();
+    }
+
+    /**
+     * Create an instance of {@link EJBRelation }
+     */
+    public EJBRelation createEJBRelation() {
+        return new EJBRelation();
+    }
+
+    /**
+     * Create an instance of {@link AssemblyDescriptor }
+     */
+    public AssemblyDescriptor createAssemblyDescriptor() {
+        return new AssemblyDescriptor();
+    }
+
+    /**
+     * Create an instance of {@link EJBMethodCategory }
+     */
+    public EJBMethodCategory createEJBMethodCategory() {
+        return new EJBMethodCategory();
+    }
+
+    /**
+     * Create an instance of {@link MethodTransaction }
+     */
+    public MethodTransaction createMethodTransaction() {
+        return new MethodTransaction();
+    }
+
+    /**
+     * Create an instance of {@link CMRField }
+     */
+    public CMRField createCMRField() {
+        return new CMRField();
+    }
+
+    /**
+     * Create an instance of {@link MethodElement }
+     */
+    public MethodElement createMethodElement() {
+        return new MethodElement();
+    }
+
+    /**
+     * Create an instance of {@link ContainerManagedEntity }
+     */
+    public ContainerManagedEntity createContainerManagedEntity() {
+        return new ContainerManagedEntity();
+    }
+
+    /**
+     * Create an instance of {@link MethodPermission }
+     */
+    public MethodPermission createMethodPermission() {
+        return new MethodPermission();
+    }
+
+    /**
+     * Create an instance of {@link Relationships }
+     */
+    public Relationships createRelationships() {
+        return new Relationships();
+    }
+
+    /**
+     * Create an instance of {@link QueryMethod }
+     */
+    public QueryMethod createQueryMethod() {
+        return new QueryMethod();
+    }
+
+    /**
+     * Create an instance of {@link ExcludeList }
+     */
+    public ExcludeList createExcludeList() {
+        return new ExcludeList();
+    }
+
+    /**
+     * Create an instance of {@link RoleSource }
+     */
+    public RoleSource createRoleSource() {
+        return new RoleSource();
+    }
+
+    /**
+     * Create an instance of {@link EJBJar }
+     */
+    public EJBJar createEJBJar() {
+        return new EJBJar();
+    }
+
+    /**
+     * Create an instance of {@link Entity }
+     */
+    public Entity createEntity() {
+        return new Entity();
+    }
+
+    /**
+     * Create an instance of {@link ActivationConfigProperty }
+     */
+    public ActivationConfigProperty createActivationConfigProperty() {
+        return new ActivationConfigProperty();
+    }
+
+    /**
+     * Create an instance of {@link CMPAttribute }
+     */
+    public CMPAttribute createCMPAttribute() {
+        return new CMPAttribute();
+    }
+
+    /**
+     * Create an instance of {@link EJBRelationshipRole }
+     */
+    public EJBRelationshipRole createEJBRelationshipRole() {
+        return new EJBRelationshipRole();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link CMPAttribute }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "CMPAttribute")
+    public JAXBElement<CMPAttribute> createCMPAttribute(final CMPAttribute value) {
+        return new JAXBElement<CMPAttribute>(_CMPAttribute_QNAME,
+            CMPAttribute.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ExcludeList }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "ExcludeList")
+    public JAXBElement<ExcludeList> createExcludeList(final ExcludeList value) {
+        return new JAXBElement<ExcludeList>(_ExcludeList_QNAME,
+            ExcludeList.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EJBJar }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "EJBJar")
+    public JAXBElement<EJBJar> createEJBJar(final EJBJar value) {
+        return new JAXBElement<EJBJar>(_EJBJar_QNAME, EJBJar.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link MessageDriven }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "MessageDriven")
+    public JAXBElement<MessageDriven> createMessageDriven(final MessageDriven value) {
+        return new JAXBElement<MessageDriven>(_MessageDriven_QNAME,
+            MessageDriven.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link EJBMethodCategory }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "EJBMethodCategory")
+    public JAXBElement<EJBMethodCategory> createEJBMethodCategory(
+        final EJBMethodCategory value) {
+        return new JAXBElement<EJBMethodCategory>(_EJBMethodCategory_QNAME,
+            EJBMethodCategory.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EnterpriseBean }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "EnterpriseBean")
+    public JAXBElement<EnterpriseBean> createEnterpriseBean(final EnterpriseBean value) {
+        return new JAXBElement<EnterpriseBean>(_EnterpriseBean_QNAME,
+            EnterpriseBean.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link ContainerManagedEntity }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "ContainerManagedEntity")
+    public JAXBElement<ContainerManagedEntity> createContainerManagedEntity(
+        final ContainerManagedEntity value) {
+        return new JAXBElement<ContainerManagedEntity>(
+            _ContainerManagedEntity_QNAME, ContainerManagedEntity.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link MessageDrivenDestination }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "MessageDrivenDestination")
+    public JAXBElement<MessageDrivenDestination> createMessageDrivenDestination(
+        final MessageDrivenDestination value) {
+        return new JAXBElement<MessageDrivenDestination>(
+            _MessageDrivenDestination_QNAME,
+            MessageDrivenDestination.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EJBRelation }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "EJBRelation")
+    public JAXBElement<EJBRelation> createEJBRelation(final EJBRelation value) {
+        return new JAXBElement<EJBRelation>(_EJBRelation_QNAME,
+            EJBRelation.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link EJBRelationshipRole }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "EJBRelationshipRole")
+    public JAXBElement<EJBRelationshipRole> createEJBRelationshipRole(
+        final EJBRelationshipRole value) {
+        return new JAXBElement<EJBRelationshipRole>(_EJBRelationshipRole_QNAME,
+            EJBRelationshipRole.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link RoleSource }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "RoleSource")
+    public JAXBElement<RoleSource> createRoleSource(final RoleSource value) {
+        return new JAXBElement<RoleSource>(_RoleSource_QNAME, RoleSource.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link ActivationConfigProperty }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "ActivationConfigProperty")
+    public JAXBElement<ActivationConfigProperty> createActivationConfigProperty(
+        final ActivationConfigProperty value) {
+        return new JAXBElement<ActivationConfigProperty>(
+            _ActivationConfigProperty_QNAME,
+            ActivationConfigProperty.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Session }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "Session")
+    public JAXBElement<Session> createSession(final Session value) {
+        return new JAXBElement<Session>(_Session_QNAME, Session.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link MethodElement }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "MethodElement")
+    public JAXBElement<MethodElement> createMethodElement(final MethodElement value) {
+        return new JAXBElement<MethodElement>(_MethodElement_QNAME,
+            MethodElement.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link MethodTransaction }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "MethodTransaction")
+    public JAXBElement<MethodTransaction> createMethodTransaction(
+        final MethodTransaction value) {
+        return new JAXBElement<MethodTransaction>(_MethodTransaction_QNAME,
+            MethodTransaction.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link AssemblyDescriptor }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "AssemblyDescriptor")
+    public JAXBElement<AssemblyDescriptor> createAssemblyDescriptor(
+        final AssemblyDescriptor value) {
+        return new JAXBElement<AssemblyDescriptor>(_AssemblyDescriptor_QNAME,
+            AssemblyDescriptor.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Entity }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "Entity")
+    public JAXBElement<Entity> createEntity(final Entity value) {
+        return new JAXBElement<Entity>(_Entity_QNAME, Entity.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Query }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "Query")
+    public JAXBElement<Query> createQuery(final Query value) {
+        return new JAXBElement<Query>(_Query_QNAME, Query.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link MethodPermission }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "MethodPermission")
+    public JAXBElement<MethodPermission> createMethodPermission(
+        final MethodPermission value) {
+        return new JAXBElement<MethodPermission>(_MethodPermission_QNAME,
+            MethodPermission.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Relationships }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "Relationships")
+    public JAXBElement<Relationships> createRelationships(final Relationships value) {
+        return new JAXBElement<Relationships>(_Relationships_QNAME,
+            Relationships.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link CMRField }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "CMRField")
+    public JAXBElement<CMRField> createCMRField(final CMRField value) {
+        return new JAXBElement<CMRField>(_CMRField_QNAME, CMRField.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link QueryMethod }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "QueryMethod")
+    public JAXBElement<QueryMethod> createQueryMethod(final QueryMethod value) {
+        return new JAXBElement<QueryMethod>(_QueryMethod_QNAME,
+            QueryMethod.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link ActivationConfig }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejb.xmi", name = "ActivationConfig")
+    public JAXBElement<ActivationConfig> createActivationConfig(
+        final ActivationConfig value) {
+        return new JAXBElement<ActivationConfig>(_ActivationConfig_QNAME,
+            ActivationConfig.class, null, value);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java
index 2022be0..7ca7559 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java
@@ -1,380 +1,380 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The query element is used to specify a finder or select query. It contains an
- * optional description of the query; the specification of the finder or select
- * method it is used by; a specification of the return type mapping, if any, if
- * the query is for a select method; and the EJB QL query string that defines
- * the query. Queries that are expressible in EJB QL must use the ejb-ql element
- * to specify the query. If a query is not expressible in EJB QL, the
- * description element should be used to describe the semantics of the query and
- * the ejb-ql element should be empty.
- * <p/>
- * <p/>
- * <p/>
- * Java class for Query complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Query">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="queryMethod" type="{ejb.xmi}QueryMethod"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="ejbQL" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="returnTypeMapping" type="{ejb.xmi}ReturnTypeMapping" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Query", propOrder = {"queryMethods", "descriptions",
-    "extensions"})
-public class Query {
-
-    @XmlElement(name = "queryMethod")
-    protected List<QueryMethod> queryMethods;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String ejbQL;
-    @XmlAttribute
-    protected ReturnTypeMappingEnum returnTypeMapping;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the queryMethods 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 queryMethods property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getQueryMethods().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link QueryMethod }
-     */
-    public List<QueryMethod> getQueryMethods() {
-        if (queryMethods == null) {
-            queryMethods = new ArrayList<QueryMethod>();
-        }
-        return this.queryMethods;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the ejbQL property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEjbQL() {
-        return ejbQL;
-    }
-
-    /**
-     * Sets the value of the ejbQL property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEjbQL(final String value) {
-        this.ejbQL = value;
-    }
-
-    /**
-     * Gets the value of the returnTypeMapping property.
-     *
-     * @return possible object is {@link ReturnTypeMappingEnum }
-     */
-    public ReturnTypeMappingEnum getReturnTypeMapping() {
-        return returnTypeMapping;
-    }
-
-    /**
-     * Sets the value of the returnTypeMapping property.
-     *
-     * @param value allowed object is {@link ReturnTypeMappingEnum }
-     */
-    public void setReturnTypeMapping(final ReturnTypeMappingEnum value) {
-        this.returnTypeMapping = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The query element is used to specify a finder or select query. It contains an
+ * optional description of the query; the specification of the finder or select
+ * method it is used by; a specification of the return type mapping, if any, if
+ * the query is for a select method; and the EJB QL query string that defines
+ * the query. Queries that are expressible in EJB QL must use the ejb-ql element
+ * to specify the query. If a query is not expressible in EJB QL, the
+ * description element should be used to describe the semantics of the query and
+ * the ejb-ql element should be empty.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for Query complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Query">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="queryMethod" type="{ejb.xmi}QueryMethod"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ejbQL" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="returnTypeMapping" type="{ejb.xmi}ReturnTypeMapping" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Query", propOrder = {"queryMethods", "descriptions",
+    "extensions"})
+public class Query {
+
+    @XmlElement(name = "queryMethod")
+    protected List<QueryMethod> queryMethods;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String ejbQL;
+    @XmlAttribute
+    protected ReturnTypeMappingEnum returnTypeMapping;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the queryMethods 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 queryMethods property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getQueryMethods().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link QueryMethod }
+     */
+    public List<QueryMethod> getQueryMethods() {
+        if (queryMethods == null) {
+            queryMethods = new ArrayList<QueryMethod>();
+        }
+        return this.queryMethods;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the ejbQL property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEjbQL() {
+        return ejbQL;
+    }
+
+    /**
+     * Sets the value of the ejbQL property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEjbQL(final String value) {
+        this.ejbQL = value;
+    }
+
+    /**
+     * Gets the value of the returnTypeMapping property.
+     *
+     * @return possible object is {@link ReturnTypeMappingEnum }
+     */
+    public ReturnTypeMappingEnum getReturnTypeMapping() {
+        return returnTypeMapping;
+    }
+
+    /**
+     * Sets the value of the returnTypeMapping property.
+     *
+     * @param value allowed object is {@link ReturnTypeMappingEnum }
+     */
+    public void setReturnTypeMapping(final ReturnTypeMappingEnum value) {
+        this.returnTypeMapping = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}


[47/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java
index f591370..5393bb9 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java
@@ -1,184 +1,184 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.EntityBean;
-import org.apache.openejb.jee.PersistenceType;
-import org.apache.openejb.jee.StatefulBean;
-import org.apache.openejb.jee.StatelessBean;
-import org.junit.runner.RunWith;
-
-import javax.ejb.EJBException;
-import javax.ejb.EntityContext;
-import javax.ejb.RemoveException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import java.rmi.RemoteException;
-
-@RunWith(ValidationRunner.class)
-public class CheckMissingClassTest {
-    @Keys(@Key(value = "missing.class", count = 16))
-    public EjbJar wrongClassType() throws OpenEJBException {
-        System.setProperty("openejb.validation.output.level", "VERBOSE");
-        final EjbJar ejbJar = new EjbJar();
-        final StatelessBean stateless = new StatelessBean(FooStateless.class);
-        stateless.setHomeAndRemote("WrongHome", "WrongRemote");
-        stateless.setLocal("WrongLocal");
-        stateless.setLocalHome("WrongLocalHome");
-        ejbJar.addEnterpriseBean(stateless);
-        final StatefulBean stateful = new StatefulBean(FooStateful.class);
-        stateful.setHomeAndRemote("WrongHome", "WrongRemote");
-        stateful.setLocal("WrongLocal");
-        stateful.setLocalHome("WrongLocalHome");
-        ejbJar.addEnterpriseBean(stateful);
-        final EntityBean bmpEntityBean = new EntityBean(FooEntityBMP.class, PersistenceType.BEAN);
-        bmpEntityBean.setHome("WrongHome");
-        bmpEntityBean.setLocalHome("WrongLocalHome");
-        bmpEntityBean.setRemote("WrongRemote");
-        bmpEntityBean.setLocal("WrongLocal");
-        ejbJar.addEnterpriseBean(bmpEntityBean);
-        final EntityBean cmpEntityBean = new EntityBean(FooEntityCMP.class, PersistenceType.CONTAINER);
-        cmpEntityBean.setHome("WrongHome");
-        cmpEntityBean.setLocalHome("WrongLocalHome");
-        cmpEntityBean.setRemote("WrongRemote");
-        cmpEntityBean.setLocal("WrongLocal");
-        ejbJar.addEnterpriseBean(cmpEntityBean);
-        return ejbJar;
-    }
-
-    private static class FooStateless implements SessionBean {
-        public void ejbCreate() {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-
-    private static class FooStateful implements SessionBean {
-        public void ejbCreate() {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-
-    private static class FooEntityBMP implements javax.ejb.EntityBean {
-        public String ejbCreate(final String id) {
-            return null;
-        }
-
-        public void ejbPostCreate(final String id) {
-        }
-
-        ;
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbLoad() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws RemoveException, EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbStore() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setEntityContext(final EntityContext arg0) throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void unsetEntityContext() throws EJBException, RemoteException {
-        }
-    }
-
-    private static class FooEntityCMP implements javax.ejb.EntityBean {
-        public String ejbCreate(final String id) {
-            return null;
-        }
-
-        public void ejbPostCreate(final String id) {
-        }
-
-        ;
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbLoad() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws RemoveException, EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbStore() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setEntityContext(final EntityContext arg0) throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void unsetEntityContext() throws EJBException, RemoteException {
-        }
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EntityBean;
+import org.apache.openejb.jee.PersistenceType;
+import org.apache.openejb.jee.StatefulBean;
+import org.apache.openejb.jee.StatelessBean;
+import org.junit.runner.RunWith;
+
+import javax.ejb.EJBException;
+import javax.ejb.EntityContext;
+import javax.ejb.RemoveException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import java.rmi.RemoteException;
+
+@RunWith(ValidationRunner.class)
+public class CheckMissingClassTest {
+    @Keys(@Key(value = "missing.class", count = 16))
+    public EjbJar wrongClassType() throws OpenEJBException {
+        System.setProperty("openejb.validation.output.level", "VERBOSE");
+        final EjbJar ejbJar = new EjbJar();
+        final StatelessBean stateless = new StatelessBean(FooStateless.class);
+        stateless.setHomeAndRemote("WrongHome", "WrongRemote");
+        stateless.setLocal("WrongLocal");
+        stateless.setLocalHome("WrongLocalHome");
+        ejbJar.addEnterpriseBean(stateless);
+        final StatefulBean stateful = new StatefulBean(FooStateful.class);
+        stateful.setHomeAndRemote("WrongHome", "WrongRemote");
+        stateful.setLocal("WrongLocal");
+        stateful.setLocalHome("WrongLocalHome");
+        ejbJar.addEnterpriseBean(stateful);
+        final EntityBean bmpEntityBean = new EntityBean(FooEntityBMP.class, PersistenceType.BEAN);
+        bmpEntityBean.setHome("WrongHome");
+        bmpEntityBean.setLocalHome("WrongLocalHome");
+        bmpEntityBean.setRemote("WrongRemote");
+        bmpEntityBean.setLocal("WrongLocal");
+        ejbJar.addEnterpriseBean(bmpEntityBean);
+        final EntityBean cmpEntityBean = new EntityBean(FooEntityCMP.class, PersistenceType.CONTAINER);
+        cmpEntityBean.setHome("WrongHome");
+        cmpEntityBean.setLocalHome("WrongLocalHome");
+        cmpEntityBean.setRemote("WrongRemote");
+        cmpEntityBean.setLocal("WrongLocal");
+        ejbJar.addEnterpriseBean(cmpEntityBean);
+        return ejbJar;
+    }
+
+    private static class FooStateless implements SessionBean {
+        public void ejbCreate() {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+
+    private static class FooStateful implements SessionBean {
+        public void ejbCreate() {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+
+    private static class FooEntityBMP implements javax.ejb.EntityBean {
+        public String ejbCreate(final String id) {
+            return null;
+        }
+
+        public void ejbPostCreate(final String id) {
+        }
+
+        ;
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbLoad() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws RemoveException, EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbStore() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setEntityContext(final EntityContext arg0) throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void unsetEntityContext() throws EJBException, RemoteException {
+        }
+    }
+
+    private static class FooEntityCMP implements javax.ejb.EntityBean {
+        public String ejbCreate(final String id) {
+            return null;
+        }
+
+        public void ejbPostCreate(final String id) {
+        }
+
+        ;
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbLoad() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws RemoveException, EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbStore() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setEntityContext(final EntityContext arg0) throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void unsetEntityContext() throws EJBException, RemoteException {
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java
index 180c6e1..f591735 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java
@@ -1,198 +1,198 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatefulBean;
-import org.apache.openejb.jee.StatelessBean;
-import org.junit.runner.RunWith;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.EJBLocalObject;
-import javax.ejb.EJBObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import java.rmi.RemoteException;
-
-@RunWith(ValidationRunner.class)
-public class CheckNoBusinessMethodTest {
-    @Keys({@Key(value = "no.busines.method.case", count = 4), @Key(value = "no.busines.method.args", count = 4), @Key(value = "no.busines.method", count = 4)})
-    public EjbJar noBusinessMethod() throws OpenEJBException {
-        // System.setProperty("openejb.validation.output.level", "VERBOSE");
-        final EjbJar ejbJar = new EjbJar();
-        final StatelessBean stateLessLocal = new StatelessBean(FooStatelessSession.class);
-        stateLessLocal.setLocalHome("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooLocalHome");
-        stateLessLocal.setLocal("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooLocal");
-        final StatefulBean statefulLocal = new StatefulBean(FooStatefulSession.class);
-        statefulLocal.setLocalHome("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooLocalHome");
-        statefulLocal.setLocal("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooLocal");
-        final StatelessBean stateLessRemote = new StatelessBean(FooRemoteStatelessSession.class);
-        stateLessRemote.setHome("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooRemoteHome");
-        stateLessRemote.setRemote("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooRemote");
-        final StatefulBean statefulRemote = new StatefulBean(FooRemoteStatefulSession.class);
-        statefulRemote.setHome("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooRemoteHome");
-        statefulRemote.setRemote("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooRemote");
-        ejbJar.addEnterpriseBean(stateLessLocal);
-        ejbJar.addEnterpriseBean(statefulLocal);
-        ejbJar.addEnterpriseBean(stateLessRemote);
-        ejbJar.addEnterpriseBean(statefulRemote);
-        return ejbJar;
-    }
-
-    private static interface FooLocalHome extends EJBLocalHome {
-        FooLocal create() throws CreateException;
-    }
-
-    private static interface FooLocal extends EJBLocalObject {
-        void foo(String x, String y);
-
-        // this method is not implemented by the bean class
-        void foo1();
-    }
-
-    private static class FooStatelessSession implements SessionBean {
-        // method name is same as in the Local interface, except arguments are different
-        public void foo(final int x, final String y) {
-        }
-
-        // method name has a different case
-        public void Foo(final String x, final String y) {
-        }
-
-        public void ejbCreate() {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-
-    private static class FooStatefulSession implements SessionBean {
-        // method name is same as in the Local interface, except arguments are different
-        public void foo(final int x, final String y) {
-        }
-
-        // method name has a different case
-        public void Foo(final String x, final String y) {
-        }
-
-        public void ejbCreate() {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-
-    // =================
-    private static interface FooRemoteHome extends EJBHome {
-        FooRemote create() throws RemoteException, CreateException;
-    }
-
-    private static interface FooRemote extends EJBObject {
-        void foo(String x, String y) throws RemoteException;
-
-        // This method is not implemented by the bean class
-        void foo1() throws RemoteException;
-    }
-
-    private static class FooRemoteStatelessSession implements SessionBean {
-        // method name is same as in the Remote interface, except arguments are different
-        public void foo(final int x, final String y) {
-        }
-
-        // method name has a different case
-        public void Foo(final String x, final String y) {
-        }
-
-        public void ejbCreate() {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-
-    private static class FooRemoteStatefulSession implements SessionBean {
-        // method name is same as in the Remote interface, except arguments are different
-        public void foo(final int x, final String y) {
-        }
-
-        // method name has a different case
-        public void Foo(final String x, final String y) {
-        }
-
-        public void ejbCreate() {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatefulBean;
+import org.apache.openejb.jee.StatelessBean;
+import org.junit.runner.RunWith;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBLocalHome;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import java.rmi.RemoteException;
+
+@RunWith(ValidationRunner.class)
+public class CheckNoBusinessMethodTest {
+    @Keys({@Key(value = "no.busines.method.case", count = 4), @Key(value = "no.busines.method.args", count = 4), @Key(value = "no.busines.method", count = 4)})
+    public EjbJar noBusinessMethod() throws OpenEJBException {
+        // System.setProperty("openejb.validation.output.level", "VERBOSE");
+        final EjbJar ejbJar = new EjbJar();
+        final StatelessBean stateLessLocal = new StatelessBean(FooStatelessSession.class);
+        stateLessLocal.setLocalHome("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooLocalHome");
+        stateLessLocal.setLocal("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooLocal");
+        final StatefulBean statefulLocal = new StatefulBean(FooStatefulSession.class);
+        statefulLocal.setLocalHome("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooLocalHome");
+        statefulLocal.setLocal("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooLocal");
+        final StatelessBean stateLessRemote = new StatelessBean(FooRemoteStatelessSession.class);
+        stateLessRemote.setHome("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooRemoteHome");
+        stateLessRemote.setRemote("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooRemote");
+        final StatefulBean statefulRemote = new StatefulBean(FooRemoteStatefulSession.class);
+        statefulRemote.setHome("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooRemoteHome");
+        statefulRemote.setRemote("org.apache.openejb.config.rules.CheckNoBusinessMethodTest$FooRemote");
+        ejbJar.addEnterpriseBean(stateLessLocal);
+        ejbJar.addEnterpriseBean(statefulLocal);
+        ejbJar.addEnterpriseBean(stateLessRemote);
+        ejbJar.addEnterpriseBean(statefulRemote);
+        return ejbJar;
+    }
+
+    private static interface FooLocalHome extends EJBLocalHome {
+        FooLocal create() throws CreateException;
+    }
+
+    private static interface FooLocal extends EJBLocalObject {
+        void foo(String x, String y);
+
+        // this method is not implemented by the bean class
+        void foo1();
+    }
+
+    private static class FooStatelessSession implements SessionBean {
+        // method name is same as in the Local interface, except arguments are different
+        public void foo(final int x, final String y) {
+        }
+
+        // method name has a different case
+        public void Foo(final String x, final String y) {
+        }
+
+        public void ejbCreate() {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+
+    private static class FooStatefulSession implements SessionBean {
+        // method name is same as in the Local interface, except arguments are different
+        public void foo(final int x, final String y) {
+        }
+
+        // method name has a different case
+        public void Foo(final String x, final String y) {
+        }
+
+        public void ejbCreate() {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+
+    // =================
+    private static interface FooRemoteHome extends EJBHome {
+        FooRemote create() throws RemoteException, CreateException;
+    }
+
+    private static interface FooRemote extends EJBObject {
+        void foo(String x, String y) throws RemoteException;
+
+        // This method is not implemented by the bean class
+        void foo1() throws RemoteException;
+    }
+
+    private static class FooRemoteStatelessSession implements SessionBean {
+        // method name is same as in the Remote interface, except arguments are different
+        public void foo(final int x, final String y) {
+        }
+
+        // method name has a different case
+        public void Foo(final String x, final String y) {
+        }
+
+        public void ejbCreate() {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+
+    private static class FooRemoteStatefulSession implements SessionBean {
+        // method name is same as in the Remote interface, except arguments are different
+        public void foo(final int x, final String y) {
+        }
+
+        // method name has a different case
+        public void Foo(final String x, final String y) {
+        }
+
+        public void ejbCreate() {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java
index d5f3144..554ce09 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java
@@ -1,280 +1,280 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.PersistenceType;
-import org.apache.openejb.jee.StatefulBean;
-import org.apache.openejb.jee.StatelessBean;
-import org.junit.runner.RunWith;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.EJBLocalObject;
-import javax.ejb.EntityBean;
-import javax.ejb.EntityContext;
-import javax.ejb.FinderException;
-import javax.ejb.LocalHome;
-import javax.ejb.RemoteHome;
-import javax.ejb.RemoveException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import java.rmi.RemoteException;
-
-@RunWith(ValidationRunner.class)
-public class CheckNoCreateMethodsTest {
-    @Keys({@Key(value = "no.home.create", count = 4), @Key(value = "unused.ejb.create", count = 2, type = KeyType.WARNING),
-        @Key(value = "unused.ejbPostCreate", type = KeyType.WARNING), @Key("entity.no.ejb.create"), @Key(value = "session.no.ejb.create", count = 2)})
-    public EjbJar noCreateMethod() throws OpenEJBException {
-        System.setProperty("openejb.validation.output.level", "VERBOSE");
-        final EjbJar ejbJar = new EjbJar();
-        final StatelessBean stateless = new StatelessBean(FooStateless.class);
-        stateless.setHomeAndRemote(FooStatelessHome.class, FooStatelessRemote.class);
-        stateless.setHomeAndLocal(FooStatelessLocalHome.class, FooStatelessLocal.class);
-        ejbJar.addEnterpriseBean(stateless);
-        final StatefulBean stateful = new StatefulBean(FooStateful.class);
-        stateful.setHomeAndRemote(FooStatefulHome.class, FooStatefulRemote.class);
-        stateful.setHomeAndLocal(FooStatefulLocalHome.class, FooStatefulLocal.class);
-        ejbJar.addEnterpriseBean(stateful);
-        final org.apache.openejb.jee.EntityBean bean = new org.apache.openejb.jee.EntityBean(MyEntity.class, PersistenceType.BEAN);
-        bean.setLocalHome(MyLocalHome.class.getName());
-        bean.setLocal(MyLocal.class.getName());
-        ejbJar.addEnterpriseBean(bean);
-        final org.apache.openejb.jee.EntityBean bean1 = new org.apache.openejb.jee.EntityBean(YourEntity.class, PersistenceType.BEAN);
-        bean1.setLocalHome(MyLocalHome.class.getName());
-        bean1.setLocal(MyLocal.class.getName());
-        ejbJar.addEnterpriseBean(bean1);
-        final StatelessBean bar = new StatelessBean(BarStateless.class);
-        bar.setHomeAndRemote(BarStatelessHome.class, BarStatelessRemote.class);
-        ejbJar.addEnterpriseBean(bar);
-        final StatefulBean bazStateful = new StatefulBean(BazStateful.class);
-        ejbJar.addEnterpriseBean(bazStateful);
-        return ejbJar;
-    }
-
-    private static interface FooStatelessHome extends javax.ejb.EJBHome {
-    }
-
-    private static interface FooStatelessRemote extends javax.ejb.EJBObject {
-    }
-
-    private static interface FooStatelessLocalHome extends javax.ejb.EJBLocalHome {
-    }
-
-    private static interface FooStatelessLocal extends javax.ejb.EJBLocalObject {
-    }
-
-    private static class FooStateless implements SessionBean {
-        public void ejbCreate() {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-
-    private static interface FooStatefulHome extends javax.ejb.EJBHome {
-    }
-
-    private static interface FooStatefulRemote extends javax.ejb.EJBObject {
-    }
-
-    private static interface FooStatefulLocalHome extends javax.ejb.EJBLocalHome {
-    }
-
-    private static interface FooStatefulLocal extends javax.ejb.EJBLocalObject {
-    }
-
-    private static class FooStateful implements SessionBean {
-        public void ejbCreate() {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-
-    private static interface MyLocalHome extends EJBLocalHome {
-        public MyLocal create(Integer pk) throws CreateException;
-
-        public MyLocal findByPrimaryKey(Integer pk) throws FinderException;
-    }
-
-    private static interface MyLocal extends EJBLocalObject {
-    }
-
-    private static class MyEntity implements EntityBean {
-        public Integer ejbCreate(final Integer pk) throws CreateException {
-            return null;
-        }
-
-        public void ejbPostCreate(final String str) {
-        }
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbLoad() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws RemoveException, EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbStore() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setEntityContext(final EntityContext arg0) throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void unsetEntityContext() throws EJBException, RemoteException {
-        }
-    }
-
-    private static class YourEntity implements EntityBean {
-//        public Integer ejbCreate(Integer pk) throws CreateException {
-//            return null;
-//        }
-
-//        public void ejbPostCreate(Integer pk) {}
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbLoad() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws RemoveException, EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbStore() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setEntityContext(final EntityContext arg0) throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void unsetEntityContext() throws EJBException, RemoteException {
-        }
-    }
-
-    private static interface BarStatelessHome extends javax.ejb.EJBHome {
-        public BarStatelessRemote create() throws CreateException, RemoteException;
-    }
-
-    private static interface BarStatelessRemote extends javax.ejb.EJBObject {
-    }
-
-    private static class BarStateless implements SessionBean {
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-
-    private static interface BazStatefulHome extends javax.ejb.EJBHome {
-        public BazStatefulRemote create() throws CreateException, RemoteException;
-    }
-
-    private static interface BazStatefulRemote extends javax.ejb.EJBObject {
-    }
-
-    private static interface BazStatefulLocalHome extends javax.ejb.EJBLocalHome {
-        public BazStatefulLocal create() throws CreateException;
-    }
-
-    private static interface BazStatefulLocal extends javax.ejb.EJBLocalObject {
-    }
-
-    @RemoteHome(BazStatefulHome.class)
-    @LocalHome(BazStatefulLocalHome.class)
-    private static class BazStateful implements SessionBean {
-        // missing ejbCreate method
-
-        @Override
-        public void ejbActivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbPassivate() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void ejbRemove() throws EJBException, RemoteException {
-        }
-
-        @Override
-        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
-        }
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.PersistenceType;
+import org.apache.openejb.jee.StatefulBean;
+import org.apache.openejb.jee.StatelessBean;
+import org.junit.runner.RunWith;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.EJBLocalHome;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EntityBean;
+import javax.ejb.EntityContext;
+import javax.ejb.FinderException;
+import javax.ejb.LocalHome;
+import javax.ejb.RemoteHome;
+import javax.ejb.RemoveException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import java.rmi.RemoteException;
+
+@RunWith(ValidationRunner.class)
+public class CheckNoCreateMethodsTest {
+    @Keys({@Key(value = "no.home.create", count = 4), @Key(value = "unused.ejb.create", count = 2, type = KeyType.WARNING),
+        @Key(value = "unused.ejbPostCreate", type = KeyType.WARNING), @Key("entity.no.ejb.create"), @Key(value = "session.no.ejb.create", count = 2)})
+    public EjbJar noCreateMethod() throws OpenEJBException {
+        System.setProperty("openejb.validation.output.level", "VERBOSE");
+        final EjbJar ejbJar = new EjbJar();
+        final StatelessBean stateless = new StatelessBean(FooStateless.class);
+        stateless.setHomeAndRemote(FooStatelessHome.class, FooStatelessRemote.class);
+        stateless.setHomeAndLocal(FooStatelessLocalHome.class, FooStatelessLocal.class);
+        ejbJar.addEnterpriseBean(stateless);
+        final StatefulBean stateful = new StatefulBean(FooStateful.class);
+        stateful.setHomeAndRemote(FooStatefulHome.class, FooStatefulRemote.class);
+        stateful.setHomeAndLocal(FooStatefulLocalHome.class, FooStatefulLocal.class);
+        ejbJar.addEnterpriseBean(stateful);
+        final org.apache.openejb.jee.EntityBean bean = new org.apache.openejb.jee.EntityBean(MyEntity.class, PersistenceType.BEAN);
+        bean.setLocalHome(MyLocalHome.class.getName());
+        bean.setLocal(MyLocal.class.getName());
+        ejbJar.addEnterpriseBean(bean);
+        final org.apache.openejb.jee.EntityBean bean1 = new org.apache.openejb.jee.EntityBean(YourEntity.class, PersistenceType.BEAN);
+        bean1.setLocalHome(MyLocalHome.class.getName());
+        bean1.setLocal(MyLocal.class.getName());
+        ejbJar.addEnterpriseBean(bean1);
+        final StatelessBean bar = new StatelessBean(BarStateless.class);
+        bar.setHomeAndRemote(BarStatelessHome.class, BarStatelessRemote.class);
+        ejbJar.addEnterpriseBean(bar);
+        final StatefulBean bazStateful = new StatefulBean(BazStateful.class);
+        ejbJar.addEnterpriseBean(bazStateful);
+        return ejbJar;
+    }
+
+    private static interface FooStatelessHome extends javax.ejb.EJBHome {
+    }
+
+    private static interface FooStatelessRemote extends javax.ejb.EJBObject {
+    }
+
+    private static interface FooStatelessLocalHome extends javax.ejb.EJBLocalHome {
+    }
+
+    private static interface FooStatelessLocal extends javax.ejb.EJBLocalObject {
+    }
+
+    private static class FooStateless implements SessionBean {
+        public void ejbCreate() {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+
+    private static interface FooStatefulHome extends javax.ejb.EJBHome {
+    }
+
+    private static interface FooStatefulRemote extends javax.ejb.EJBObject {
+    }
+
+    private static interface FooStatefulLocalHome extends javax.ejb.EJBLocalHome {
+    }
+
+    private static interface FooStatefulLocal extends javax.ejb.EJBLocalObject {
+    }
+
+    private static class FooStateful implements SessionBean {
+        public void ejbCreate() {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+
+    private static interface MyLocalHome extends EJBLocalHome {
+        public MyLocal create(Integer pk) throws CreateException;
+
+        public MyLocal findByPrimaryKey(Integer pk) throws FinderException;
+    }
+
+    private static interface MyLocal extends EJBLocalObject {
+    }
+
+    private static class MyEntity implements EntityBean {
+        public Integer ejbCreate(final Integer pk) throws CreateException {
+            return null;
+        }
+
+        public void ejbPostCreate(final String str) {
+        }
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbLoad() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws RemoveException, EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbStore() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setEntityContext(final EntityContext arg0) throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void unsetEntityContext() throws EJBException, RemoteException {
+        }
+    }
+
+    private static class YourEntity implements EntityBean {
+//        public Integer ejbCreate(Integer pk) throws CreateException {
+//            return null;
+//        }
+
+//        public void ejbPostCreate(Integer pk) {}
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbLoad() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws RemoveException, EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbStore() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setEntityContext(final EntityContext arg0) throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void unsetEntityContext() throws EJBException, RemoteException {
+        }
+    }
+
+    private static interface BarStatelessHome extends javax.ejb.EJBHome {
+        public BarStatelessRemote create() throws CreateException, RemoteException;
+    }
+
+    private static interface BarStatelessRemote extends javax.ejb.EJBObject {
+    }
+
+    private static class BarStateless implements SessionBean {
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+
+    private static interface BazStatefulHome extends javax.ejb.EJBHome {
+        public BazStatefulRemote create() throws CreateException, RemoteException;
+    }
+
+    private static interface BazStatefulRemote extends javax.ejb.EJBObject {
+    }
+
+    private static interface BazStatefulLocalHome extends javax.ejb.EJBLocalHome {
+        public BazStatefulLocal create() throws CreateException;
+    }
+
+    private static interface BazStatefulLocal extends javax.ejb.EJBLocalObject {
+    }
+
+    @RemoteHome(BazStatefulHome.class)
+    @LocalHome(BazStatefulLocalHome.class)
+    private static class BazStateful implements SessionBean {
+        // missing ejbCreate method
+
+        @Override
+        public void ejbActivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbPassivate() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void ejbRemove() throws EJBException, RemoteException {
+        }
+
+        @Override
+        public void setSessionContext(final SessionContext arg0) throws EJBException, RemoteException {
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java
index fbd9e3a..ec84ba7 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java
@@ -1,99 +1,99 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.config.PersistenceModule;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.junit.runner.RunWith;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-
-@RunWith(ValidationRunner.class)
-public class CheckPersistenceContextUsageTest {
-    @Keys({@Key(value = "persistenceContextExtented.nonStateful"), @Key(value = "persistenceContextRef.noPersistenceUnits", count = 3),
-        @Key(value = "persistenceContextAnnotation.onClassWithNoName"), @Key(value = "persistenceContextAnnotation.onEntityManagerFactory"),
-        @Key(value = "persistenceContextAnnotation.onNonEntityManager")})
-    public EjbJar wrongUsage() throws OpenEJBException {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
-        return ejbJar;
-    }
-
-    @Keys({@Key(value = "persistenceContextRef.noUnitName"), @Key(value = "persistenceContextRef.noMatches")})
-    public AppModule noUnitName() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessOne.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), ejbModule.getJarLocation());
-        appModule.getEjbModules().add(ejbModule);
-        final PersistenceUnit pu = new PersistenceUnit("fooUnit");
-        final PersistenceUnit pu1 = new PersistenceUnit("fooUnit1");
-        final PersistenceUnit pu2 = new PersistenceUnit("fooUnit");
-        final org.apache.openejb.jee.jpa.unit.Persistence p = new org.apache.openejb.jee.jpa.unit.Persistence(pu, pu1, pu2);
-        final PersistenceModule pm = new PersistenceModule("foo", p);
-        appModule.addPersistenceModule(pm);
-        return appModule;
-    }
-
-    @Keys({@Key(value = "persistenceContextRef.vagueMatches")})
-    public AppModule vagueMatches() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessTwo.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), ejbModule.getJarLocation());
-        appModule.getEjbModules().add(ejbModule);
-        final PersistenceUnit pu = new PersistenceUnit("fooUnit");
-        final org.apache.openejb.jee.jpa.unit.Persistence p = new org.apache.openejb.jee.jpa.unit.Persistence(pu);
-        final PersistenceModule pm = new PersistenceModule("foo", p);
-        appModule.getPersistenceModules().add(pm);
-        final PersistenceUnit pu1 = new PersistenceUnit("fooUnit");
-        final org.apache.openejb.jee.jpa.unit.Persistence p1 = new org.apache.openejb.jee.jpa.unit.Persistence(pu1);
-        final PersistenceModule pm1 = new PersistenceModule("foo1", p1);
-        appModule.addPersistenceModule(pm1);
-        return appModule;
-    }
-
-    @PersistenceContext
-    private static class FooStateless {
-        @PersistenceContext(type = PersistenceContextType.EXTENDED)
-        EntityManager em;
-        @PersistenceContext
-        EntityManagerFactory emf;
-        @PersistenceContext
-        String nonEntityManager;
-    }
-
-    private static class FooStatelessOne {
-        @PersistenceContext
-        EntityManager em;
-        @PersistenceContext(unitName = "wrongName")
-        EntityManager em1;
-    }
-
-    private static class FooStatelessTwo {
-        @PersistenceContext(unitName = "fooUnit")
-        EntityManager em1;
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.PersistenceModule;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.junit.runner.RunWith;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+
+@RunWith(ValidationRunner.class)
+public class CheckPersistenceContextUsageTest {
+    @Keys({@Key(value = "persistenceContextExtented.nonStateful"), @Key(value = "persistenceContextRef.noPersistenceUnits", count = 3),
+        @Key(value = "persistenceContextAnnotation.onClassWithNoName"), @Key(value = "persistenceContextAnnotation.onEntityManagerFactory"),
+        @Key(value = "persistenceContextAnnotation.onNonEntityManager")})
+    public EjbJar wrongUsage() throws OpenEJBException {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
+        return ejbJar;
+    }
+
+    @Keys({@Key(value = "persistenceContextRef.noUnitName"), @Key(value = "persistenceContextRef.noMatches")})
+    public AppModule noUnitName() {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessOne.class));
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), ejbModule.getJarLocation());
+        appModule.getEjbModules().add(ejbModule);
+        final PersistenceUnit pu = new PersistenceUnit("fooUnit");
+        final PersistenceUnit pu1 = new PersistenceUnit("fooUnit1");
+        final PersistenceUnit pu2 = new PersistenceUnit("fooUnit");
+        final org.apache.openejb.jee.jpa.unit.Persistence p = new org.apache.openejb.jee.jpa.unit.Persistence(pu, pu1, pu2);
+        final PersistenceModule pm = new PersistenceModule("foo", p);
+        appModule.addPersistenceModule(pm);
+        return appModule;
+    }
+
+    @Keys({@Key(value = "persistenceContextRef.vagueMatches")})
+    public AppModule vagueMatches() {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessTwo.class));
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), ejbModule.getJarLocation());
+        appModule.getEjbModules().add(ejbModule);
+        final PersistenceUnit pu = new PersistenceUnit("fooUnit");
+        final org.apache.openejb.jee.jpa.unit.Persistence p = new org.apache.openejb.jee.jpa.unit.Persistence(pu);
+        final PersistenceModule pm = new PersistenceModule("foo", p);
+        appModule.getPersistenceModules().add(pm);
+        final PersistenceUnit pu1 = new PersistenceUnit("fooUnit");
+        final org.apache.openejb.jee.jpa.unit.Persistence p1 = new org.apache.openejb.jee.jpa.unit.Persistence(pu1);
+        final PersistenceModule pm1 = new PersistenceModule("foo1", p1);
+        appModule.addPersistenceModule(pm1);
+        return appModule;
+    }
+
+    @PersistenceContext
+    private static class FooStateless {
+        @PersistenceContext(type = PersistenceContextType.EXTENDED)
+        EntityManager em;
+        @PersistenceContext
+        EntityManagerFactory emf;
+        @PersistenceContext
+        String nonEntityManager;
+    }
+
+    private static class FooStatelessOne {
+        @PersistenceContext
+        EntityManager em;
+        @PersistenceContext(unitName = "wrongName")
+        EntityManager em1;
+    }
+
+    private static class FooStatelessTwo {
+        @PersistenceContext(unitName = "fooUnit")
+        EntityManager em1;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java
index b0c8142..df4e669 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java
@@ -1,96 +1,96 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.config.PersistenceModule;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.junit.runner.RunWith;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-@RunWith(ValidationRunner.class)
-public class CheckPersistenceUnitUsageTest {
-    @Keys({@Key(value = "persistenceUnitRef.noPersistenceUnits", count = 3), @Key("persistenceUnitAnnotation.onClassWithNoName"),
-        @Key("persistenceUnitAnnotation.onEntityManager"), @Key("persistenceUnitAnnotation.onNonEntityManagerFactory")})
-    public EjbJar wrongUsage() throws OpenEJBException {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
-        return ejbJar;
-    }
-
-    @Keys({@Key(value = "persistenceUnitRef.noMatches"), @Key(value = "persistenceUnitRef.noUnitName")})
-    public AppModule noUnitName() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessOne.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), ejbModule.getJarLocation());
-        appModule.getEjbModules().add(ejbModule);
-        final PersistenceUnit pu = new PersistenceUnit("fooUnit");
-        final PersistenceUnit pu1 = new PersistenceUnit("fooUnit1");
-        final PersistenceUnit pu2 = new PersistenceUnit("fooUnit");
-        final org.apache.openejb.jee.jpa.unit.Persistence p = new org.apache.openejb.jee.jpa.unit.Persistence(pu, pu1, pu2);
-        final PersistenceModule pm = new PersistenceModule("foo", p);
-        appModule.addPersistenceModule(pm);
-        return appModule;
-    }
-
-    @Keys({@Key(value = "persistenceUnitRef.vagueMatches")})
-    public AppModule vagueMatches() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessTwo.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), ejbModule.getJarLocation());
-        appModule.getEjbModules().add(ejbModule);
-        final PersistenceUnit pu = new PersistenceUnit("fooUnit");
-        final org.apache.openejb.jee.jpa.unit.Persistence p = new org.apache.openejb.jee.jpa.unit.Persistence(pu);
-        final PersistenceModule pm = new PersistenceModule("foo", p);
-        appModule.getPersistenceModules().add(pm);
-        final PersistenceUnit pu1 = new PersistenceUnit("fooUnit");
-        final org.apache.openejb.jee.jpa.unit.Persistence p1 = new org.apache.openejb.jee.jpa.unit.Persistence(pu1);
-        final PersistenceModule pm1 = new PersistenceModule("foo1", p1);
-        appModule.addPersistenceModule(pm1);
-        return appModule;
-    }
-
-    @javax.persistence.PersistenceUnit
-    private static class FooStateless {
-        @javax.persistence.PersistenceUnit
-        EntityManagerFactory emf;
-        @javax.persistence.PersistenceUnit
-        EntityManager em;
-        @javax.persistence.PersistenceUnit
-        String nonEntityManagerFactory;
-    }
-
-    private static class FooStatelessOne {
-        @javax.persistence.PersistenceUnit(unitName = "wrongName")
-        EntityManagerFactory emf;
-        @javax.persistence.PersistenceUnit
-        EntityManagerFactory emf1;
-    }
-
-    private static class FooStatelessTwo {
-        @javax.persistence.PersistenceUnit(unitName = "fooUnit")
-        EntityManagerFactory emf;
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.PersistenceModule;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.junit.runner.RunWith;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+@RunWith(ValidationRunner.class)
+public class CheckPersistenceUnitUsageTest {
+    @Keys({@Key(value = "persistenceUnitRef.noPersistenceUnits", count = 3), @Key("persistenceUnitAnnotation.onClassWithNoName"),
+        @Key("persistenceUnitAnnotation.onEntityManager"), @Key("persistenceUnitAnnotation.onNonEntityManagerFactory")})
+    public EjbJar wrongUsage() throws OpenEJBException {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
+        return ejbJar;
+    }
+
+    @Keys({@Key(value = "persistenceUnitRef.noMatches"), @Key(value = "persistenceUnitRef.noUnitName")})
+    public AppModule noUnitName() {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessOne.class));
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), ejbModule.getJarLocation());
+        appModule.getEjbModules().add(ejbModule);
+        final PersistenceUnit pu = new PersistenceUnit("fooUnit");
+        final PersistenceUnit pu1 = new PersistenceUnit("fooUnit1");
+        final PersistenceUnit pu2 = new PersistenceUnit("fooUnit");
+        final org.apache.openejb.jee.jpa.unit.Persistence p = new org.apache.openejb.jee.jpa.unit.Persistence(pu, pu1, pu2);
+        final PersistenceModule pm = new PersistenceModule("foo", p);
+        appModule.addPersistenceModule(pm);
+        return appModule;
+    }
+
+    @Keys({@Key(value = "persistenceUnitRef.vagueMatches")})
+    public AppModule vagueMatches() {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessTwo.class));
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        final AppModule appModule = new AppModule(ejbModule.getClassLoader(), ejbModule.getJarLocation());
+        appModule.getEjbModules().add(ejbModule);
+        final PersistenceUnit pu = new PersistenceUnit("fooUnit");
+        final org.apache.openejb.jee.jpa.unit.Persistence p = new org.apache.openejb.jee.jpa.unit.Persistence(pu);
+        final PersistenceModule pm = new PersistenceModule("foo", p);
+        appModule.getPersistenceModules().add(pm);
+        final PersistenceUnit pu1 = new PersistenceUnit("fooUnit");
+        final org.apache.openejb.jee.jpa.unit.Persistence p1 = new org.apache.openejb.jee.jpa.unit.Persistence(pu1);
+        final PersistenceModule pm1 = new PersistenceModule("foo1", p1);
+        appModule.addPersistenceModule(pm1);
+        return appModule;
+    }
+
+    @javax.persistence.PersistenceUnit
+    private static class FooStateless {
+        @javax.persistence.PersistenceUnit
+        EntityManagerFactory emf;
+        @javax.persistence.PersistenceUnit
+        EntityManager em;
+        @javax.persistence.PersistenceUnit
+        String nonEntityManagerFactory;
+    }
+
+    private static class FooStatelessOne {
+        @javax.persistence.PersistenceUnit(unitName = "wrongName")
+        EntityManagerFactory emf;
+        @javax.persistence.PersistenceUnit
+        EntityManagerFactory emf1;
+    }
+
+    private static class FooStatelessTwo {
+        @javax.persistence.PersistenceUnit(unitName = "fooUnit")
+        EntityManagerFactory emf;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java
index 96fb35c..4bdb585 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java
@@ -1,41 +1,41 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.EntityBean;
-import org.apache.openejb.jee.PersistenceType;
-import org.junit.runner.RunWith;
-
-@RunWith(ValidationRunner.class)
-public class CheckWrongClassTypeTest {
-    @Keys({@Key("wrong.class.type"), @Key("noInterfaceDeclared.entity")})
-    public EjbJar wrongClassType() throws OpenEJBException {
-        System.setProperty("openejb.validation.output.level", "VERBOSE");
-        final EjbJar ejbJar = new EjbJar();
-        final EntityBean entityBean = new EntityBean();
-        entityBean.setEjbClass(FooEntity.class);
-        entityBean.setEjbName("fooEntity");
-        entityBean.setPersistenceType(PersistenceType.BEAN);
-        ejbJar.addEnterpriseBean(entityBean);
-        return ejbJar;
-    }
-
-    private static class FooEntity {
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EntityBean;
+import org.apache.openejb.jee.PersistenceType;
+import org.junit.runner.RunWith;
+
+@RunWith(ValidationRunner.class)
+public class CheckWrongClassTypeTest {
+    @Keys({@Key("wrong.class.type"), @Key("noInterfaceDeclared.entity")})
+    public EjbJar wrongClassType() throws OpenEJBException {
+        System.setProperty("openejb.validation.output.level", "VERBOSE");
+        final EjbJar ejbJar = new EjbJar();
+        final EntityBean entityBean = new EntityBean();
+        entityBean.setEjbClass(FooEntity.class);
+        entityBean.setEjbName("fooEntity");
+        entityBean.setPersistenceType(PersistenceType.BEAN);
+        ejbJar.addEnterpriseBean(entityBean);
+        return ejbJar;
+    }
+
+    private static class FooEntity {
+    }
+}


[15/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/README.md b/examples/cdi-alternative-and-stereotypes/README.md
index c728514..f6aecb4 100644
--- a/examples/cdi-alternative-and-stereotypes/README.md
+++ b/examples/cdi-alternative-and-stereotypes/README.md
@@ -1,126 +1,126 @@
-# Introduction
-
-CDI is a revolution for Java EE world. This specification is the best one to avoid coupling between classes.
-
-This example simply aims to override bindings at runtime to simplify mocking work.
-
-It uses two kind of mocks:
-1) a mock with no implementation in the classloader
-2) a mock with an implementation in the classloader
-
-The mock answer from CDI is called *alternative*.
-
-Annotating `@Alternative` a class will mean it will replace any implementation if there is no other implementation
-or if it is forced (through `META-INF/beans.xml`).
-
-# Code explanation
-## main code
-
-We use an EJB `Jouney` to modelize a journey where the vehicle and the society can change. Here an EJB is used simply
-because it simplifies the test. A jouney wraps the vehicle and society information.
-
-We define then two interfaces to inject it in the `Journey` EJB: `Vehicle` and `Society`.
-
-Finally we add an implementation for `Scociety` interface: `LowCostCompanie`.
-
-If we don't go further `Journey` object will not be able to be created because no `Vehicle` implementation is available.
-
-Note: if we suppose we have a `Vehicle` implementation, the injected Society should be `LowCostCompanie`.
-
-## test code
-
-The goal here is to test our `Journey` EJB. So we have to provide a `Vehicle` implementation: `SuperCar`.
-
-We want to force the `Society` implementation (for any reason) by our test implementation: `AirOpenEJB`.
-
-One solution could simply be to add `@Alternative` annotation on `AirOpenEJB` and activate it through
-the `META-INF/beans.xml` file.
-
-Here we want to write more explicit code. So we want to replace the `@Alternative` annotation by `@Mock` one.
-
-So we simply define an `@Mock` annotation for classes, resolvable at runtime which is a stereotype (`@Stereotype`)
-which replace `@Alternative`.
-
-Here is the annotation:
-
-    @Stereotype // we define a stereotype
-    @Retention(RUNTIME) // resolvable at runtime
-    @Target(TYPE) // this annotation is a class level one
-    @Alternative // it replace @Alternative
-    public @interface Mock {}
-
-Note: you can add more CDI annotations after `@Alternative` and it will get the behavior expected (the scope for instance).
-
-So now we have our `@Mock` annotation which is a stereotype able to replace `@Alternative` annotation
-we simply add this annotation to our mocks.
-
-If you run it now you'll have this exception:
-
-    javax.enterprise.inject.UnsatisfiedResolutionException: Api type [org.superbiz.cdi.stereotype.Vehicle] is not found with the qualifiers
-    Qualifiers: [@javax.enterprise.inject.Default()]
-    for injection into Field Injection Point, field name :  vehicle, Bean Owner : [Journey, Name:null, WebBeans Type:ENTERPRISE, API Types:[java.lang.Object,org.superbiz.cdi.stereotype.Journey], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]]
-
-It means the stereotype is not activated. To do it simply add it to your `META-INF/beans.xml`:
-
-    <alternatives>
-      <stereotype>org.superbiz.cdi.stereotype.Mock</stereotype>
-    </alternatives>
-
-Note: if you don't specify `AirOpenEJB` as `@Alternative` (done through our mock annotation) you'll get this exception:
-
-    Caused by: javax.enterprise.inject.AmbiguousResolutionException: There is more than one api type with : org.superbiz.cdi.stereotype.Society with qualifiers : Qualifiers: [@javax.enterprise.inject.Default()]
-    for injection into Field Injection Point, field name :  society, Bean Owner : [Journey, Name:null, WebBeans Type:ENTERPRISE, API Types:[org.superbiz.cdi.stereotype.Journey,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]]
-    found beans:
-    AirOpenEJB, Name:null, WebBeans Type:MANAGED, API Types:[org.superbiz.cdi.stereotype.Society,org.superbiz.cdi.stereotype.AirOpenEJB,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]
-    LowCostCompanie, Name:null, WebBeans Type:MANAGED, API Types:[org.superbiz.cdi.stereotype.Society,org.superbiz.cdi.stereotype.LowCostCompanie,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]
-
-which simply means two implementations are available for the same injection point (`Journey.society`).
-
-# Conclusion
-
-With CDI it is really easy to define annotations with a strong meaning. You can define business annotations
-or simply technical annotations to simplify your code (as we did with the mock annotation).
-
-Note: if for instance you used qualifiers to inject societies you could have put all these qualifiers on
-the mock class or defined a `@SocietyMock` annotation to be able to inject the same implementation for
-all qualifiers in your tests.
-
-# Output
-
-    Running org.superbiz.cdi.stereotype.StereotypeTest
-    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20111030-07:54
-    http://tomee.apache.org/
-    INFO - openejb.home = /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
-    INFO - openejb.base = /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
-    INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
-    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
-    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    INFO - Found EjbModule in classpath: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes/target/test-classes
-    INFO - Found EjbModule in classpath: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes/target/classes
-    INFO - Beginning load: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes/target/test-classes
-    INFO - Beginning load: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes/target/classes
-    INFO - Configuring enterprise application: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
-    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-    INFO - Auto-creating a container for bean cdi-alternative-and-stereotypes_test.Comp: Container(type=MANAGED, id=Default Managed Container)
-    INFO - Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
-    INFO - Auto-creating a container for bean Journey: Container(type=SINGLETON, id=Default Singleton Container)
-    INFO - Enterprise application "/opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes" loaded.
-    INFO - Assembling app: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
-    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/cdi-alternative-and-stereotypes_test.Comp!org.apache.openejb.BeanContext$Comp")
-    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/cdi-alternative-and-stereotypes_test.Comp")
-    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/cdi-alternative-and-stereotypes.Comp!org.apache.openejb.BeanContext$Comp")
-    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/cdi-alternative-and-stereotypes.Comp")
-    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/Journey!org.superbiz.cdi.stereotype.Journey")
-    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/Journey")
-    INFO - Jndi(name="java:global/EjbModule162291475/org.superbiz.cdi.stereotype.StereotypeTest!org.superbiz.cdi.stereotype.StereotypeTest")
-    INFO - Jndi(name="java:global/EjbModule162291475/org.superbiz.cdi.stereotype.StereotypeTest")
-    INFO - Created Ejb(deployment-id=cdi-alternative-and-stereotypes_test.Comp, ejb-name=cdi-alternative-and-stereotypes_test.Comp, container=Default Managed Container)
-    INFO - Created Ejb(deployment-id=cdi-alternative-and-stereotypes.Comp, ejb-name=cdi-alternative-and-stereotypes.Comp, container=Default Managed Container)
-    INFO - Created Ejb(deployment-id=org.superbiz.cdi.stereotype.StereotypeTest, ejb-name=org.superbiz.cdi.stereotype.StereotypeTest, container=Default Managed Container)
-    INFO - Created Ejb(deployment-id=Journey, ejb-name=Journey, container=Default Singleton Container)
-    INFO - Started Ejb(deployment-id=cdi-alternative-and-stereotypes_test.Comp, ejb-name=cdi-alternative-and-stereotypes_test.Comp, container=Default Managed Container)
-    INFO - Started Ejb(deployment-id=cdi-alternative-and-stereotypes.Comp, ejb-name=cdi-alternative-and-stereotypes.Comp, container=Default Managed Container)
-    INFO - Started Ejb(deployment-id=org.superbiz.cdi.stereotype.StereotypeTest, ejb-name=org.superbiz.cdi.stereotype.StereotypeTest, container=Default Managed Container)
-    INFO - Started Ejb(deployment-id=Journey, ejb-name=Journey, container=Default Singleton Container)
-    INFO - Deployed Application(path=/opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes)
-    INFO - Undeploying app: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
+# Introduction
+
+CDI is a revolution for Java EE world. This specification is the best one to avoid coupling between classes.
+
+This example simply aims to override bindings at runtime to simplify mocking work.
+
+It uses two kind of mocks:
+1) a mock with no implementation in the classloader
+2) a mock with an implementation in the classloader
+
+The mock answer from CDI is called *alternative*.
+
+Annotating `@Alternative` a class will mean it will replace any implementation if there is no other implementation
+or if it is forced (through `META-INF/beans.xml`).
+
+# Code explanation
+## main code
+
+We use an EJB `Jouney` to modelize a journey where the vehicle and the society can change. Here an EJB is used simply
+because it simplifies the test. A jouney wraps the vehicle and society information.
+
+We define then two interfaces to inject it in the `Journey` EJB: `Vehicle` and `Society`.
+
+Finally we add an implementation for `Scociety` interface: `LowCostCompanie`.
+
+If we don't go further `Journey` object will not be able to be created because no `Vehicle` implementation is available.
+
+Note: if we suppose we have a `Vehicle` implementation, the injected Society should be `LowCostCompanie`.
+
+## test code
+
+The goal here is to test our `Journey` EJB. So we have to provide a `Vehicle` implementation: `SuperCar`.
+
+We want to force the `Society` implementation (for any reason) by our test implementation: `AirOpenEJB`.
+
+One solution could simply be to add `@Alternative` annotation on `AirOpenEJB` and activate it through
+the `META-INF/beans.xml` file.
+
+Here we want to write more explicit code. So we want to replace the `@Alternative` annotation by `@Mock` one.
+
+So we simply define an `@Mock` annotation for classes, resolvable at runtime which is a stereotype (`@Stereotype`)
+which replace `@Alternative`.
+
+Here is the annotation:
+
+    @Stereotype // we define a stereotype
+    @Retention(RUNTIME) // resolvable at runtime
+    @Target(TYPE) // this annotation is a class level one
+    @Alternative // it replace @Alternative
+    public @interface Mock {}
+
+Note: you can add more CDI annotations after `@Alternative` and it will get the behavior expected (the scope for instance).
+
+So now we have our `@Mock` annotation which is a stereotype able to replace `@Alternative` annotation
+we simply add this annotation to our mocks.
+
+If you run it now you'll have this exception:
+
+    javax.enterprise.inject.UnsatisfiedResolutionException: Api type [org.superbiz.cdi.stereotype.Vehicle] is not found with the qualifiers
+    Qualifiers: [@javax.enterprise.inject.Default()]
+    for injection into Field Injection Point, field name :  vehicle, Bean Owner : [Journey, Name:null, WebBeans Type:ENTERPRISE, API Types:[java.lang.Object,org.superbiz.cdi.stereotype.Journey], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]]
+
+It means the stereotype is not activated. To do it simply add it to your `META-INF/beans.xml`:
+
+    <alternatives>
+      <stereotype>org.superbiz.cdi.stereotype.Mock</stereotype>
+    </alternatives>
+
+Note: if you don't specify `AirOpenEJB` as `@Alternative` (done through our mock annotation) you'll get this exception:
+
+    Caused by: javax.enterprise.inject.AmbiguousResolutionException: There is more than one api type with : org.superbiz.cdi.stereotype.Society with qualifiers : Qualifiers: [@javax.enterprise.inject.Default()]
+    for injection into Field Injection Point, field name :  society, Bean Owner : [Journey, Name:null, WebBeans Type:ENTERPRISE, API Types:[org.superbiz.cdi.stereotype.Journey,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]]
+    found beans:
+    AirOpenEJB, Name:null, WebBeans Type:MANAGED, API Types:[org.superbiz.cdi.stereotype.Society,org.superbiz.cdi.stereotype.AirOpenEJB,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]
+    LowCostCompanie, Name:null, WebBeans Type:MANAGED, API Types:[org.superbiz.cdi.stereotype.Society,org.superbiz.cdi.stereotype.LowCostCompanie,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]
+
+which simply means two implementations are available for the same injection point (`Journey.society`).
+
+# Conclusion
+
+With CDI it is really easy to define annotations with a strong meaning. You can define business annotations
+or simply technical annotations to simplify your code (as we did with the mock annotation).
+
+Note: if for instance you used qualifiers to inject societies you could have put all these qualifiers on
+the mock class or defined a `@SocietyMock` annotation to be able to inject the same implementation for
+all qualifiers in your tests.
+
+# Output
+
+    Running org.superbiz.cdi.stereotype.StereotypeTest
+    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20111030-07:54
+    http://tomee.apache.org/
+    INFO - openejb.home = /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
+    INFO - openejb.base = /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
+    INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
+    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    INFO - Found EjbModule in classpath: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes/target/test-classes
+    INFO - Found EjbModule in classpath: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes/target/classes
+    INFO - Beginning load: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes/target/test-classes
+    INFO - Beginning load: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes/target/classes
+    INFO - Configuring enterprise application: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
+    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+    INFO - Auto-creating a container for bean cdi-alternative-and-stereotypes_test.Comp: Container(type=MANAGED, id=Default Managed Container)
+    INFO - Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
+    INFO - Auto-creating a container for bean Journey: Container(type=SINGLETON, id=Default Singleton Container)
+    INFO - Enterprise application "/opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes" loaded.
+    INFO - Assembling app: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes
+    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/cdi-alternative-and-stereotypes_test.Comp!org.apache.openejb.BeanContext$Comp")
+    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/cdi-alternative-and-stereotypes_test.Comp")
+    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/cdi-alternative-and-stereotypes.Comp!org.apache.openejb.BeanContext$Comp")
+    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/cdi-alternative-and-stereotypes.Comp")
+    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/Journey!org.superbiz.cdi.stereotype.Journey")
+    INFO - Jndi(name="java:global/cdi-alternative-and-stereotypes/Journey")
+    INFO - Jndi(name="java:global/EjbModule162291475/org.superbiz.cdi.stereotype.StereotypeTest!org.superbiz.cdi.stereotype.StereotypeTest")
+    INFO - Jndi(name="java:global/EjbModule162291475/org.superbiz.cdi.stereotype.StereotypeTest")
+    INFO - Created Ejb(deployment-id=cdi-alternative-and-stereotypes_test.Comp, ejb-name=cdi-alternative-and-stereotypes_test.Comp, container=Default Managed Container)
+    INFO - Created Ejb(deployment-id=cdi-alternative-and-stereotypes.Comp, ejb-name=cdi-alternative-and-stereotypes.Comp, container=Default Managed Container)
+    INFO - Created Ejb(deployment-id=org.superbiz.cdi.stereotype.StereotypeTest, ejb-name=org.superbiz.cdi.stereotype.StereotypeTest, container=Default Managed Container)
+    INFO - Created Ejb(deployment-id=Journey, ejb-name=Journey, container=Default Singleton Container)
+    INFO - Started Ejb(deployment-id=cdi-alternative-and-stereotypes_test.Comp, ejb-name=cdi-alternative-and-stereotypes_test.Comp, container=Default Managed Container)
+    INFO - Started Ejb(deployment-id=cdi-alternative-and-stereotypes.Comp, ejb-name=cdi-alternative-and-stereotypes.Comp, container=Default Managed Container)
+    INFO - Started Ejb(deployment-id=org.superbiz.cdi.stereotype.StereotypeTest, ejb-name=org.superbiz.cdi.stereotype.StereotypeTest, container=Default Managed Container)
+    INFO - Started Ejb(deployment-id=Journey, ejb-name=Journey, container=Default Singleton Container)
+    INFO - Deployed Application(path=/opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes)
+    INFO - Undeploying app: /opt/dev/openejb/openejb-trunk/examples/cdi-alternative-and-stereotypes

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java b/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java
index d5f3645..e987985 100644
--- a/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java
+++ b/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.stereotype;
-
-import javax.ejb.Singleton;
-import javax.inject.Inject;
-
-@Singleton
-public class Journey {
-
-    @Inject
-    private Vehicle vehicle;
-    @Inject
-    private Society society;
-
-    public String vehicle() {
-        return vehicle.name();
-    }
-
-    public String category() {
-        return society.category();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.stereotype;
+
+import javax.ejb.Singleton;
+import javax.inject.Inject;
+
+@Singleton
+public class Journey {
+
+    @Inject
+    private Vehicle vehicle;
+    @Inject
+    private Society society;
+
+    public String vehicle() {
+        return vehicle.name();
+    }
+
+    public String category() {
+        return society.category();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/LowCostCompanie.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/LowCostCompanie.java b/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/LowCostCompanie.java
index f3d634e..ab818be 100644
--- a/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/LowCostCompanie.java
+++ b/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/LowCostCompanie.java
@@ -1,26 +1,26 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.stereotype;
-
-public class LowCostCompanie implements Society {
-
-    @Override
-    public String category() {
-        return "maybe you'll leave...";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.stereotype;
+
+public class LowCostCompanie implements Society {
+
+    @Override
+    public String category() {
+        return "maybe you'll leave...";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Society.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Society.java b/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Society.java
index d6e7007..441c788 100644
--- a/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Society.java
+++ b/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Society.java
@@ -1,23 +1,23 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.stereotype;
-
-public interface Society {
-
-    String category();
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.stereotype;
+
+public interface Society {
+
+    String category();
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Vehicle.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Vehicle.java b/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Vehicle.java
index ce1a39c..83c3764 100644
--- a/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Vehicle.java
+++ b/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Vehicle.java
@@ -1,23 +1,23 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.stereotype;
-
-public interface Vehicle {
-
-    String name();
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.stereotype;
+
+public interface Vehicle {
+
+    String name();
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/AirOpenEJB.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/AirOpenEJB.java b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/AirOpenEJB.java
index e289ddb..3a85074 100644
--- a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/AirOpenEJB.java
+++ b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/AirOpenEJB.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.stereotype;
-
-/**
- * without @Mock annotation which specifies this class as an alternative
- * you'll have this exception:
- * <p/>
- * Caused by: javax.enterprise.inject.AmbiguousResolutionException: There is more than one api type with : org.superbiz.cdi.stereotype.Society with qualifiers : Qualifiers: [@javax.enterprise.inject.Default()]
- * for injection into Field Injection Point, field name :  society, Bean Owner : [Journey, Name:null, WebBeans Type:ENTERPRISE, API Types:[org.superbiz.cdi.stereotype.Journey,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]]
- * found beans:
- * AirOpenEJB, Name:null, WebBeans Type:MANAGED, API Types:[org.superbiz.cdi.stereotype.Society,org.superbiz.cdi.stereotype.AirOpenEJB,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]
- * LowCostCompanie, Name:null, WebBeans Type:MANAGED, API Types:[org.superbiz.cdi.stereotype.Society,org.superbiz.cdi.stereotype.LowCostCompanie,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]
- * <p/>
- * because 2 implementations match the same injection point (Journey.society).
- */
-@Mock
-public class AirOpenEJB implements Society {
-
-    @Override
-    public String category() {
-        return "simply the best";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.stereotype;
+
+/**
+ * without @Mock annotation which specifies this class as an alternative
+ * you'll have this exception:
+ * <p/>
+ * Caused by: javax.enterprise.inject.AmbiguousResolutionException: There is more than one api type with : org.superbiz.cdi.stereotype.Society with qualifiers : Qualifiers: [@javax.enterprise.inject.Default()]
+ * for injection into Field Injection Point, field name :  society, Bean Owner : [Journey, Name:null, WebBeans Type:ENTERPRISE, API Types:[org.superbiz.cdi.stereotype.Journey,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]]
+ * found beans:
+ * AirOpenEJB, Name:null, WebBeans Type:MANAGED, API Types:[org.superbiz.cdi.stereotype.Society,org.superbiz.cdi.stereotype.AirOpenEJB,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]
+ * LowCostCompanie, Name:null, WebBeans Type:MANAGED, API Types:[org.superbiz.cdi.stereotype.Society,org.superbiz.cdi.stereotype.LowCostCompanie,java.lang.Object], Qualifiers:[javax.enterprise.inject.Any,javax.enterprise.inject.Default]
+ * <p/>
+ * because 2 implementations match the same injection point (Journey.society).
+ */
+@Mock
+public class AirOpenEJB implements Society {
+
+    @Override
+    public String category() {
+        return "simply the best";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/Mock.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/Mock.java b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/Mock.java
index 7b116f9..65c5581 100644
--- a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/Mock.java
+++ b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/Mock.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.stereotype;
-
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Stereotype;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-// defining a stereotype for class level
-@Stereotype
-@Retention(RUNTIME)
-@Target(TYPE)
-
-// here define all annotations you want to replace by this one.
-// this stereotype define an alternative
-@Alternative
-public @interface Mock {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.stereotype;
+
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Stereotype;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+// defining a stereotype for class level
+@Stereotype
+@Retention(RUNTIME)
+@Target(TYPE)
+
+// here define all annotations you want to replace by this one.
+// this stereotype define an alternative
+@Alternative
+public @interface Mock {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java
index eef8799..8802232 100644
--- a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java
+++ b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java
@@ -1,56 +1,56 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.stereotype;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.NamingException;
-
-import static org.junit.Assert.assertEquals;
-
-public class StereotypeTest {
-
-    private static EJBContainer container;
-    private static Journey journey;
-
-    @BeforeClass
-    public static void start() throws NamingException {
-        container = EJBContainer.createEJBContainer();
-        journey = (Journey) container.getContext().lookup("java:global/cdi-alternative-and-stereotypes/Journey");
-    }
-
-    @AfterClass
-    public static void shutdown() {
-        if (container != null) {
-            container.close();
-        }
-    }
-
-    @Test
-    public void assertVehicleInjected() {
-        assertEquals("the fastest", journey.vehicle());
-    }
-
-    @Test
-    public void assertMockOverrideWorks() {
-        assertEquals("simply the best", journey.category());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.stereotype;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.NamingException;
+
+import static org.junit.Assert.assertEquals;
+
+public class StereotypeTest {
+
+    private static EJBContainer container;
+    private static Journey journey;
+
+    @BeforeClass
+    public static void start() throws NamingException {
+        container = EJBContainer.createEJBContainer();
+        journey = (Journey) container.getContext().lookup("java:global/cdi-alternative-and-stereotypes/Journey");
+    }
+
+    @AfterClass
+    public static void shutdown() {
+        if (container != null) {
+            container.close();
+        }
+    }
+
+    @Test
+    public void assertVehicleInjected() {
+        assertEquals("the fastest", journey.vehicle());
+    }
+
+    @Test
+    public void assertMockOverrideWorks() {
+        assertEquals("simply the best", journey.category());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java
index 2d14191..e88753d 100644
--- a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java
+++ b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java
@@ -1,27 +1,27 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.stereotype;
-
-@Mock
-public class SuperCar implements Vehicle {
-
-    @Override
-    public String name() {
-        return "the fastest";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.stereotype;
+
+@Mock
+public class SuperCar implements Vehicle {
+
+    @Override
+    public String name() {
+        return "the fastest";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-application-scope/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-application-scope/README.md b/examples/cdi-application-scope/README.md
index 736be8a..245ceaa 100644
--- a/examples/cdi-application-scope/README.md
+++ b/examples/cdi-application-scope/README.md
@@ -1,133 +1,133 @@
-Title: CDI @ApplicationScoped
-
-This example show the use of `@ApplicationScoped` annotation for injected objects. An object
-which is defined as `@ApplicationScoped` is created once for the duration of the application.
-
-# Example
-
-This example depicts a similar scenario to cdi-request-scope. A restaurant guest orders
-a soup from the waiter. The waiter then delivers the soup back to the guest. Another
-guest can order the same soup that was ordered by the previous client - this is where
-the application scope is used. 
-
-## Waiter
-
-The `Waiter` session bean receives a request from the test class via the `orderSoup()` method
-and sets the name for the `soup` field. The `orderWhatTheOtherGuyHad()` method returns
-the name of the `soup` field.
-
-    @Stateless
-    public class Waiter {
-
-        @Inject
-        public Soup soup;
-
-        public String orderSoup(String name){
-            soup.setName(name);
-            return soup.getName();
-        }
-
-        public String orderWhatTheOtherGuyHad() {
-            String name = soup.getName();
-            return name;
-        }
-    }
-
-## Soup
-
-The `Soup` class is an injectable POJO, defined as `@ApplicationScoped`. This means that an instance
-will be created only once for the duration of the whole application. Try changing the `@ApplicationScoped`
-annotation to `@RequestScoped` and see what happens.
-
-    @ApplicationScoped
-    public class Soup {
-
-        private String name = "Soup of the day";
-
-        @PostConstruct
-        public void afterCreate() {
-            System.out.println("Soup created");
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name){
-            this.name = name;
-        }
-    }
-
-
-# Test Case
-
-This is the entry class for this example. First a soup is ordered via `orderSoup()` method.
-This initiates the `soup` field. Next, `orderWhatTheOtherGuyHad()` method returns the soup
-from the application context.
-
-    public class RestaurantTest {
-
-        private static String TOMATO_SOUP = "Tomato Soup";
-        private EJBContainer container;
-
-        @EJB
-        private Waiter joe;
-
-        @Before
-        public void startContainer() throws Exception {
-            container = EJBContainer.createEJBContainer();
-            container.getContext().bind("inject", this);
-        }
-
-        @Test
-        public void orderSoup(){
-            String someSoup = joe.orderSoup(TOMATO_SOUP);
-            assertEquals(TOMATO_SOUP, someSoup);
-
-            String sameSoup = joe.orderWhatTheOtherGuyHad();
-            assertEquals(TOMATO_SOUP, sameSoup);
-        }
-
-        @After
-        public void closeContainer() throws Exception {
-            container.close();
-        }
-    }
-
-# Running
-
-In the output you can see that there is just one `Soup` instance created - one for
-the whole application.
-
-    -------------------------------------------------------
-     T E S T S
-    -------------------------------------------------------
-    Running org.superbiz.cdi.applicationscope.RestaurantTest
-    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20111224-11:09
-    http://tomee.apache.org/
-    INFO - openejb.home = C:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
-    INFO - openejb.base = C:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
-    INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
-    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
-    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    INFO - Found EjbModule in classpath: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope\target\classes
-    INFO - Beginning load: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope\target\classes
-    INFO - Configuring enterprise application: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
-    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-    INFO - Auto-creating a container for bean cdi-application-scope.Comp: Container(type=MANAGED, id=Default Managed Container)
-    INFO - Configuring Service(id=Default Stateless Container, type=Container, provider-id=Default Stateless Container)
-    INFO - Auto-creating a container for bean Waiter: Container(type=STATELESS, id=Default Stateless Container)
-    INFO - Enterprise application "c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope" loaded.
-    INFO - Assembling app: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
-    INFO - Jndi(name="java:global/cdi-application-scope/Waiter!org.superbiz.cdi.applicationscope.Waiter")
-    INFO - Jndi(name="java:global/cdi-application-scope/Waiter")
-    INFO - Created Ejb(deployment-id=Waiter, ejb-name=Waiter, container=Default Stateless Container)
-    INFO - Started Ejb(deployment-id=Waiter, ejb-name=Waiter, container=Default Stateless Container)
-    INFO - Deployed Application(path=c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope)
-    Soup created
-    INFO - Undeploying app: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.42 sec
-
-    Results :
-
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+Title: CDI @ApplicationScoped
+
+This example show the use of `@ApplicationScoped` annotation for injected objects. An object
+which is defined as `@ApplicationScoped` is created once for the duration of the application.
+
+# Example
+
+This example depicts a similar scenario to cdi-request-scope. A restaurant guest orders
+a soup from the waiter. The waiter then delivers the soup back to the guest. Another
+guest can order the same soup that was ordered by the previous client - this is where
+the application scope is used. 
+
+## Waiter
+
+The `Waiter` session bean receives a request from the test class via the `orderSoup()` method
+and sets the name for the `soup` field. The `orderWhatTheOtherGuyHad()` method returns
+the name of the `soup` field.
+
+    @Stateless
+    public class Waiter {
+
+        @Inject
+        public Soup soup;
+
+        public String orderSoup(String name){
+            soup.setName(name);
+            return soup.getName();
+        }
+
+        public String orderWhatTheOtherGuyHad() {
+            String name = soup.getName();
+            return name;
+        }
+    }
+
+## Soup
+
+The `Soup` class is an injectable POJO, defined as `@ApplicationScoped`. This means that an instance
+will be created only once for the duration of the whole application. Try changing the `@ApplicationScoped`
+annotation to `@RequestScoped` and see what happens.
+
+    @ApplicationScoped
+    public class Soup {
+
+        private String name = "Soup of the day";
+
+        @PostConstruct
+        public void afterCreate() {
+            System.out.println("Soup created");
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name){
+            this.name = name;
+        }
+    }
+
+
+# Test Case
+
+This is the entry class for this example. First a soup is ordered via `orderSoup()` method.
+This initiates the `soup` field. Next, `orderWhatTheOtherGuyHad()` method returns the soup
+from the application context.
+
+    public class RestaurantTest {
+
+        private static String TOMATO_SOUP = "Tomato Soup";
+        private EJBContainer container;
+
+        @EJB
+        private Waiter joe;
+
+        @Before
+        public void startContainer() throws Exception {
+            container = EJBContainer.createEJBContainer();
+            container.getContext().bind("inject", this);
+        }
+
+        @Test
+        public void orderSoup(){
+            String someSoup = joe.orderSoup(TOMATO_SOUP);
+            assertEquals(TOMATO_SOUP, someSoup);
+
+            String sameSoup = joe.orderWhatTheOtherGuyHad();
+            assertEquals(TOMATO_SOUP, sameSoup);
+        }
+
+        @After
+        public void closeContainer() throws Exception {
+            container.close();
+        }
+    }
+
+# Running
+
+In the output you can see that there is just one `Soup` instance created - one for
+the whole application.
+
+    -------------------------------------------------------
+     T E S T S
+    -------------------------------------------------------
+    Running org.superbiz.cdi.applicationscope.RestaurantTest
+    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20111224-11:09
+    http://tomee.apache.org/
+    INFO - openejb.home = C:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
+    INFO - openejb.base = C:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
+    INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
+    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    INFO - Found EjbModule in classpath: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope\target\classes
+    INFO - Beginning load: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope\target\classes
+    INFO - Configuring enterprise application: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
+    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+    INFO - Auto-creating a container for bean cdi-application-scope.Comp: Container(type=MANAGED, id=Default Managed Container)
+    INFO - Configuring Service(id=Default Stateless Container, type=Container, provider-id=Default Stateless Container)
+    INFO - Auto-creating a container for bean Waiter: Container(type=STATELESS, id=Default Stateless Container)
+    INFO - Enterprise application "c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope" loaded.
+    INFO - Assembling app: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
+    INFO - Jndi(name="java:global/cdi-application-scope/Waiter!org.superbiz.cdi.applicationscope.Waiter")
+    INFO - Jndi(name="java:global/cdi-application-scope/Waiter")
+    INFO - Created Ejb(deployment-id=Waiter, ejb-name=Waiter, container=Default Stateless Container)
+    INFO - Started Ejb(deployment-id=Waiter, ejb-name=Waiter, container=Default Stateless Container)
+    INFO - Deployed Application(path=c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope)
+    Soup created
+    INFO - Undeploying app: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-application-scope
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.42 sec
+
+    Results :
+
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Soup.java
----------------------------------------------------------------------
diff --git a/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Soup.java b/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Soup.java
index 9fa87a7..122e9fc 100644
--- a/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Soup.java
+++ b/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Soup.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.applicationscope;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-
-@ApplicationScoped
-public class Soup {
-
-    private String name = "Soup of the day";
-
-    @PostConstruct
-    public void afterCreate() {
-        System.out.println("Soup created");
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.applicationscope;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class Soup {
+
+    private String name = "Soup of the day";
+
+    @PostConstruct
+    public void afterCreate() {
+        System.out.println("Soup created");
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Waiter.java
----------------------------------------------------------------------
diff --git a/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Waiter.java b/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Waiter.java
index 55d9df2..effe242 100644
--- a/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Waiter.java
+++ b/examples/cdi-application-scope/src/main/java/org/superbiz/cdi/applicationscope/Waiter.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.applicationscope;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-
-@Stateless
-public class Waiter {
-
-    @Inject
-    public Soup soup;
-
-    public String orderSoup(String name) {
-        soup.setName(name);
-        return soup.getName();
-    }
-
-    public String orderWhatTheOtherGuyHad() {
-        String name = soup.getName();
-        return name;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.applicationscope;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+
+@Stateless
+public class Waiter {
+
+    @Inject
+    public Soup soup;
+
+    public String orderSoup(String name) {
+        soup.setName(name);
+        return soup.getName();
+    }
+
+    public String orderWhatTheOtherGuyHad() {
+        String name = soup.getName();
+        return name;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-application-scope/src/test/java/org/superbiz/cdi/applicationscope/RestaurantTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-application-scope/src/test/java/org/superbiz/cdi/applicationscope/RestaurantTest.java b/examples/cdi-application-scope/src/test/java/org/superbiz/cdi/applicationscope/RestaurantTest.java
index 2a2bdcc..abd863a 100644
--- a/examples/cdi-application-scope/src/test/java/org/superbiz/cdi/applicationscope/RestaurantTest.java
+++ b/examples/cdi-application-scope/src/test/java/org/superbiz/cdi/applicationscope/RestaurantTest.java
@@ -1,55 +1,55 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.applicationscope;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-
-import static org.junit.Assert.assertEquals;
-
-public class RestaurantTest {
-
-    private static String TOMATO_SOUP = "Tomato Soup";
-    private EJBContainer container;
-
-    @EJB
-    private Waiter joe;
-
-    @Before
-    public void startContainer() throws Exception {
-        container = EJBContainer.createEJBContainer();
-        container.getContext().bind("inject", this);
-    }
-
-    @Test
-    public void orderSoup() {
-        String someSoup = joe.orderSoup(TOMATO_SOUP);
-        assertEquals(TOMATO_SOUP, someSoup);
-
-        String sameSoup = joe.orderWhatTheOtherGuyHad();
-        assertEquals(TOMATO_SOUP, sameSoup);
-    }
-
-    @After
-    public void closeContainer() throws Exception {
-        container.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.applicationscope;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+
+import static org.junit.Assert.assertEquals;
+
+public class RestaurantTest {
+
+    private static String TOMATO_SOUP = "Tomato Soup";
+    private EJBContainer container;
+
+    @EJB
+    private Waiter joe;
+
+    @Before
+    public void startContainer() throws Exception {
+        container = EJBContainer.createEJBContainer();
+        container.getContext().bind("inject", this);
+    }
+
+    @Test
+    public void orderSoup() {
+        String someSoup = joe.orderSoup(TOMATO_SOUP);
+        assertEquals(TOMATO_SOUP, someSoup);
+
+        String sameSoup = joe.orderWhatTheOtherGuyHad();
+        assertEquals(TOMATO_SOUP, sameSoup);
+    }
+
+    @After
+    public void closeContainer() throws Exception {
+        container.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Course.java
----------------------------------------------------------------------
diff --git a/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Course.java b/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Course.java
index dc3113a..c2e527f 100644
--- a/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Course.java
+++ b/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Course.java
@@ -1,54 +1,54 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.basic;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-
-@Stateless
-public class Course {
-
-    @Inject
-    private Faculty faculty;
-
-    private String courseName;
-
-    private int capacity;
-
-    @PostConstruct
-    private void init() {
-        assert faculty != null;
-
-        // These strings can be externalized
-        // We'll see how to do that later
-        this.courseName = "CDI 101 - Introduction to CDI";
-        this.capacity = 100;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public int getCapacity() {
-        return capacity;
-    }
-
-    public Faculty getFaculty() {
-        return faculty;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.basic;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+
+@Stateless
+public class Course {
+
+    @Inject
+    private Faculty faculty;
+
+    private String courseName;
+
+    private int capacity;
+
+    @PostConstruct
+    private void init() {
+        assert faculty != null;
+
+        // These strings can be externalized
+        // We'll see how to do that later
+        this.courseName = "CDI 101 - Introduction to CDI";
+        this.capacity = 100;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public int getCapacity() {
+        return capacity;
+    }
+
+    public Faculty getFaculty() {
+        return faculty;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Faculty.java
----------------------------------------------------------------------
diff --git a/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Faculty.java b/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Faculty.java
index e0adf28..6b6cbec 100644
--- a/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Faculty.java
+++ b/examples/cdi-basic/src/main/java/org/superbiz/cdi/basic/Faculty.java
@@ -1,45 +1,45 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.basic;
-
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Faculty {
-
-    private List<String> facultyMembers;
-
-    private String facultyName;
-
-    @PostConstruct
-    public void initialize() {
-        this.facultyMembers = new ArrayList<String>();
-        facultyMembers.add("Ian Schultz");
-        facultyMembers.add("Diane Reyes");
-        facultyName = "Computer Science";
-    }
-
-    public List<String> getFacultyMembers() {
-        return facultyMembers;
-    }
-
-    public String getFacultyName() {
-        return facultyName;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.basic;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Faculty {
+
+    private List<String> facultyMembers;
+
+    private String facultyName;
+
+    @PostConstruct
+    public void initialize() {
+        this.facultyMembers = new ArrayList<String>();
+        facultyMembers.add("Ian Schultz");
+        facultyMembers.add("Diane Reyes");
+        facultyName = "Computer Science";
+    }
+
+    public List<String> getFacultyMembers() {
+        return facultyMembers;
+    }
+
+    public String getFacultyName() {
+        return facultyName;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-basic/src/test/java/org/superbiz/cdi/basic/CourseTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-basic/src/test/java/org/superbiz/cdi/basic/CourseTest.java b/examples/cdi-basic/src/test/java/org/superbiz/cdi/basic/CourseTest.java
index cb042f4..d6a68c8 100644
--- a/examples/cdi-basic/src/test/java/org/superbiz/cdi/basic/CourseTest.java
+++ b/examples/cdi-basic/src/test/java/org/superbiz/cdi/basic/CourseTest.java
@@ -1,71 +1,71 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.basic;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class CourseTest {
-
-    private static EJBContainer container;
-
-    @EJB
-    private Course course;
-
-    @BeforeClass
-    public static void start() {
-        container = EJBContainer.createEJBContainer();
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        container.getContext().bind("inject", this);
-    }
-
-    @Test
-    public void test() {
-
-        // Was the EJB injected?
-        assertTrue(course != null);
-
-        // Was the Course @PostConstruct called?
-        assertNotNull(course.getCourseName());
-        assertTrue(course.getCapacity() > 0);
-
-        // Was a Faculty instance injected into Course?
-        final Faculty faculty = course.getFaculty();
-        assertTrue(faculty != null);
-
-        // Was the @PostConstruct called on Faculty?
-        assertEquals(faculty.getFacultyName(), "Computer Science");
-        assertEquals(faculty.getFacultyMembers().size(), 2);
-    }
-
-    @AfterClass
-    public static void stop() {
-        container.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.basic;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class CourseTest {
+
+    private static EJBContainer container;
+
+    @EJB
+    private Course course;
+
+    @BeforeClass
+    public static void start() {
+        container = EJBContainer.createEJBContainer();
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        container.getContext().bind("inject", this);
+    }
+
+    @Test
+    public void test() {
+
+        // Was the EJB injected?
+        assertTrue(course != null);
+
+        // Was the Course @PostConstruct called?
+        assertNotNull(course.getCourseName());
+        assertTrue(course.getCapacity() > 0);
+
+        // Was a Faculty instance injected into Course?
+        final Faculty faculty = course.getFaculty();
+        assertTrue(faculty != null);
+
+        // Was the @PostConstruct called on Faculty?
+        assertEquals(faculty.getFacultyName(), "Computer Science");
+        assertEquals(faculty.getFacultyMembers().size(), 2);
+    }
+
+    @AfterClass
+    public static void stop() {
+        container.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/LogginServlet.java
----------------------------------------------------------------------
diff --git a/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/LogginServlet.java b/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/LogginServlet.java
index a1aa109..f4e2c52 100644
--- a/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/LogginServlet.java
+++ b/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/LogginServlet.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.ejbcontext;
-
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet(urlPatterns = "/ejbcontext")
-public class LogginServlet extends HttpServlet {
-
-    @Inject
-    private PrinciaplEjb bean;
-
-    @Override
-    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        req.login(req.getParameter("myUser"), req.getParameter("myPass"));
-        // think to persist the information in the session if you need it later
-        resp.getWriter().write("logged user ==> " + bean.info() + "; isUserInRole(admin)? " + req.isUserInRole("admin"));
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.ejbcontext;
+
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(urlPatterns = "/ejbcontext")
+public class LogginServlet extends HttpServlet {
+
+    @Inject
+    private PrinciaplEjb bean;
+
+    @Override
+    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        req.login(req.getParameter("myUser"), req.getParameter("myPass"));
+        // think to persist the information in the session if you need it later
+        resp.getWriter().write("logged user ==> " + bean.info() + "; isUserInRole(admin)? " + req.isUserInRole("admin"));
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/PrinciaplEjb.java
----------------------------------------------------------------------
diff --git a/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/PrinciaplEjb.java b/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/PrinciaplEjb.java
index 6dd11f5..d3b9075 100644
--- a/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/PrinciaplEjb.java
+++ b/examples/cdi-ejbcontext-jaas/src/main/java/org/superbiz/cdi/ejbcontext/PrinciaplEjb.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.ejbcontext;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.ejb.Stateless;
-
-@Stateless
-public class PrinciaplEjb {
-
-    @Resource
-    private EJBContext context;
-
-    public String info() {
-        return context.getCallerPrincipal().getName();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.ejbcontext;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBContext;
+import javax.ejb.Stateless;
+
+@Stateless
+public class PrinciaplEjb {
+
+    @Resource
+    private EJBContext context;
+
+    public String info() {
+        return context.getCallerPrincipal().getName();
+    }
+}


[23/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaDataType.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaDataType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaDataType.java
index cd119ad..904210a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaDataType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaDataType.java
@@ -1,46 +1,46 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.openejb.jee.was.v6.ecore.EClass;
-
-/**
- * <p/>
- * Java class for JavaDataType complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="JavaDataType">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EClass">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JavaDataType")
-public class JavaDataType extends EClass {
-
-}
+/**
+ * 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.openejb.jee.was.v6.ecore.EClass;
+
+/**
+ * <p/>
+ * Java class for JavaDataType complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="JavaDataType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EClass">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "JavaDataType")
+public class JavaDataType extends EClass {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaEvent.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaEvent.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaEvent.java
index 8444ca6..628dbf6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaEvent.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaEvent.java
@@ -1,46 +1,46 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.openejb.jee.was.v6.ecore.EStructuralFeature;
-
-/**
- * <p/>
- * Java class for JavaEvent complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="JavaEvent">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EStructuralFeature">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JavaEvent")
-public class JavaEvent extends EStructuralFeature {
-
-}
+/**
+ * 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.openejb.jee.was.v6.ecore.EStructuralFeature;
+
+/**
+ * <p/>
+ * Java class for JavaEvent complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="JavaEvent">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EStructuralFeature">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "JavaEvent")
+public class JavaEvent extends EStructuralFeature {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaPackage.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaPackage.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaPackage.java
index 72fbbd6..7293d76 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaPackage.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaPackage.java
@@ -1,46 +1,46 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.openejb.jee.was.v6.ecore.EPackage;
-
-/**
- * <p/>
- * Java class for JavaPackage complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="JavaPackage">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EPackage">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JavaPackage")
-public class JavaPackage extends EPackage {
-
-}
+/**
+ * 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.openejb.jee.was.v6.ecore.EPackage;
+
+/**
+ * <p/>
+ * Java class for JavaPackage complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="JavaPackage">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EPackage">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "JavaPackage")
+public class JavaPackage extends EPackage {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameter.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameter.java
index f471be9..bc24f90 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameter.java
@@ -1,90 +1,90 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.openejb.jee.was.v6.ecore.EParameter;
-
-/**
- * <p/>
- * Java class for JavaParameter complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="JavaParameter">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EParameter">
- *       &lt;attribute name="final" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="parameterKind" type="{java.xmi}JavaParameterKind" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JavaParameter")
-public class JavaParameter extends EParameter {
-
-    @XmlAttribute(name = "final")
-    protected Boolean isFinal;
-    @XmlAttribute
-    protected JavaParameterEnum parameterKind;
-
-    /**
-     * Gets the value of the isFinal property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsFinal() {
-        return isFinal;
-    }
-
-    /**
-     * Sets the value of the isFinal property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsFinal(final Boolean value) {
-        this.isFinal = value;
-    }
-
-    /**
-     * Gets the value of the parameterKind property.
-     *
-     * @return possible object is {@link JavaParameterEnum }
-     */
-    public JavaParameterEnum getParameterKind() {
-        return parameterKind;
-    }
-
-    /**
-     * Sets the value of the parameterKind property.
-     *
-     * @param value allowed object is {@link JavaParameterEnum }
-     */
-    public void setParameterKind(final JavaParameterEnum value) {
-        this.parameterKind = 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.openejb.jee.was.v6.ecore.EParameter;
+
+/**
+ * <p/>
+ * Java class for JavaParameter complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="JavaParameter">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EParameter">
+ *       &lt;attribute name="final" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="parameterKind" type="{java.xmi}JavaParameterKind" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "JavaParameter")
+public class JavaParameter extends EParameter {
+
+    @XmlAttribute(name = "final")
+    protected Boolean isFinal;
+    @XmlAttribute
+    protected JavaParameterEnum parameterKind;
+
+    /**
+     * Gets the value of the isFinal property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsFinal() {
+        return isFinal;
+    }
+
+    /**
+     * Sets the value of the isFinal property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsFinal(final Boolean value) {
+        this.isFinal = value;
+    }
+
+    /**
+     * Gets the value of the parameterKind property.
+     *
+     * @return possible object is {@link JavaParameterEnum }
+     */
+    public JavaParameterEnum getParameterKind() {
+        return parameterKind;
+    }
+
+    /**
+     * Sets the value of the parameterKind property.
+     *
+     * @param value allowed object is {@link JavaParameterEnum }
+     */
+    public void setParameterKind(final JavaParameterEnum value) {
+        this.parameterKind = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameterEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameterEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameterEnum.java
index 20a8a3e..be0e810 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameterEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaParameterEnum.java
@@ -1,54 +1,54 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-/**
- * <p/>
- * Java class for JavaParameterKind.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="JavaParameterKind">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="IN"/>
- *     &lt;enumeration value="OUT"/>
- *     &lt;enumeration value="INOUT"/>
- *     &lt;enumeration value="RETURN"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum JavaParameterEnum {
-
-    IN, OUT, INOUT, RETURN;
-
-    public String value() {
-        return name();
-    }
-
-    public static JavaParameterEnum 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * <p/>
+ * Java class for JavaParameterKind.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="JavaParameterKind">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="IN"/>
+ *     &lt;enumeration value="OUT"/>
+ *     &lt;enumeration value="INOUT"/>
+ *     &lt;enumeration value="RETURN"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum JavaParameterEnum {
+
+    IN, OUT, INOUT, RETURN;
+
+    public String value() {
+        return name();
+    }
+
+    public static JavaParameterEnum fromValue(final String v) {
+        return valueOf(v);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaVisibilityEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaVisibilityEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaVisibilityEnum.java
index 7aec3e5..73f0bc5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaVisibilityEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/JavaVisibilityEnum.java
@@ -1,54 +1,54 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-/**
- * <p/>
- * Java class for JavaVisibilityKind.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="JavaVisibilityKind">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="PUBLIC"/>
- *     &lt;enumeration value="PRIVATE"/>
- *     &lt;enumeration value="PROTECTED"/>
- *     &lt;enumeration value="PACKAGE"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum JavaVisibilityEnum {
-
-    PUBLIC, PRIVATE, PROTECTED, PACKAGE;
-
-    public String value() {
-        return name();
-    }
-
-    public static JavaVisibilityEnum 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * <p/>
+ * Java class for JavaVisibilityKind.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="JavaVisibilityKind">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="PUBLIC"/>
+ *     &lt;enumeration value="PRIVATE"/>
+ *     &lt;enumeration value="PROTECTED"/>
+ *     &lt;enumeration value="PACKAGE"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum JavaVisibilityEnum {
+
+    PUBLIC, PRIVATE, PROTECTED, PACKAGE;
+
+    public String value() {
+        return name();
+    }
+
+    public static JavaVisibilityEnum fromValue(final String v) {
+        return valueOf(v);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Method.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Method.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Method.java
index 66c5c4a..d19cbb6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Method.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Method.java
@@ -1,340 +1,340 @@
-/**
- * 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.was.v6.java;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.ecore.EOperation;
-
-/**
- * <p/>
- * Java class for Method complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Method">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EOperation">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="parameters" type="{java.xmi}JavaParameter"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="javaExceptions" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="source" type="{java.xmi}Block"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="abstract" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="constructor" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="final" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="javaExceptions" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="javaVisibility" type="{java.xmi}JavaVisibilityKind" />
- *       &lt;attribute name="native" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="static" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="synchronized" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Method", propOrder = {"parameters",
-    "javaClassJavaExceptions", "sources"})
-public class Method extends EOperation {
-
-    protected List<JavaParameter> parameters;
-    @XmlElement(name = "javaExceptions")
-    protected List<JavaClass> javaClassJavaExceptions;
-    @XmlElement(name = "source")
-    protected List<Block> sources;
-    @XmlAttribute(name = "abstract")
-    protected Boolean isAbstract;
-    @XmlAttribute
-    protected Boolean constructor;
-    @XmlAttribute(name = "final")
-    protected Boolean isFinal;
-    @XmlAttribute
-    protected String javaExceptions;
-    @XmlAttribute
-    protected JavaVisibilityEnum javaVisibility;
-    @XmlAttribute(name = "native")
-    protected Boolean isNative;
-    @XmlAttribute
-    protected String source;
-    @XmlAttribute(name = "static")
-    protected Boolean isStatic;
-    @XmlAttribute(name = "synchronized")
-    protected Boolean isSynchronized;
-
-    /**
-     * Gets the value of the parameters 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 parameters property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getParameters().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaParameter }
-     */
-    public List<JavaParameter> getParameters() {
-        if (parameters == null) {
-            parameters = new ArrayList<JavaParameter>();
-        }
-        return this.parameters;
-    }
-
-    /**
-     * Gets the value of the javaClassJavaExceptions 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 javaClassJavaExceptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getJavaClassJavaExceptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getJavaClassJavaExceptions() {
-        if (javaClassJavaExceptions == null) {
-            javaClassJavaExceptions = new ArrayList<JavaClass>();
-        }
-        return this.javaClassJavaExceptions;
-    }
-
-    /**
-     * Gets the value of the sources 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 sources property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getSources().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Block }
-     */
-    public List<Block> getSources() {
-        if (sources == null) {
-            sources = new ArrayList<Block>();
-        }
-        return this.sources;
-    }
-
-    /**
-     * Gets the value of the isAbstract property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsAbstract() {
-        return isAbstract;
-    }
-
-    /**
-     * Sets the value of the isAbstract property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsAbstract(final Boolean value) {
-        this.isAbstract = value;
-    }
-
-    /**
-     * Gets the value of the constructor property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isConstructor() {
-        return constructor;
-    }
-
-    /**
-     * Sets the value of the constructor property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setConstructor(final Boolean value) {
-        this.constructor = value;
-    }
-
-    /**
-     * Gets the value of the isFinal property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsFinal() {
-        return isFinal;
-    }
-
-    /**
-     * Sets the value of the isFinal property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsFinal(final Boolean value) {
-        this.isFinal = value;
-    }
-
-    /**
-     * Gets the value of the javaExceptions property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJavaExceptions() {
-        return javaExceptions;
-    }
-
-    /**
-     * Sets the value of the javaExceptions property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJavaExceptions(final String value) {
-        this.javaExceptions = value;
-    }
-
-    /**
-     * Gets the value of the javaVisibility property.
-     *
-     * @return possible object is {@link JavaVisibilityEnum }
-     */
-    public JavaVisibilityEnum getJavaVisibility() {
-        return javaVisibility;
-    }
-
-    /**
-     * Sets the value of the javaVisibility property.
-     *
-     * @param value allowed object is {@link JavaVisibilityEnum }
-     */
-    public void setJavaVisibility(final JavaVisibilityEnum value) {
-        this.javaVisibility = value;
-    }
-
-    /**
-     * Gets the value of the isNative property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsNative() {
-        return isNative;
-    }
-
-    /**
-     * Sets the value of the isNative property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsNative(final Boolean value) {
-        this.isNative = value;
-    }
-
-    /**
-     * Gets the value of the source property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getSource() {
-        return source;
-    }
-
-    /**
-     * Sets the value of the source property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setSource(final String value) {
-        this.source = value;
-    }
-
-    /**
-     * Gets the value of the isStatic property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsStatic() {
-        return isStatic;
-    }
-
-    /**
-     * Sets the value of the isStatic property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsStatic(final Boolean value) {
-        this.isStatic = value;
-    }
-
-    /**
-     * Gets the value of the isSynchronized property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsSynchronized() {
-        return isSynchronized;
-    }
-
-    /**
-     * Sets the value of the isSynchronized property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsSynchronized(final Boolean value) {
-        this.isSynchronized = 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.was.v6.java;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.ecore.EOperation;
+
+/**
+ * <p/>
+ * Java class for Method complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Method">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EOperation">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="parameters" type="{java.xmi}JavaParameter"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="javaExceptions" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="source" type="{java.xmi}Block"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="abstract" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="constructor" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="final" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="javaExceptions" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="javaVisibility" type="{java.xmi}JavaVisibilityKind" />
+ *       &lt;attribute name="native" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="static" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="synchronized" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Method", propOrder = {"parameters",
+    "javaClassJavaExceptions", "sources"})
+public class Method extends EOperation {
+
+    protected List<JavaParameter> parameters;
+    @XmlElement(name = "javaExceptions")
+    protected List<JavaClass> javaClassJavaExceptions;
+    @XmlElement(name = "source")
+    protected List<Block> sources;
+    @XmlAttribute(name = "abstract")
+    protected Boolean isAbstract;
+    @XmlAttribute
+    protected Boolean constructor;
+    @XmlAttribute(name = "final")
+    protected Boolean isFinal;
+    @XmlAttribute
+    protected String javaExceptions;
+    @XmlAttribute
+    protected JavaVisibilityEnum javaVisibility;
+    @XmlAttribute(name = "native")
+    protected Boolean isNative;
+    @XmlAttribute
+    protected String source;
+    @XmlAttribute(name = "static")
+    protected Boolean isStatic;
+    @XmlAttribute(name = "synchronized")
+    protected Boolean isSynchronized;
+
+    /**
+     * Gets the value of the parameters 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 parameters property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getParameters().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaParameter }
+     */
+    public List<JavaParameter> getParameters() {
+        if (parameters == null) {
+            parameters = new ArrayList<JavaParameter>();
+        }
+        return this.parameters;
+    }
+
+    /**
+     * Gets the value of the javaClassJavaExceptions 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 javaClassJavaExceptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getJavaClassJavaExceptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getJavaClassJavaExceptions() {
+        if (javaClassJavaExceptions == null) {
+            javaClassJavaExceptions = new ArrayList<JavaClass>();
+        }
+        return this.javaClassJavaExceptions;
+    }
+
+    /**
+     * Gets the value of the sources 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 sources property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getSources().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Block }
+     */
+    public List<Block> getSources() {
+        if (sources == null) {
+            sources = new ArrayList<Block>();
+        }
+        return this.sources;
+    }
+
+    /**
+     * Gets the value of the isAbstract property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsAbstract() {
+        return isAbstract;
+    }
+
+    /**
+     * Sets the value of the isAbstract property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsAbstract(final Boolean value) {
+        this.isAbstract = value;
+    }
+
+    /**
+     * Gets the value of the constructor property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isConstructor() {
+        return constructor;
+    }
+
+    /**
+     * Sets the value of the constructor property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setConstructor(final Boolean value) {
+        this.constructor = value;
+    }
+
+    /**
+     * Gets the value of the isFinal property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsFinal() {
+        return isFinal;
+    }
+
+    /**
+     * Sets the value of the isFinal property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsFinal(final Boolean value) {
+        this.isFinal = value;
+    }
+
+    /**
+     * Gets the value of the javaExceptions property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJavaExceptions() {
+        return javaExceptions;
+    }
+
+    /**
+     * Sets the value of the javaExceptions property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJavaExceptions(final String value) {
+        this.javaExceptions = value;
+    }
+
+    /**
+     * Gets the value of the javaVisibility property.
+     *
+     * @return possible object is {@link JavaVisibilityEnum }
+     */
+    public JavaVisibilityEnum getJavaVisibility() {
+        return javaVisibility;
+    }
+
+    /**
+     * Sets the value of the javaVisibility property.
+     *
+     * @param value allowed object is {@link JavaVisibilityEnum }
+     */
+    public void setJavaVisibility(final JavaVisibilityEnum value) {
+        this.javaVisibility = value;
+    }
+
+    /**
+     * Gets the value of the isNative property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsNative() {
+        return isNative;
+    }
+
+    /**
+     * Sets the value of the isNative property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsNative(final Boolean value) {
+        this.isNative = value;
+    }
+
+    /**
+     * Gets the value of the source property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Sets the value of the source property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setSource(final String value) {
+        this.source = value;
+    }
+
+    /**
+     * Gets the value of the isStatic property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsStatic() {
+        return isStatic;
+    }
+
+    /**
+     * Sets the value of the isStatic property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsStatic(final Boolean value) {
+        this.isStatic = value;
+    }
+
+    /**
+     * Gets the value of the isSynchronized property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsSynchronized() {
+        return isSynchronized;
+    }
+
+    /**
+     * Sets the value of the isSynchronized property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsSynchronized(final Boolean value) {
+        this.isSynchronized = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java
index f2bf497..f551391 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java
@@ -1,264 +1,264 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the org.apache.openejb.jee.was.v6.java
- * package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _JavaEvent_QNAME = new QName("java.xmi",
-        "JavaEvent");
-    private final static QName _JavaParameter_QNAME = new QName("java.xmi",
-        "JavaParameter");
-    private final static QName _JavaClass_QNAME = new QName("java.xmi",
-        "JavaClass");
-    private final static QName _Initializer_QNAME = new QName("java.xmi",
-        "Initializer");
-    private final static QName _Field_QNAME = new QName("java.xmi", "Field");
-    private final static QName _JavaDataType_QNAME = new QName("java.xmi",
-        "JavaDataType");
-    private final static QName _Statement_QNAME = new QName("java.xmi",
-        "Statement");
-    private final static QName _Comment_QNAME = new QName("java.xmi", "Comment");
-    private final static QName _Method_QNAME = new QName("java.xmi", "Method");
-    private final static QName _JavaPackage_QNAME = new QName("java.xmi",
-        "JavaPackage");
-    private final static QName _ArrayType_QNAME = new QName("java.xmi",
-        "ArrayType");
-    private final static QName _Block_QNAME = new QName("java.xmi", "Block");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package: org.apache.openejb.jee.was.v6.java
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link JavaDataType }
-     */
-    public JavaDataType createJavaDataType() {
-        return new JavaDataType();
-    }
-
-    /**
-     * Create an instance of {@link JavaParameter }
-     */
-    public JavaParameter createJavaParameter() {
-        return new JavaParameter();
-    }
-
-    /**
-     * Create an instance of {@link JavaEvent }
-     */
-    public JavaEvent createJavaEvent() {
-        return new JavaEvent();
-    }
-
-    /**
-     * Create an instance of {@link JavaClass }
-     */
-    public JavaClass createJavaClass() {
-        return new JavaClass();
-    }
-
-    /**
-     * Create an instance of {@link JavaPackage }
-     */
-    public JavaPackage createJavaPackage() {
-        return new JavaPackage();
-    }
-
-    /**
-     * Create an instance of {@link Statement }
-     */
-    public Statement createStatement() {
-        return new Statement();
-    }
-
-    /**
-     * Create an instance of {@link Comment }
-     */
-    public Comment createComment() {
-        return new Comment();
-    }
-
-    /**
-     * Create an instance of {@link Method }
-     */
-    public Method createMethod() {
-        return new Method();
-    }
-
-    /**
-     * Create an instance of {@link Block }
-     */
-    public Block createBlock() {
-        return new Block();
-    }
-
-    /**
-     * Create an instance of {@link Field }
-     */
-    public Field createField() {
-        return new Field();
-    }
-
-    /**
-     * Create an instance of {@link Initializer }
-     */
-    public Initializer createInitializer() {
-        return new Initializer();
-    }
-
-    /**
-     * Create an instance of {@link ArrayType }
-     */
-    public ArrayType createArrayType() {
-        return new ArrayType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link JavaEvent }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "JavaEvent")
-    public JAXBElement<JavaEvent> createJavaEvent(final JavaEvent value) {
-        return new JAXBElement<JavaEvent>(_JavaEvent_QNAME, JavaEvent.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link JavaParameter }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "JavaParameter")
-    public JAXBElement<JavaParameter> createJavaParameter(final JavaParameter value) {
-        return new JAXBElement<JavaParameter>(_JavaParameter_QNAME,
-            JavaParameter.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link JavaClass }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "JavaClass")
-    public JAXBElement<JavaClass> createJavaClass(final JavaClass value) {
-        return new JAXBElement<JavaClass>(_JavaClass_QNAME, JavaClass.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Initializer }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "Initializer")
-    public JAXBElement<Initializer> createInitializer(final Initializer value) {
-        return new JAXBElement<Initializer>(_Initializer_QNAME,
-            Initializer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Field }{@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "Field")
-    public JAXBElement<Field> createField(final Field value) {
-        return new JAXBElement<Field>(_Field_QNAME, Field.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link JavaDataType }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "JavaDataType")
-    public JAXBElement<JavaDataType> createJavaDataType(final JavaDataType value) {
-        return new JAXBElement<JavaDataType>(_JavaDataType_QNAME,
-            JavaDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Statement }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "Statement")
-    public JAXBElement<Statement> createStatement(final Statement value) {
-        return new JAXBElement<Statement>(_Statement_QNAME, Statement.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Comment }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "Comment")
-    public JAXBElement<Comment> createComment(final Comment value) {
-        return new JAXBElement<Comment>(_Comment_QNAME, Comment.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Method }{@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "Method")
-    public JAXBElement<Method> createMethod(final Method value) {
-        return new JAXBElement<Method>(_Method_QNAME, Method.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link JavaPackage }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "JavaPackage")
-    public JAXBElement<JavaPackage> createJavaPackage(final JavaPackage value) {
-        return new JAXBElement<JavaPackage>(_JavaPackage_QNAME,
-            JavaPackage.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ArrayType }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "ArrayType")
-    public JAXBElement<ArrayType> createArrayType(final ArrayType value) {
-        return new JAXBElement<ArrayType>(_ArrayType_QNAME, ArrayType.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Block }{@code >}
-     */
-    @XmlElementDecl(namespace = "java.xmi", name = "Block")
-    public JAXBElement<Block> createBlock(final Block value) {
-        return new JAXBElement<Block>(_Block_QNAME, Block.class, null, 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.was.v6.java;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the org.apache.openejb.jee.was.v6.java
+ * package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _JavaEvent_QNAME = new QName("java.xmi",
+        "JavaEvent");
+    private final static QName _JavaParameter_QNAME = new QName("java.xmi",
+        "JavaParameter");
+    private final static QName _JavaClass_QNAME = new QName("java.xmi",
+        "JavaClass");
+    private final static QName _Initializer_QNAME = new QName("java.xmi",
+        "Initializer");
+    private final static QName _Field_QNAME = new QName("java.xmi", "Field");
+    private final static QName _JavaDataType_QNAME = new QName("java.xmi",
+        "JavaDataType");
+    private final static QName _Statement_QNAME = new QName("java.xmi",
+        "Statement");
+    private final static QName _Comment_QNAME = new QName("java.xmi", "Comment");
+    private final static QName _Method_QNAME = new QName("java.xmi", "Method");
+    private final static QName _JavaPackage_QNAME = new QName("java.xmi",
+        "JavaPackage");
+    private final static QName _ArrayType_QNAME = new QName("java.xmi",
+        "ArrayType");
+    private final static QName _Block_QNAME = new QName("java.xmi", "Block");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package: org.apache.openejb.jee.was.v6.java
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link JavaDataType }
+     */
+    public JavaDataType createJavaDataType() {
+        return new JavaDataType();
+    }
+
+    /**
+     * Create an instance of {@link JavaParameter }
+     */
+    public JavaParameter createJavaParameter() {
+        return new JavaParameter();
+    }
+
+    /**
+     * Create an instance of {@link JavaEvent }
+     */
+    public JavaEvent createJavaEvent() {
+        return new JavaEvent();
+    }
+
+    /**
+     * Create an instance of {@link JavaClass }
+     */
+    public JavaClass createJavaClass() {
+        return new JavaClass();
+    }
+
+    /**
+     * Create an instance of {@link JavaPackage }
+     */
+    public JavaPackage createJavaPackage() {
+        return new JavaPackage();
+    }
+
+    /**
+     * Create an instance of {@link Statement }
+     */
+    public Statement createStatement() {
+        return new Statement();
+    }
+
+    /**
+     * Create an instance of {@link Comment }
+     */
+    public Comment createComment() {
+        return new Comment();
+    }
+
+    /**
+     * Create an instance of {@link Method }
+     */
+    public Method createMethod() {
+        return new Method();
+    }
+
+    /**
+     * Create an instance of {@link Block }
+     */
+    public Block createBlock() {
+        return new Block();
+    }
+
+    /**
+     * Create an instance of {@link Field }
+     */
+    public Field createField() {
+        return new Field();
+    }
+
+    /**
+     * Create an instance of {@link Initializer }
+     */
+    public Initializer createInitializer() {
+        return new Initializer();
+    }
+
+    /**
+     * Create an instance of {@link ArrayType }
+     */
+    public ArrayType createArrayType() {
+        return new ArrayType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link JavaEvent }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "JavaEvent")
+    public JAXBElement<JavaEvent> createJavaEvent(final JavaEvent value) {
+        return new JAXBElement<JavaEvent>(_JavaEvent_QNAME, JavaEvent.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link JavaParameter }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "JavaParameter")
+    public JAXBElement<JavaParameter> createJavaParameter(final JavaParameter value) {
+        return new JAXBElement<JavaParameter>(_JavaParameter_QNAME,
+            JavaParameter.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link JavaClass }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "JavaClass")
+    public JAXBElement<JavaClass> createJavaClass(final JavaClass value) {
+        return new JAXBElement<JavaClass>(_JavaClass_QNAME, JavaClass.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Initializer }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "Initializer")
+    public JAXBElement<Initializer> createInitializer(final Initializer value) {
+        return new JAXBElement<Initializer>(_Initializer_QNAME,
+            Initializer.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Field }{@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "Field")
+    public JAXBElement<Field> createField(final Field value) {
+        return new JAXBElement<Field>(_Field_QNAME, Field.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link JavaDataType }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "JavaDataType")
+    public JAXBElement<JavaDataType> createJavaDataType(final JavaDataType value) {
+        return new JAXBElement<JavaDataType>(_JavaDataType_QNAME,
+            JavaDataType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Statement }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "Statement")
+    public JAXBElement<Statement> createStatement(final Statement value) {
+        return new JAXBElement<Statement>(_Statement_QNAME, Statement.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Comment }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "Comment")
+    public JAXBElement<Comment> createComment(final Comment value) {
+        return new JAXBElement<Comment>(_Comment_QNAME, Comment.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Method }{@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "Method")
+    public JAXBElement<Method> createMethod(final Method value) {
+        return new JAXBElement<Method>(_Method_QNAME, Method.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link JavaPackage }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "JavaPackage")
+    public JAXBElement<JavaPackage> createJavaPackage(final JavaPackage value) {
+        return new JAXBElement<JavaPackage>(_JavaPackage_QNAME,
+            JavaPackage.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ArrayType }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "ArrayType")
+    public JAXBElement<ArrayType> createArrayType(final ArrayType value) {
+        return new JAXBElement<ArrayType>(_ArrayType_QNAME, ArrayType.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Block }{@code >}
+     */
+    @XmlElementDecl(namespace = "java.xmi", name = "Block")
+    public JAXBElement<Block> createBlock(final Block value) {
+        return new JAXBElement<Block>(_Block_QNAME, Block.class, null, value);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Statement.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Statement.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Statement.java
index 734f81b..c2247f1 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Statement.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Statement.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for Statement complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Statement">
- *   &lt;complexContent>
- *     &lt;extension base="{java.xmi}Block">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Statement")
-public class Statement extends Block {
-
-}
+/**
+ * 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for Statement complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Statement">
+ *   &lt;complexContent>
+ *     &lt;extension base="{java.xmi}Block">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Statement")
+public class Statement extends Block {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/TypeKind.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/TypeKind.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/TypeKind.java
index 9b626b9..8d19c4d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/TypeKind.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/TypeKind.java
@@ -1,54 +1,54 @@
-/**
- * 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.was.v6.java;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-/**
- * <p/>
- * Java class for TypeKind.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="TypeKind">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="UNDEFINED"/>
- *     &lt;enumeration value="CLASS"/>
- *     &lt;enumeration value="INTERFACE"/>
- *     &lt;enumeration value="EXCEPTION"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum TypeKind {
-
-    UNDEFINED, CLASS, INTERFACE, EXCEPTION;
-
-    public String value() {
-        return name();
-    }
-
-    public static TypeKind 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.was.v6.java;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * <p/>
+ * Java class for TypeKind.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="TypeKind">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="UNDEFINED"/>
+ *     &lt;enumeration value="CLASS"/>
+ *     &lt;enumeration value="INTERFACE"/>
+ *     &lt;enumeration value="EXCEPTION"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum TypeKind {
+
+    UNDEFINED, CLASS, INTERFACE, EXCEPTION;
+
+    public String value() {
+        return name();
+    }
+
+    public static TypeKind fromValue(final String v) {
+        return valueOf(v);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/package-info.java
index 35736da..614b6d3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "java.xmi") package org.apache.openejb.jee.was.v6.java;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "java.xmi") package org.apache.openejb.jee.was.v6.java;
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java
index 77892f9..e3017e6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java
@@ -1,67 +1,67 @@
-/**
- * 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.was.v6.webservice.clientbnd;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the
- * org.apache.openejb.jee.was.v6.webservice.clientbnd package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _ServiceRefBinding_QNAME = new QName(
-        "webservice_clientbnd.xmi", "ServiceRefBinding");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package:
-     * org.apache.openejb.jee.was.v6.webservice.clientbnd
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ServiceRefBinding }
-     */
-    public ServiceRefBinding createServiceRefBinding() {
-        return new ServiceRefBinding();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link ServiceRefBinding }{@code >}
-     */
-    @XmlElementDecl(namespace = "webservice_clientbnd.xmi", name = "ServiceRefBinding")
-    public JAXBElement<ServiceRefBinding> createServiceRefBinding(
-        final ServiceRefBinding value) {
-        return new JAXBElement<ServiceRefBinding>(_ServiceRefBinding_QNAME,
-            ServiceRefBinding.class, null, 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.was.v6.webservice.clientbnd;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the
+ * org.apache.openejb.jee.was.v6.webservice.clientbnd package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _ServiceRefBinding_QNAME = new QName(
+        "webservice_clientbnd.xmi", "ServiceRefBinding");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package:
+     * org.apache.openejb.jee.was.v6.webservice.clientbnd
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ServiceRefBinding }
+     */
+    public ServiceRefBinding createServiceRefBinding() {
+        return new ServiceRefBinding();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link ServiceRefBinding }{@code >}
+     */
+    @XmlElementDecl(namespace = "webservice_clientbnd.xmi", name = "ServiceRefBinding")
+    public JAXBElement<ServiceRefBinding> createServiceRefBinding(
+        final ServiceRefBinding value) {
+        return new JAXBElement<ServiceRefBinding>(_ServiceRefBinding_QNAME,
+            ServiceRefBinding.class, null, value);
+    }
+
+}


[37/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java
index 657ebb7..e82a5d5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java
@@ -1,315 +1,315 @@
-/**
- * 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.was.v6.commonbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.EjbRef;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for EjbRefBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EjbRefBinding">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="bindingEjbRef" type="{common.xmi}EjbRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="bindingEjbRef" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EjbRefBinding", propOrder = {"bindingEjbRefs", "extensions"})
-public class EjbRefBinding {
-
-    @XmlElement(name = "bindingEjbRef")
-    protected List<EjbRef> bindingEjbRefs;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String bindingEjbRef;
-    @XmlAttribute
-    protected String jndiName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the bindingEjbRefs 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 bindingEjbRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getBindingEjbRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link EjbRef }
-     */
-    public List<EjbRef> getBindingEjbRefs() {
-        if (bindingEjbRefs == null) {
-            bindingEjbRefs = new ArrayList<EjbRef>();
-        }
-        return this.bindingEjbRefs;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the bindingEjbRef property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getBindingEjbRef() {
-        return bindingEjbRef;
-    }
-
-    /**
-     * Sets the value of the bindingEjbRef property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setBindingEjbRef(final String value) {
-        this.bindingEjbRef = value;
-    }
-
-    /**
-     * Gets the value of the jndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJndiName() {
-        return jndiName;
-    }
-
-    /**
-     * Sets the value of the jndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJndiName(final String value) {
-        this.jndiName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.commonbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.EjbRef;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for EjbRefBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EjbRefBinding">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="bindingEjbRef" type="{common.xmi}EjbRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="bindingEjbRef" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EjbRefBinding", propOrder = {"bindingEjbRefs", "extensions"})
+public class EjbRefBinding {
+
+    @XmlElement(name = "bindingEjbRef")
+    protected List<EjbRef> bindingEjbRefs;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String bindingEjbRef;
+    @XmlAttribute
+    protected String jndiName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the bindingEjbRefs 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 bindingEjbRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getBindingEjbRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link EjbRef }
+     */
+    public List<EjbRef> getBindingEjbRefs() {
+        if (bindingEjbRefs == null) {
+            bindingEjbRefs = new ArrayList<EjbRef>();
+        }
+        return this.bindingEjbRefs;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the bindingEjbRef property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getBindingEjbRef() {
+        return bindingEjbRef;
+    }
+
+    /**
+     * Sets the value of the bindingEjbRef property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setBindingEjbRef(final String value) {
+        this.bindingEjbRef = value;
+    }
+
+    /**
+     * Gets the value of the jndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJndiName() {
+        return jndiName;
+    }
+
+    /**
+     * Sets the value of the jndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJndiName(final String value) {
+        this.jndiName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java
index fa15cc5..3fa03a7 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java
@@ -1,317 +1,317 @@
-/**
- * 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.was.v6.commonbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.MessageDestinationRef;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for MessageDestinationRefBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MessageDestinationRefBinding">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="bindingMessageDestinationRef" type="{common.xmi}MessageDestinationRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="bindingMessageDestinationRef" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageDestinationRefBinding", propOrder = {
-    "bindingMessageDestinationRefs", "extensions"})
-public class MessageDestinationRefBinding {
-
-    @XmlElement(name = "bindingMessageDestinationRef")
-    protected List<MessageDestinationRef> bindingMessageDestinationRefs;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String bindingMessageDestinationRef;
-    @XmlAttribute
-    protected String jndiName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the bindingMessageDestinationRefs 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 bindingMessageDestinationRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getBindingMessageDestinationRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MessageDestinationRef }
-     */
-    public List<MessageDestinationRef> getBindingMessageDestinationRefs() {
-        if (bindingMessageDestinationRefs == null) {
-            bindingMessageDestinationRefs = new ArrayList<MessageDestinationRef>();
-        }
-        return this.bindingMessageDestinationRefs;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the bindingMessageDestinationRef property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getBindingMessageDestinationRef() {
-        return bindingMessageDestinationRef;
-    }
-
-    /**
-     * Sets the value of the bindingMessageDestinationRef property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setBindingMessageDestinationRef(final String value) {
-        this.bindingMessageDestinationRef = value;
-    }
-
-    /**
-     * Gets the value of the jndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJndiName() {
-        return jndiName;
-    }
-
-    /**
-     * Sets the value of the jndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJndiName(final String value) {
-        this.jndiName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.commonbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.MessageDestinationRef;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for MessageDestinationRefBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MessageDestinationRefBinding">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="bindingMessageDestinationRef" type="{common.xmi}MessageDestinationRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="bindingMessageDestinationRef" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageDestinationRefBinding", propOrder = {
+    "bindingMessageDestinationRefs", "extensions"})
+public class MessageDestinationRefBinding {
+
+    @XmlElement(name = "bindingMessageDestinationRef")
+    protected List<MessageDestinationRef> bindingMessageDestinationRefs;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String bindingMessageDestinationRef;
+    @XmlAttribute
+    protected String jndiName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the bindingMessageDestinationRefs 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 bindingMessageDestinationRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getBindingMessageDestinationRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MessageDestinationRef }
+     */
+    public List<MessageDestinationRef> getBindingMessageDestinationRefs() {
+        if (bindingMessageDestinationRefs == null) {
+            bindingMessageDestinationRefs = new ArrayList<MessageDestinationRef>();
+        }
+        return this.bindingMessageDestinationRefs;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the bindingMessageDestinationRef property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getBindingMessageDestinationRef() {
+        return bindingMessageDestinationRef;
+    }
+
+    /**
+     * Sets the value of the bindingMessageDestinationRef property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setBindingMessageDestinationRef(final String value) {
+        this.bindingMessageDestinationRef = value;
+    }
+
+    /**
+     * Gets the value of the jndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJndiName() {
+        return jndiName;
+    }
+
+    /**
+     * Sets the value of the jndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJndiName(final String value) {
+        this.jndiName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java
index 3ad671f..a064676 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java
@@ -1,186 +1,186 @@
-/**
- * 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.was.v6.commonbnd;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the org.apache.openejb.jee.was.v6.commonbnd
- * package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _Property_QNAME = new QName("commonbnd.xmi",
-        "Property");
-    private final static QName _AbstractAuthData_QNAME = new QName(
-        "commonbnd.xmi", "AbstractAuthData");
-    private final static QName _ResourceEnvRefBinding_QNAME = new QName(
-        "commonbnd.xmi", "ResourceEnvRefBinding");
-    private final static QName _ResourceRefBinding_QNAME = new QName(
-        "commonbnd.xmi", "ResourceRefBinding");
-    private final static QName _BasicAuthData_QNAME = new QName(
-        "commonbnd.xmi", "BasicAuthData");
-    private final static QName _MessageDestinationRefBinding_QNAME = new QName(
-        "commonbnd.xmi", "MessageDestinationRefBinding");
-    private final static QName _EjbRefBinding_QNAME = new QName(
-        "commonbnd.xmi", "EjbRefBinding");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package:
-     * org.apache.openejb.jee.was.v6.commonbnd
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ResourceEnvRefBinding }
-     */
-    public ResourceEnvRefBinding createResourceEnvRefBinding() {
-        return new ResourceEnvRefBinding();
-    }
-
-    /**
-     * Create an instance of {@link BasicAuthData }
-     */
-    public BasicAuthData createBasicAuthData() {
-        return new BasicAuthData();
-    }
-
-    /**
-     * Create an instance of {@link MessageDestinationRefBinding }
-     */
-    public MessageDestinationRefBinding createMessageDestinationRefBinding() {
-        return new MessageDestinationRefBinding();
-    }
-
-    /**
-     * Create an instance of {@link AbstractAuthData }
-     */
-    public AbstractAuthData createAbstractAuthData() {
-        return new AbstractAuthData();
-    }
-
-    /**
-     * Create an instance of {@link Property }
-     */
-    public Property createProperty() {
-        return new Property();
-    }
-
-    /**
-     * Create an instance of {@link ResourceRefBinding }
-     */
-    public ResourceRefBinding createResourceRefBinding() {
-        return new ResourceRefBinding();
-    }
-
-    /**
-     * Create an instance of {@link EjbRefBinding }
-     */
-    public EjbRefBinding createEjbRefBinding() {
-        return new EjbRefBinding();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Property }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "commonbnd.xmi", name = "Property")
-    public JAXBElement<Property> createProperty(final Property value) {
-        return new JAXBElement<Property>(_Property_QNAME, Property.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link AbstractAuthData }{@code >}
-     */
-    @XmlElementDecl(namespace = "commonbnd.xmi", name = "AbstractAuthData")
-    public JAXBElement<AbstractAuthData> createAbstractAuthData(
-        final AbstractAuthData value) {
-        return new JAXBElement<AbstractAuthData>(_AbstractAuthData_QNAME,
-            AbstractAuthData.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link ResourceEnvRefBinding }{@code >}
-     */
-    @XmlElementDecl(namespace = "commonbnd.xmi", name = "ResourceEnvRefBinding")
-    public JAXBElement<ResourceEnvRefBinding> createResourceEnvRefBinding(
-        final ResourceEnvRefBinding value) {
-        return new JAXBElement<ResourceEnvRefBinding>(
-            _ResourceEnvRefBinding_QNAME, ResourceEnvRefBinding.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link ResourceRefBinding }{@code >}
-     */
-    @XmlElementDecl(namespace = "commonbnd.xmi", name = "ResourceRefBinding")
-    public JAXBElement<ResourceRefBinding> createResourceRefBinding(
-        final ResourceRefBinding value) {
-        return new JAXBElement<ResourceRefBinding>(_ResourceRefBinding_QNAME,
-            ResourceRefBinding.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BasicAuthData }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "commonbnd.xmi", name = "BasicAuthData")
-    public JAXBElement<BasicAuthData> createBasicAuthData(final BasicAuthData value) {
-        return new JAXBElement<BasicAuthData>(_BasicAuthData_QNAME,
-            BasicAuthData.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link MessageDestinationRefBinding }{@code >}
-     */
-    @XmlElementDecl(namespace = "commonbnd.xmi", name = "MessageDestinationRefBinding")
-    public JAXBElement<MessageDestinationRefBinding> createMessageDestinationRefBinding(
-        final MessageDestinationRefBinding value) {
-        return new JAXBElement<MessageDestinationRefBinding>(
-            _MessageDestinationRefBinding_QNAME,
-            MessageDestinationRefBinding.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EjbRefBinding }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "commonbnd.xmi", name = "EjbRefBinding")
-    public JAXBElement<EjbRefBinding> createEjbRefBinding(final EjbRefBinding value) {
-        return new JAXBElement<EjbRefBinding>(_EjbRefBinding_QNAME,
-            EjbRefBinding.class, null, 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.was.v6.commonbnd;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the org.apache.openejb.jee.was.v6.commonbnd
+ * package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _Property_QNAME = new QName("commonbnd.xmi",
+        "Property");
+    private final static QName _AbstractAuthData_QNAME = new QName(
+        "commonbnd.xmi", "AbstractAuthData");
+    private final static QName _ResourceEnvRefBinding_QNAME = new QName(
+        "commonbnd.xmi", "ResourceEnvRefBinding");
+    private final static QName _ResourceRefBinding_QNAME = new QName(
+        "commonbnd.xmi", "ResourceRefBinding");
+    private final static QName _BasicAuthData_QNAME = new QName(
+        "commonbnd.xmi", "BasicAuthData");
+    private final static QName _MessageDestinationRefBinding_QNAME = new QName(
+        "commonbnd.xmi", "MessageDestinationRefBinding");
+    private final static QName _EjbRefBinding_QNAME = new QName(
+        "commonbnd.xmi", "EjbRefBinding");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package:
+     * org.apache.openejb.jee.was.v6.commonbnd
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ResourceEnvRefBinding }
+     */
+    public ResourceEnvRefBinding createResourceEnvRefBinding() {
+        return new ResourceEnvRefBinding();
+    }
+
+    /**
+     * Create an instance of {@link BasicAuthData }
+     */
+    public BasicAuthData createBasicAuthData() {
+        return new BasicAuthData();
+    }
+
+    /**
+     * Create an instance of {@link MessageDestinationRefBinding }
+     */
+    public MessageDestinationRefBinding createMessageDestinationRefBinding() {
+        return new MessageDestinationRefBinding();
+    }
+
+    /**
+     * Create an instance of {@link AbstractAuthData }
+     */
+    public AbstractAuthData createAbstractAuthData() {
+        return new AbstractAuthData();
+    }
+
+    /**
+     * Create an instance of {@link Property }
+     */
+    public Property createProperty() {
+        return new Property();
+    }
+
+    /**
+     * Create an instance of {@link ResourceRefBinding }
+     */
+    public ResourceRefBinding createResourceRefBinding() {
+        return new ResourceRefBinding();
+    }
+
+    /**
+     * Create an instance of {@link EjbRefBinding }
+     */
+    public EjbRefBinding createEjbRefBinding() {
+        return new EjbRefBinding();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Property }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "commonbnd.xmi", name = "Property")
+    public JAXBElement<Property> createProperty(final Property value) {
+        return new JAXBElement<Property>(_Property_QNAME, Property.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link AbstractAuthData }{@code >}
+     */
+    @XmlElementDecl(namespace = "commonbnd.xmi", name = "AbstractAuthData")
+    public JAXBElement<AbstractAuthData> createAbstractAuthData(
+        final AbstractAuthData value) {
+        return new JAXBElement<AbstractAuthData>(_AbstractAuthData_QNAME,
+            AbstractAuthData.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link ResourceEnvRefBinding }{@code >}
+     */
+    @XmlElementDecl(namespace = "commonbnd.xmi", name = "ResourceEnvRefBinding")
+    public JAXBElement<ResourceEnvRefBinding> createResourceEnvRefBinding(
+        final ResourceEnvRefBinding value) {
+        return new JAXBElement<ResourceEnvRefBinding>(
+            _ResourceEnvRefBinding_QNAME, ResourceEnvRefBinding.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link ResourceRefBinding }{@code >}
+     */
+    @XmlElementDecl(namespace = "commonbnd.xmi", name = "ResourceRefBinding")
+    public JAXBElement<ResourceRefBinding> createResourceRefBinding(
+        final ResourceRefBinding value) {
+        return new JAXBElement<ResourceRefBinding>(_ResourceRefBinding_QNAME,
+            ResourceRefBinding.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link BasicAuthData }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "commonbnd.xmi", name = "BasicAuthData")
+    public JAXBElement<BasicAuthData> createBasicAuthData(final BasicAuthData value) {
+        return new JAXBElement<BasicAuthData>(_BasicAuthData_QNAME,
+            BasicAuthData.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link MessageDestinationRefBinding }{@code >}
+     */
+    @XmlElementDecl(namespace = "commonbnd.xmi", name = "MessageDestinationRefBinding")
+    public JAXBElement<MessageDestinationRefBinding> createMessageDestinationRefBinding(
+        final MessageDestinationRefBinding value) {
+        return new JAXBElement<MessageDestinationRefBinding>(
+            _MessageDestinationRefBinding_QNAME,
+            MessageDestinationRefBinding.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EjbRefBinding }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "commonbnd.xmi", name = "EjbRefBinding")
+    public JAXBElement<EjbRefBinding> createEjbRefBinding(final EjbRefBinding value) {
+        return new JAXBElement<EjbRefBinding>(_EjbRefBinding_QNAME,
+            EjbRefBinding.class, null, value);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java
index 1ce3275..988808b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java
@@ -1,301 +1,301 @@
-/**
- * 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.was.v6.commonbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for Property complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Property">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Property", propOrder = {"extensions"})
-public class Property {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected String value;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = 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 value property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setValue(final String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.commonbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for Property complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Property">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Property", propOrder = {"extensions"})
+public class Property {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String value;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = 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 value property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}


[39/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java
index faff63e..a07726e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java
@@ -1,321 +1,321 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for QName complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="QName">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="combinedQName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="internalPrefixOrNsURI" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="localPart" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="namespaceURI" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "QName", propOrder = {"extensions"})
-public class QName {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String combinedQName;
-    @XmlAttribute
-    protected String internalPrefixOrNsURI;
-    @XmlAttribute
-    protected String localPart;
-    @XmlAttribute
-    protected String namespaceURI;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected javax.xml.namespace.QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the combinedQName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getCombinedQName() {
-        return combinedQName;
-    }
-
-    /**
-     * Sets the value of the combinedQName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setCombinedQName(final String value) {
-        this.combinedQName = value;
-    }
-
-    /**
-     * Gets the value of the internalPrefixOrNsURI property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getInternalPrefixOrNsURI() {
-        return internalPrefixOrNsURI;
-    }
-
-    /**
-     * Sets the value of the internalPrefixOrNsURI property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setInternalPrefixOrNsURI(final String value) {
-        this.internalPrefixOrNsURI = value;
-    }
-
-    /**
-     * Gets the value of the localPart property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLocalPart() {
-        return localPart;
-    }
-
-    /**
-     * Sets the value of the localPart property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLocalPart(final String value) {
-        this.localPart = value;
-    }
-
-    /**
-     * Gets the value of the namespaceURI property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getNamespaceURI() {
-        return namespaceURI;
-    }
-
-    /**
-     * Sets the value of the namespaceURI property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setNamespaceURI(final String value) {
-        this.namespaceURI = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link javax.xml.namespace.QName }
-     */
-    public javax.xml.namespace.QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link javax.xml.namespace.QName }
-     */
-    public void setType(final javax.xml.namespace.QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for QName complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="QName">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="combinedQName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="internalPrefixOrNsURI" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="localPart" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="namespaceURI" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "QName", propOrder = {"extensions"})
+public class QName {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String combinedQName;
+    @XmlAttribute
+    protected String internalPrefixOrNsURI;
+    @XmlAttribute
+    protected String localPart;
+    @XmlAttribute
+    protected String namespaceURI;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected javax.xml.namespace.QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the combinedQName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getCombinedQName() {
+        return combinedQName;
+    }
+
+    /**
+     * Sets the value of the combinedQName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setCombinedQName(final String value) {
+        this.combinedQName = value;
+    }
+
+    /**
+     * Gets the value of the internalPrefixOrNsURI property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getInternalPrefixOrNsURI() {
+        return internalPrefixOrNsURI;
+    }
+
+    /**
+     * Sets the value of the internalPrefixOrNsURI property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setInternalPrefixOrNsURI(final String value) {
+        this.internalPrefixOrNsURI = value;
+    }
+
+    /**
+     * Gets the value of the localPart property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLocalPart() {
+        return localPart;
+    }
+
+    /**
+     * Sets the value of the localPart property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLocalPart(final String value) {
+        this.localPart = value;
+    }
+
+    /**
+     * Gets the value of the namespaceURI property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getNamespaceURI() {
+        return namespaceURI;
+    }
+
+    /**
+     * Sets the value of the namespaceURI property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setNamespaceURI(final String value) {
+        this.namespaceURI = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link javax.xml.namespace.QName }
+     */
+    public javax.xml.namespace.QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link javax.xml.namespace.QName }
+     */
+    public void setType(final javax.xml.namespace.QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResAuthEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResAuthEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResAuthEnum.java
index e3353f9..fa37177 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResAuthEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResAuthEnum.java
@@ -1,66 +1,66 @@
-/**
- * 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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for ResAuthTypeBase.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="ResAuthTypeBase">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Container"/>
- *     &lt;enumeration value="Application"/>
- *     &lt;enumeration value="SERVLET"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum ResAuthEnum {
-
-    @XmlEnumValue("Container")
-    CONTAINER("Container"), @XmlEnumValue("Application")
-    APPLICATION("Application"), SERVLET("SERVLET");
-    private final String value;
-
-    ResAuthEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static ResAuthEnum fromValue(final String v) {
-        for (final ResAuthEnum c : ResAuthEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for ResAuthTypeBase.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="ResAuthTypeBase">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Container"/>
+ *     &lt;enumeration value="Application"/>
+ *     &lt;enumeration value="SERVLET"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum ResAuthEnum {
+
+    @XmlEnumValue("Container")
+    CONTAINER("Container"), @XmlEnumValue("Application")
+    APPLICATION("Application"), SERVLET("SERVLET");
+    private final String value;
+
+    ResAuthEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static ResAuthEnum fromValue(final String v) {
+        for (final ResAuthEnum c : ResAuthEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResSharingScopeEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResSharingScopeEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResSharingScopeEnum.java
index 0a77cbe..3f21846 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResSharingScopeEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResSharingScopeEnum.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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for ResSharingScopeType.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="ResSharingScopeType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="Shareable"/>
- *     &lt;enumeration value="Unshareable"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum ResSharingScopeEnum {
-
-    @XmlEnumValue("Shareable")
-    SHAREABLE("Shareable"), @XmlEnumValue("Unshareable")
-    UNSHAREABLE("Unshareable");
-    private final String value;
-
-    ResSharingScopeEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static ResSharingScopeEnum fromValue(final String v) {
-        for (final ResSharingScopeEnum c : ResSharingScopeEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for ResSharingScopeType.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="ResSharingScopeType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="Shareable"/>
+ *     &lt;enumeration value="Unshareable"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum ResSharingScopeEnum {
+
+    @XmlEnumValue("Shareable")
+    SHAREABLE("Shareable"), @XmlEnumValue("Unshareable")
+    UNSHAREABLE("Unshareable");
+    private final String value;
+
+    ResSharingScopeEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static ResSharingScopeEnum fromValue(final String v) {
+        for (final ResSharingScopeEnum c : ResSharingScopeEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java
index 2c58be6..8f7caa3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java
@@ -1,396 +1,396 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.java.JavaClass;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The resource-env-refType is used to define resource-env-type elements. It
- * contains a declaration of a Deployment Component's reference to an
- * administered object associated with a resource in the Deployment Component's
- * environment. It consists of an optional description, the resource environment
- * reference name, and an indication of the resource environment reference type
- * expected by the Deployment Component code.
- * <p/>
- * Example:
- * <p/>
- * <p/>
- * <pre>
- * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;resource-env-ref xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;resource-env-ref-name&gt;
- *
- * 						jms/StockQueue
- *
- * 					&lt;/resource-env-ref-name&gt;&lt;resource-env-ref-type&gt;
- *
- * 						javax.jms.Queue
- *
- * 					&lt;/resource-env-ref-type&gt;
- *
- * 				&lt;/resource-env-ref&gt;
- * </pre>
- * <p/>
- * <p/>
- * <p/>
- * <p/>
- * Java class for ResourceEnvRef complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ResourceEnvRef">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="type" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ResourceEnvRef", propOrder = {"resourceEnvRefTypes",
-    "descriptions", "extensions"})
-public class ResourceEnvRef {
-
-    @XmlElement(name = "type")
-    protected List<JavaClass> resourceEnvRefTypes;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute(name = "type")
-    protected String resourceEnvRefTypeString;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the resourceEnvRefTypes 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 resourceEnvRefTypes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getResourceEnvRefTypes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getResourceEnvRefTypes() {
-        if (resourceEnvRefTypes == null) {
-            resourceEnvRefTypes = new ArrayList<JavaClass>();
-        }
-        return this.resourceEnvRefTypes;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = 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 resourceEnvRefTypeString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getResourceEnvRefTypeString() {
-        return resourceEnvRefTypeString;
-    }
-
-    /**
-     * Sets the value of the resourceEnvRefTypeString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setResourceEnvRefTypeString(final String value) {
-        this.resourceEnvRefTypeString = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.java.JavaClass;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The resource-env-refType is used to define resource-env-type elements. It
+ * contains a declaration of a Deployment Component's reference to an
+ * administered object associated with a resource in the Deployment Component's
+ * environment. It consists of an optional description, the resource environment
+ * reference name, and an indication of the resource environment reference type
+ * expected by the Deployment Component code.
+ * <p/>
+ * Example:
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;resource-env-ref xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;resource-env-ref-name&gt;
+ *
+ * 						jms/StockQueue
+ *
+ * 					&lt;/resource-env-ref-name&gt;&lt;resource-env-ref-type&gt;
+ *
+ * 						javax.jms.Queue
+ *
+ * 					&lt;/resource-env-ref-type&gt;
+ *
+ * 				&lt;/resource-env-ref&gt;
+ * </pre>
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for ResourceEnvRef complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ResourceEnvRef">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="type" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ResourceEnvRef", propOrder = {"resourceEnvRefTypes",
+    "descriptions", "extensions"})
+public class ResourceEnvRef {
+
+    @XmlElement(name = "type")
+    protected List<JavaClass> resourceEnvRefTypes;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute(name = "type")
+    protected String resourceEnvRefTypeString;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the resourceEnvRefTypes 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 resourceEnvRefTypes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getResourceEnvRefTypes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getResourceEnvRefTypes() {
+        if (resourceEnvRefTypes == null) {
+            resourceEnvRefTypes = new ArrayList<JavaClass>();
+        }
+        return this.resourceEnvRefTypes;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = 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 resourceEnvRefTypeString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getResourceEnvRefTypeString() {
+        return resourceEnvRefTypeString;
+    }
+
+    /**
+     * Sets the value of the resourceEnvRefTypeString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setResourceEnvRefTypeString(final String value) {
+        this.resourceEnvRefTypeString = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java
index 8183cf1..729e795 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java
@@ -1,417 +1,417 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The resource-refType contains a declaration of a Deployment Component's
- * reference to an external resource. It consists of an optional description,
- * the resource manager connection factory reference name, the indication of the
- * resource manager connection factory type expected by the Deployment Component
- * code, the type of authentication (Application or Container), and an optional
- * specification of the shareability of connections obtained from the resource
- * (Shareable or Unshareable).
- * <p/>
- * Example:
- * <p/>
- * <p/>
- * <pre>
- * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;resource-ref xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;res-ref-name&gt;jdbc/EmployeeAppDB&lt;/res-ref-name&gt;&lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;&lt;res-auth&gt;Container&lt;/res-auth&gt;&lt;res-sharing-scope&gt;Shareable&lt;/res-sharing-scope&gt;
- *
- * 				&lt;/resource-ref&gt;
- * </pre>
- * <p/>
- * <p/>
- * <p/>
- * <p/>
- * Java class for ResourceRef complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ResourceRef">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="auth" type="{common.xmi}ResAuthTypeBase" />
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="resSharingScope" type="{common.xmi}ResSharingScopeType" />
- *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ResourceRef", propOrder = {"descriptions", "extensions"})
-public class ResourceRef {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected ResAuthEnum auth;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String link;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected ResSharingScopeEnum resSharingScope;
-    @XmlAttribute(name = "type")
-    protected String resourceRefTypeString;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the auth property.
-     *
-     * @return possible object is {@link ResAuthEnum }
-     */
-    public ResAuthEnum getAuth() {
-        return auth;
-    }
-
-    /**
-     * Sets the value of the auth property.
-     *
-     * @param value allowed object is {@link ResAuthEnum }
-     */
-    public void setAuth(final ResAuthEnum value) {
-        this.auth = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the link property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLink() {
-        return link;
-    }
-
-    /**
-     * Sets the value of the link property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLink(final String value) {
-        this.link = 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 resSharingScope property.
-     *
-     * @return possible object is {@link ResSharingScopeEnum }
-     */
-    public ResSharingScopeEnum getResSharingScope() {
-        return resSharingScope;
-    }
-
-    /**
-     * Sets the value of the resSharingScope property.
-     *
-     * @param value allowed object is {@link ResSharingScopeEnum }
-     */
-    public void setResSharingScope(final ResSharingScopeEnum value) {
-        this.resSharingScope = value;
-    }
-
-    /**
-     * Gets the value of the resourceRefTypeString property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getResourceRefTypeString() {
-        return resourceRefTypeString;
-    }
-
-    /**
-     * Sets the value of the resourceRefTypeString property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setResourceRefTypeString(final String value) {
-        this.resourceRefTypeString = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The resource-refType contains a declaration of a Deployment Component's
+ * reference to an external resource. It consists of an optional description,
+ * the resource manager connection factory reference name, the indication of the
+ * resource manager connection factory type expected by the Deployment Component
+ * code, the type of authentication (Application or Container), and an optional
+ * specification of the shareability of connections obtained from the resource
+ * (Shareable or Unshareable).
+ * <p/>
+ * Example:
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;resource-ref xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;res-ref-name&gt;jdbc/EmployeeAppDB&lt;/res-ref-name&gt;&lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;&lt;res-auth&gt;Container&lt;/res-auth&gt;&lt;res-sharing-scope&gt;Shareable&lt;/res-sharing-scope&gt;
+ *
+ * 				&lt;/resource-ref&gt;
+ * </pre>
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for ResourceRef complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ResourceRef">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="auth" type="{common.xmi}ResAuthTypeBase" />
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="resSharingScope" type="{common.xmi}ResSharingScopeType" />
+ *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ResourceRef", propOrder = {"descriptions", "extensions"})
+public class ResourceRef {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected ResAuthEnum auth;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String link;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected ResSharingScopeEnum resSharingScope;
+    @XmlAttribute(name = "type")
+    protected String resourceRefTypeString;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the auth property.
+     *
+     * @return possible object is {@link ResAuthEnum }
+     */
+    public ResAuthEnum getAuth() {
+        return auth;
+    }
+
+    /**
+     * Sets the value of the auth property.
+     *
+     * @param value allowed object is {@link ResAuthEnum }
+     */
+    public void setAuth(final ResAuthEnum value) {
+        this.auth = value;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the link property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLink() {
+        return link;
+    }
+
+    /**
+     * Sets the value of the link property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLink(final String value) {
+        this.link = 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 resSharingScope property.
+     *
+     * @return possible object is {@link ResSharingScopeEnum }
+     */
+    public ResSharingScopeEnum getResSharingScope() {
+        return resSharingScope;
+    }
+
+    /**
+     * Sets the value of the resSharingScope property.
+     *
+     * @param value allowed object is {@link ResSharingScopeEnum }
+     */
+    public void setResSharingScope(final ResSharingScopeEnum value) {
+        this.resSharingScope = value;
+    }
+
+    /**
+     * Gets the value of the resourceRefTypeString property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getResourceRefTypeString() {
+        return resourceRefTypeString;
+    }
+
+    /**
+     * Sets the value of the resourceRefTypeString property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setResourceRefTypeString(final String value) {
+        this.resourceRefTypeString = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/RunAsSpecifiedIdentity.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/RunAsSpecifiedIdentity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/RunAsSpecifiedIdentity.java
index bf8ca71..59bac08 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/RunAsSpecifiedIdentity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/RunAsSpecifiedIdentity.java
@@ -1,86 +1,86 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The security-identity element specifies whether the caller's security
- * identity is to be used for the execution of the methods of the enterprise
- * bean or whether a specific run-as identity is to be used. It contains an
- * optional description and a specification of the security identity to be used.
- * <p/>
- * <p/>
- * <p/>
- * Java class for RunAsSpecifiedIdentity complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="RunAsSpecifiedIdentity">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}SecurityIdentity">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="identity" type="{common.xmi}Identity"/>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RunAsSpecifiedIdentity", propOrder = {"identities"})
-public class RunAsSpecifiedIdentity extends SecurityIdentity {
-
-    @XmlElement(name = "identity")
-    protected List<Identity> identities;
-
-    /**
-     * Gets the value of the identities 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 identities property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getIdentities().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Identity }
-     */
-    public List<Identity> getIdentities() {
-        if (identities == null) {
-            identities = new ArrayList<Identity>();
-        }
-        return this.identities;
-    }
-
-}
+/**
+ * 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * The security-identity element specifies whether the caller's security
+ * identity is to be used for the execution of the methods of the enterprise
+ * bean or whether a specific run-as identity is to be used. It contains an
+ * optional description and a specification of the security identity to be used.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for RunAsSpecifiedIdentity complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="RunAsSpecifiedIdentity">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}SecurityIdentity">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="identity" type="{common.xmi}Identity"/>
+ *       &lt;/choice>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "RunAsSpecifiedIdentity", propOrder = {"identities"})
+public class RunAsSpecifiedIdentity extends SecurityIdentity {
+
+    @XmlElement(name = "identity")
+    protected List<Identity> identities;
+
+    /**
+     * Gets the value of the identities 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 identities property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getIdentities().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Identity }
+     */
+    public List<Identity> getIdentities() {
+        if (identities == null) {
+            identities = new ArrayList<Identity>();
+        }
+        return this.identities;
+    }
+
+}


[11/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java b/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java
index 60cb575..b55ba85 100644
--- a/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java
+++ b/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java
@@ -1,180 +1,180 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.Locale;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FriendlyPersonTest extends TestCase {
-
-    private Context context;
-
-    protected void setUp() throws Exception {
-        context = EJBContainer.createEJBContainer().getContext();
-    }
-
-    /**
-     * Here we lookup and test the FriendlyPerson bean via its EJB 2.1 EJBHome and EJBObject interfaces
-     *
-     * @throws Exception
-     */
-    //START SNIPPET: remotehome
-    public void testEjbHomeAndEjbObject() throws Exception {
-        Object object = context.lookup("java:global/component-interfaces/FriendlyPerson!org.superbiz.FriendlyPersonEjbHome");
-        FriendlyPersonEjbHome home = (FriendlyPersonEjbHome) object;
-        FriendlyPersonEjbObject friendlyPerson = home.create();
-
-        friendlyPerson.setDefaultLanguage("en");
-
-        assertEquals("Hello David!", friendlyPerson.greet("David"));
-        assertEquals("Hello Amelia!", friendlyPerson.greet("Amelia"));
-
-        friendlyPerson.setLanguagePreferences("Amelia", "es");
-
-        assertEquals("Hello David!", friendlyPerson.greet("David"));
-        assertEquals("Hola Amelia!", friendlyPerson.greet("Amelia"));
-
-        // Amelia took some French, let's see if she remembers
-        assertEquals("Bonjour Amelia!", friendlyPerson.greet("fr", "Amelia"));
-
-        // Dave should take some Polish and if he had, he could say Hi in Polish
-        assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
-
-        // Let's see if I speak Portuguese
-        assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
-
-        // Ok, well I've been meaning to learn, so...
-        friendlyPerson.addGreeting("pt", "Ola {0}!");
-
-        assertEquals("Ola David!", friendlyPerson.greet("pt", "David"));
-    }
-    //END SNIPPET: remotehome
-
-    /**
-     * Here we lookup and test the FriendlyPerson bean via its EJB 2.1 EJBLocalHome and EJBLocalObject interfaces
-     *
-     * @throws Exception
-     */
-    public void testEjbLocalHomeAndEjbLocalObject() throws Exception {
-        Object object = context.lookup("java:global/component-interfaces/FriendlyPerson!org.superbiz.FriendlyPersonEjbLocalHome");
-        FriendlyPersonEjbLocalHome home = (FriendlyPersonEjbLocalHome) object;
-        FriendlyPersonEjbLocalObject friendlyPerson = home.create();
-
-        friendlyPerson.setDefaultLanguage("en");
-
-        assertEquals("Hello David!", friendlyPerson.greet("David"));
-        assertEquals("Hello Amelia!", friendlyPerson.greet("Amelia"));
-
-        friendlyPerson.setLanguagePreferences("Amelia", "es");
-
-        assertEquals("Hello David!", friendlyPerson.greet("David"));
-        assertEquals("Hola Amelia!", friendlyPerson.greet("Amelia"));
-
-        // Amelia took some French, let's see if she remembers
-        assertEquals("Bonjour Amelia!", friendlyPerson.greet("fr", "Amelia"));
-
-        // Dave should take some Polish and if he had, he could say Hi in Polish
-        assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
-
-        // Let's see if I speak Portuguese
-        assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
-
-        // Ok, well I've been meaning to learn, so...
-        friendlyPerson.addGreeting("pt", "Ola {0}!");
-
-        assertEquals("Ola David!", friendlyPerson.greet("pt", "David"));
-    }
-
-    /**
-     * Here we lookup and test the FriendlyPerson bean via its EJB 3.0 business remote interface
-     *
-     * @throws Exception
-     */
-    //START SNIPPET: remote
-    public void testBusinessRemote() throws Exception {
-        Object object = context.lookup("java:global/component-interfaces/FriendlyPerson!org.superbiz.FriendlyPersonRemote");
-
-        FriendlyPersonRemote friendlyPerson = (FriendlyPersonRemote) object;
-
-        friendlyPerson.setDefaultLanguage("en");
-
-        assertEquals("Hello David!", friendlyPerson.greet("David"));
-        assertEquals("Hello Amelia!", friendlyPerson.greet("Amelia"));
-
-        friendlyPerson.setLanguagePreferences("Amelia", "es");
-
-        assertEquals("Hello David!", friendlyPerson.greet("David"));
-        assertEquals("Hola Amelia!", friendlyPerson.greet("Amelia"));
-
-        // Amelia took some French, let's see if she remembers
-        assertEquals("Bonjour Amelia!", friendlyPerson.greet("fr", "Amelia"));
-
-        // Dave should take some Polish and if he had, he could say Hi in Polish
-        assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
-
-        // Let's see if I speak Portuguese
-        assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
-
-        // Ok, well I've been meaning to learn, so...
-        friendlyPerson.addGreeting("pt", "Ola {0}!");
-
-        assertEquals("Ola David!", friendlyPerson.greet("pt", "David"));
-    }
-    //START SNIPPET: remote
-
-    /**
-     * Here we lookup and test the FriendlyPerson bean via its EJB 3.0 business local interface
-     *
-     * @throws Exception
-     */
-    public void testBusinessLocal() throws Exception {
-        Object object = context.lookup("java:global/component-interfaces/FriendlyPerson!org.superbiz.FriendlyPersonLocal");
-
-        FriendlyPersonLocal friendlyPerson = (FriendlyPersonLocal) object;
-
-        friendlyPerson.setDefaultLanguage("en");
-
-        assertEquals("Hello David!", friendlyPerson.greet("David"));
-        assertEquals("Hello Amelia!", friendlyPerson.greet("Amelia"));
-
-        friendlyPerson.setLanguagePreferences("Amelia", "es");
-
-        assertEquals("Hello David!", friendlyPerson.greet("David"));
-        assertEquals("Hola Amelia!", friendlyPerson.greet("Amelia"));
-
-        // Amelia took some French, let's see if she remembers
-        assertEquals("Bonjour Amelia!", friendlyPerson.greet("fr", "Amelia"));
-
-        // Dave should take some Polish and if he had, he could say Hi in Polish
-        assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
-
-        // Let's see if I speak Portuguese
-        assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
-
-        // Ok, well I've been meaning to learn, so...
-        friendlyPerson.addGreeting("pt", "Ola {0}!");
-
-        assertEquals("Ola David!", friendlyPerson.greet("pt", "David"));
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.Locale;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class FriendlyPersonTest extends TestCase {
+
+    private Context context;
+
+    protected void setUp() throws Exception {
+        context = EJBContainer.createEJBContainer().getContext();
+    }
+
+    /**
+     * Here we lookup and test the FriendlyPerson bean via its EJB 2.1 EJBHome and EJBObject interfaces
+     *
+     * @throws Exception
+     */
+    //START SNIPPET: remotehome
+    public void testEjbHomeAndEjbObject() throws Exception {
+        Object object = context.lookup("java:global/component-interfaces/FriendlyPerson!org.superbiz.FriendlyPersonEjbHome");
+        FriendlyPersonEjbHome home = (FriendlyPersonEjbHome) object;
+        FriendlyPersonEjbObject friendlyPerson = home.create();
+
+        friendlyPerson.setDefaultLanguage("en");
+
+        assertEquals("Hello David!", friendlyPerson.greet("David"));
+        assertEquals("Hello Amelia!", friendlyPerson.greet("Amelia"));
+
+        friendlyPerson.setLanguagePreferences("Amelia", "es");
+
+        assertEquals("Hello David!", friendlyPerson.greet("David"));
+        assertEquals("Hola Amelia!", friendlyPerson.greet("Amelia"));
+
+        // Amelia took some French, let's see if she remembers
+        assertEquals("Bonjour Amelia!", friendlyPerson.greet("fr", "Amelia"));
+
+        // Dave should take some Polish and if he had, he could say Hi in Polish
+        assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
+
+        // Let's see if I speak Portuguese
+        assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
+
+        // Ok, well I've been meaning to learn, so...
+        friendlyPerson.addGreeting("pt", "Ola {0}!");
+
+        assertEquals("Ola David!", friendlyPerson.greet("pt", "David"));
+    }
+    //END SNIPPET: remotehome
+
+    /**
+     * Here we lookup and test the FriendlyPerson bean via its EJB 2.1 EJBLocalHome and EJBLocalObject interfaces
+     *
+     * @throws Exception
+     */
+    public void testEjbLocalHomeAndEjbLocalObject() throws Exception {
+        Object object = context.lookup("java:global/component-interfaces/FriendlyPerson!org.superbiz.FriendlyPersonEjbLocalHome");
+        FriendlyPersonEjbLocalHome home = (FriendlyPersonEjbLocalHome) object;
+        FriendlyPersonEjbLocalObject friendlyPerson = home.create();
+
+        friendlyPerson.setDefaultLanguage("en");
+
+        assertEquals("Hello David!", friendlyPerson.greet("David"));
+        assertEquals("Hello Amelia!", friendlyPerson.greet("Amelia"));
+
+        friendlyPerson.setLanguagePreferences("Amelia", "es");
+
+        assertEquals("Hello David!", friendlyPerson.greet("David"));
+        assertEquals("Hola Amelia!", friendlyPerson.greet("Amelia"));
+
+        // Amelia took some French, let's see if she remembers
+        assertEquals("Bonjour Amelia!", friendlyPerson.greet("fr", "Amelia"));
+
+        // Dave should take some Polish and if he had, he could say Hi in Polish
+        assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
+
+        // Let's see if I speak Portuguese
+        assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
+
+        // Ok, well I've been meaning to learn, so...
+        friendlyPerson.addGreeting("pt", "Ola {0}!");
+
+        assertEquals("Ola David!", friendlyPerson.greet("pt", "David"));
+    }
+
+    /**
+     * Here we lookup and test the FriendlyPerson bean via its EJB 3.0 business remote interface
+     *
+     * @throws Exception
+     */
+    //START SNIPPET: remote
+    public void testBusinessRemote() throws Exception {
+        Object object = context.lookup("java:global/component-interfaces/FriendlyPerson!org.superbiz.FriendlyPersonRemote");
+
+        FriendlyPersonRemote friendlyPerson = (FriendlyPersonRemote) object;
+
+        friendlyPerson.setDefaultLanguage("en");
+
+        assertEquals("Hello David!", friendlyPerson.greet("David"));
+        assertEquals("Hello Amelia!", friendlyPerson.greet("Amelia"));
+
+        friendlyPerson.setLanguagePreferences("Amelia", "es");
+
+        assertEquals("Hello David!", friendlyPerson.greet("David"));
+        assertEquals("Hola Amelia!", friendlyPerson.greet("Amelia"));
+
+        // Amelia took some French, let's see if she remembers
+        assertEquals("Bonjour Amelia!", friendlyPerson.greet("fr", "Amelia"));
+
+        // Dave should take some Polish and if he had, he could say Hi in Polish
+        assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
+
+        // Let's see if I speak Portuguese
+        assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
+
+        // Ok, well I've been meaning to learn, so...
+        friendlyPerson.addGreeting("pt", "Ola {0}!");
+
+        assertEquals("Ola David!", friendlyPerson.greet("pt", "David"));
+    }
+    //START SNIPPET: remote
+
+    /**
+     * Here we lookup and test the FriendlyPerson bean via its EJB 3.0 business local interface
+     *
+     * @throws Exception
+     */
+    public void testBusinessLocal() throws Exception {
+        Object object = context.lookup("java:global/component-interfaces/FriendlyPerson!org.superbiz.FriendlyPersonLocal");
+
+        FriendlyPersonLocal friendlyPerson = (FriendlyPersonLocal) object;
+
+        friendlyPerson.setDefaultLanguage("en");
+
+        assertEquals("Hello David!", friendlyPerson.greet("David"));
+        assertEquals("Hello Amelia!", friendlyPerson.greet("Amelia"));
+
+        friendlyPerson.setLanguagePreferences("Amelia", "es");
+
+        assertEquals("Hello David!", friendlyPerson.greet("David"));
+        assertEquals("Hola Amelia!", friendlyPerson.greet("Amelia"));
+
+        // Amelia took some French, let's see if she remembers
+        assertEquals("Bonjour Amelia!", friendlyPerson.greet("fr", "Amelia"));
+
+        // Dave should take some Polish and if he had, he could say Hi in Polish
+        assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
+
+        // Let's see if I speak Portuguese
+        assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
+
+        // Ok, well I've been meaning to learn, so...
+        friendlyPerson.addGreeting("pt", "Ola {0}!");
+
+        assertEquals("Ola David!", friendlyPerson.greet("pt", "David"));
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/CucumberTest.java
----------------------------------------------------------------------
diff --git a/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/CucumberTest.java b/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/CucumberTest.java
index f4abf95..511a2d0 100644
--- a/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/CucumberTest.java
+++ b/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/CucumberTest.java
@@ -1,25 +1,25 @@
-/*
- * 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.superbiz.cucumber;
-
-import cucumber.api.junit.Cucumber;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-public class CucumberTest {
-    // the suite, will load automatically the features
-}
+/*
+ * 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.superbiz.cucumber;
+
+import cucumber.api.junit.Cucumber;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+public class CucumberTest {
+    // the suite, will load automatically the features
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/HelloStepDef.java
----------------------------------------------------------------------
diff --git a/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/HelloStepDef.java b/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/HelloStepDef.java
index b27e3a7..d082e15 100644
--- a/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/HelloStepDef.java
+++ b/examples/cucumber-jvm/src/test/java/org/superbiz/cucumber/HelloStepDef.java
@@ -1,42 +1,42 @@
-/*
- * 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.superbiz.cucumber;
-
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-
-import javax.inject.Inject;
-
-import static org.junit.Assert.assertEquals;
-
-public class HelloStepDef {
-
-    @Inject
-    private Hello hello;
-
-    private String name;
-
-    @Given("^A name '([a-z]*)'$")
-    public void initName(final String name) {
-        this.name = name;
-    }
-
-    @Then("^The bean says '([ a-z]*)'$")
-    public void checkResult(final String result) {
-        assertEquals(result, hello.hello(name));
-    }
-}
+/*
+ * 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.superbiz.cucumber;
+
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.Then;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertEquals;
+
+public class HelloStepDef {
+
+    @Inject
+    private Hello hello;
+
+    private String name;
+
+    @Given("^A name '([a-z]*)'$")
+    public void initName(final String name) {
+        this.name = name;
+    }
+
+    @Then("^The bean says '([ a-z]*)'$")
+    public void checkResult(final String result) {
+        assertEquals(result, hello.hello(name));
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/custom-injection/src/main/java/org/superbiz/enventries/Pickup.java
----------------------------------------------------------------------
diff --git a/examples/custom-injection/src/main/java/org/superbiz/enventries/Pickup.java b/examples/custom-injection/src/main/java/org/superbiz/enventries/Pickup.java
index b33dd5a..87668f2 100644
--- a/examples/custom-injection/src/main/java/org/superbiz/enventries/Pickup.java
+++ b/examples/custom-injection/src/main/java/org/superbiz/enventries/Pickup.java
@@ -1,35 +1,35 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.enventries;
-
-//START SNIPPET: code
-
-import java.beans.PropertyEditorManager;
-
-public enum Pickup {
-
-    HUMBUCKER,
-    SINGLE_COIL;
-
-    // Here's the little magic where we register the PickupEditor
-    // which knows how to create this object from a string.
-    // You can add any of your own Property Editors in the same way.
-    static {
-        PropertyEditorManager.registerEditor(Pickup.class, PickupEditor.class);
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.enventries;
+
+//START SNIPPET: code
+
+import java.beans.PropertyEditorManager;
+
+public enum Pickup {
+
+    HUMBUCKER,
+    SINGLE_COIL;
+
+    // Here's the little magic where we register the PickupEditor
+    // which knows how to create this object from a string.
+    // You can add any of your own Property Editors in the same way.
+    static {
+        PropertyEditorManager.registerEditor(Pickup.class, PickupEditor.class);
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/custom-injection/src/main/java/org/superbiz/enventries/PickupEditor.java
----------------------------------------------------------------------
diff --git a/examples/custom-injection/src/main/java/org/superbiz/enventries/PickupEditor.java b/examples/custom-injection/src/main/java/org/superbiz/enventries/PickupEditor.java
index 808cfe2..af6062b 100644
--- a/examples/custom-injection/src/main/java/org/superbiz/enventries/PickupEditor.java
+++ b/examples/custom-injection/src/main/java/org/superbiz/enventries/PickupEditor.java
@@ -1,45 +1,45 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.enventries;
-
-/**
- * With a java.beans.PropertyEditor, you can go way beyond the built-in
- * types that OpenEJB supports and can extend dependency injection to
- * just about anywhere.
- * <p/>
- * In the world of electric guitars, two types of pickups are used: humbucking, and single-coil.
- * Guitarists often refer to their guitars as HSS, meaning a guitar with 1 humbucker and
- * 2 single coil pickups, and so on.  This little PropertyEditor supports that shorthand notation.
- *
- * @version $Revision$ $Date$
- */
-//START SNIPPET: code
-public class PickupEditor extends java.beans.PropertyEditorSupport {
-
-    public void setAsText(String text) throws IllegalArgumentException {
-        text = text.trim();
-
-        if (text.equalsIgnoreCase("H")) {
-            setValue(Pickup.HUMBUCKER);
-        } else if (text.equalsIgnoreCase("S")) {
-            setValue(Pickup.SINGLE_COIL);
-        } else {
-            throw new IllegalStateException("H and S are the only supported Pickup aliases");
-        }
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.enventries;
+
+/**
+ * With a java.beans.PropertyEditor, you can go way beyond the built-in
+ * types that OpenEJB supports and can extend dependency injection to
+ * just about anywhere.
+ * <p/>
+ * In the world of electric guitars, two types of pickups are used: humbucking, and single-coil.
+ * Guitarists often refer to their guitars as HSS, meaning a guitar with 1 humbucker and
+ * 2 single coil pickups, and so on.  This little PropertyEditor supports that shorthand notation.
+ *
+ * @version $Revision$ $Date$
+ */
+//START SNIPPET: code
+public class PickupEditor extends java.beans.PropertyEditorSupport {
+
+    public void setAsText(String text) throws IllegalArgumentException {
+        text = text.trim();
+
+        if (text.equalsIgnoreCase("H")) {
+            setValue(Pickup.HUMBUCKER);
+        } else if (text.equalsIgnoreCase("S")) {
+            setValue(Pickup.SINGLE_COIL);
+        } else {
+            throw new IllegalStateException("H and S are the only supported Pickup aliases");
+        }
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/custom-injection/src/main/java/org/superbiz/enventries/Stratocaster.java
----------------------------------------------------------------------
diff --git a/examples/custom-injection/src/main/java/org/superbiz/enventries/Stratocaster.java b/examples/custom-injection/src/main/java/org/superbiz/enventries/Stratocaster.java
index 95a2fcf..a60bba5 100644
--- a/examples/custom-injection/src/main/java/org/superbiz/enventries/Stratocaster.java
+++ b/examples/custom-injection/src/main/java/org/superbiz/enventries/Stratocaster.java
@@ -1,76 +1,76 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.enventries;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * In addition to the standard env-entry types (String, Integer, Long, Short, Byte, Boolean, Double, Float, Character)
- * OpenEJB supports many other types.
- */
-//START SNIPPET: code
-@Stateless
-public class Stratocaster {
-
-    @Resource(name = "pickups")
-    private List<Pickup> pickups;
-
-    @Resource(name = "style")
-    private Style style;
-
-    @Resource(name = "dateCreated")
-    private Date dateCreated;
-
-    @Resource(name = "guitarStringGuages")
-    private Map<String, Float> guitarStringGuages;
-
-    @Resource(name = "certificateOfAuthenticity")
-    private File certificateOfAuthenticity;
-
-    public Date getDateCreated() {
-        return dateCreated;
-    }
-
-    /**
-     * Gets the guage of the electric guitar strings
-     * used in this guitar.
-     *
-     * @param string
-     * @return
-     */
-    public float getStringGuage(String string) {
-        return guitarStringGuages.get(string);
-    }
-
-    public List<Pickup> getPickups() {
-        return pickups;
-    }
-
-    public Style getStyle() {
-        return style;
-    }
-
-    public File getCertificateOfAuthenticity() {
-        return certificateOfAuthenticity;
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.enventries;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * In addition to the standard env-entry types (String, Integer, Long, Short, Byte, Boolean, Double, Float, Character)
+ * OpenEJB supports many other types.
+ */
+//START SNIPPET: code
+@Stateless
+public class Stratocaster {
+
+    @Resource(name = "pickups")
+    private List<Pickup> pickups;
+
+    @Resource(name = "style")
+    private Style style;
+
+    @Resource(name = "dateCreated")
+    private Date dateCreated;
+
+    @Resource(name = "guitarStringGuages")
+    private Map<String, Float> guitarStringGuages;
+
+    @Resource(name = "certificateOfAuthenticity")
+    private File certificateOfAuthenticity;
+
+    public Date getDateCreated() {
+        return dateCreated;
+    }
+
+    /**
+     * Gets the guage of the electric guitar strings
+     * used in this guitar.
+     *
+     * @param string
+     * @return
+     */
+    public float getStringGuage(String string) {
+        return guitarStringGuages.get(string);
+    }
+
+    public List<Pickup> getPickups() {
+        return pickups;
+    }
+
+    public Style getStyle() {
+        return style;
+    }
+
+    public File getCertificateOfAuthenticity() {
+        return certificateOfAuthenticity;
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/custom-injection/src/main/java/org/superbiz/enventries/Style.java
----------------------------------------------------------------------
diff --git a/examples/custom-injection/src/main/java/org/superbiz/enventries/Style.java b/examples/custom-injection/src/main/java/org/superbiz/enventries/Style.java
index 57fc335..5e5919c 100644
--- a/examples/custom-injection/src/main/java/org/superbiz/enventries/Style.java
+++ b/examples/custom-injection/src/main/java/org/superbiz/enventries/Style.java
@@ -1,30 +1,30 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.enventries;
-
-/**
- * @version $Revision$ $Date$
- */
-//START SNIPPET: code
-public enum Style {
-
-    STANDARD,
-    DELUX,
-    VINTAGE;
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.enventries;
+
+/**
+ * @version $Revision$ $Date$
+ */
+//START SNIPPET: code
+public enum Style {
+
+    STANDARD,
+    DELUX,
+    VINTAGE;
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/custom-injection/src/test/java/org/superbiz/enventries/StratocasterTest.java
----------------------------------------------------------------------
diff --git a/examples/custom-injection/src/test/java/org/superbiz/enventries/StratocasterTest.java b/examples/custom-injection/src/test/java/org/superbiz/enventries/StratocasterTest.java
index 03822c6..81242ab 100644
--- a/examples/custom-injection/src/test/java/org/superbiz/enventries/StratocasterTest.java
+++ b/examples/custom-injection/src/test/java/org/superbiz/enventries/StratocasterTest.java
@@ -1,63 +1,63 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.enventries;
-
-import junit.framework.TestCase;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-import java.io.File;
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import static java.util.Arrays.asList;
-
-/**
- * @version $Rev$ $Date$
- */
-//START SNIPPET: code
-public class StratocasterTest extends TestCase {
-
-    @EJB
-    private Stratocaster strat;
-
-    public void test() throws Exception {
-        EJBContainer.createEJBContainer().getContext().bind("inject", this);
-
-        Date date = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US).parse("Mar 1, 1962");
-        assertEquals("Strat.getDateCreated()", date, strat.getDateCreated());
-
-        List<Pickup> pickups = asList(Pickup.SINGLE_COIL, Pickup.SINGLE_COIL, Pickup.SINGLE_COIL);
-        assertEquals("Strat.getPickups()", pickups, strat.getPickups());
-
-        assertEquals("Strat.getStyle()", Style.VINTAGE, strat.getStyle());
-
-        assertEquals("Strat.getStringGuage(\"E1\")", 0.052F, strat.getStringGuage("E1"), 1e-15);
-        assertEquals("Strat.getStringGuage(\"A\")", 0.042F, strat.getStringGuage("A"), 1e-15);
-        assertEquals("Strat.getStringGuage(\"D\")", 0.030F, strat.getStringGuage("D"), 1e-15);
-        assertEquals("Strat.getStringGuage(\"G\")", 0.017F, strat.getStringGuage("G"), 1e-15);
-        assertEquals("Strat.getStringGuage(\"B\")", 0.013F, strat.getStringGuage("B"), 1e-15);
-        assertEquals("Strat.getStringGuage(\"E\")", 0.010F, strat.getStringGuage("E"), 1e-15);
-
-        File file = new File("/tmp/strat-certificate.txt");
-        assertEquals("Strat.getCertificateOfAuthenticity()", file, strat.getCertificateOfAuthenticity());
-
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.enventries;
+
+import junit.framework.TestCase;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+import java.io.File;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import static java.util.Arrays.asList;
+
+/**
+ * @version $Rev$ $Date$
+ */
+//START SNIPPET: code
+public class StratocasterTest extends TestCase {
+
+    @EJB
+    private Stratocaster strat;
+
+    public void test() throws Exception {
+        EJBContainer.createEJBContainer().getContext().bind("inject", this);
+
+        Date date = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US).parse("Mar 1, 1962");
+        assertEquals("Strat.getDateCreated()", date, strat.getDateCreated());
+
+        List<Pickup> pickups = asList(Pickup.SINGLE_COIL, Pickup.SINGLE_COIL, Pickup.SINGLE_COIL);
+        assertEquals("Strat.getPickups()", pickups, strat.getPickups());
+
+        assertEquals("Strat.getStyle()", Style.VINTAGE, strat.getStyle());
+
+        assertEquals("Strat.getStringGuage(\"E1\")", 0.052F, strat.getStringGuage("E1"), 1e-15);
+        assertEquals("Strat.getStringGuage(\"A\")", 0.042F, strat.getStringGuage("A"), 1e-15);
+        assertEquals("Strat.getStringGuage(\"D\")", 0.030F, strat.getStringGuage("D"), 1e-15);
+        assertEquals("Strat.getStringGuage(\"G\")", 0.017F, strat.getStringGuage("G"), 1e-15);
+        assertEquals("Strat.getStringGuage(\"B\")", 0.013F, strat.getStringGuage("B"), 1e-15);
+        assertEquals("Strat.getStringGuage(\"E\")", 0.010F, strat.getStringGuage("E"), 1e-15);
+
+        File file = new File("/tmp/strat-certificate.txt");
+        assertEquals("Strat.getCertificateOfAuthenticity()", file, strat.getCertificateOfAuthenticity());
+
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java
----------------------------------------------------------------------
diff --git a/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java b/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java
index bd65da8..f8fd676 100644
--- a/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java
+++ b/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java
@@ -1,42 +1,42 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dsdef;
-
-import javax.annotation.Resource;
-import javax.annotation.sql.DataSourceDefinition;
-import javax.inject.Named;
-import javax.sql.DataSource;
-
-@DataSourceDefinition(transactional = true,
-        url = "jdbc:h2:mem:persister",
-        className = "org.h2.jdbcx.JdbcDataSource",
-        user = "sa",
-        password = "",
-        name = "java:app/jdbc/persister",
-        initialPoolSize = 1,
-        maxPoolSize = 3
-)
-@Named
-public class Persister {
-
-    @Resource(lookup = "java:app/jdbc/persister")
-    private DataSource ds;
-
-    public DataSource getDs() {
-        return ds;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dsdef;
+
+import javax.annotation.Resource;
+import javax.annotation.sql.DataSourceDefinition;
+import javax.inject.Named;
+import javax.sql.DataSource;
+
+@DataSourceDefinition(transactional = true,
+        url = "jdbc:h2:mem:persister",
+        className = "org.h2.jdbcx.JdbcDataSource",
+        user = "sa",
+        password = "",
+        name = "java:app/jdbc/persister",
+        initialPoolSize = 1,
+        maxPoolSize = 3
+)
+@Named
+public class Persister {
+
+    @Resource(lookup = "java:app/jdbc/persister")
+    private DataSource ds;
+
+    public DataSource getDs() {
+        return ds;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java
----------------------------------------------------------------------
diff --git a/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java b/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java
index aedc7ea..c323c51 100644
--- a/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java
+++ b/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java
@@ -1,110 +1,110 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.dsdef;
-
-import org.apache.openejb.resource.jdbc.dbcp.DbcpManagedDataSource;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.inject.Inject;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-public class DataSourceDefinitionTest {
-
-    private static EJBContainer container;
-
-    @Inject
-    private Persister persister;
-
-    @BeforeClass
-    public static void start() {
-        container = EJBContainer.createEJBContainer();
-    }
-
-    @Before
-    public void inject() throws NamingException {
-        container.getContext().bind("inject", this);
-    }
-
-    @AfterClass
-    public static void stop() {
-        container.close();
-    }
-
-    @Test
-    public void checkDs() throws SQLException {
-        final DataSource ds = persister.getDs();
-        assertNotNull(ds);
-        assertThat(ds, instanceOf(DbcpManagedDataSource.class));
-
-        final DbcpManagedDataSource castedDs = (DbcpManagedDataSource) ds;
-
-        final String driver = castedDs.getDriverClassName();
-        assertEquals("org.h2.jdbcx.JdbcDataSource", driver);
-
-        final String user = castedDs.getUserName();
-        assertEquals("sa", user);
-
-        final String url = castedDs.getUrl();
-        assertEquals("jdbc:h2:mem:persister", url);
-
-        final int initPoolSize = castedDs.getInitialSize();
-        assertEquals(1, initPoolSize);
-
-        final int maxIdle = castedDs.getMaxIdle();
-        assertEquals(3, maxIdle);
-
-        final Connection connection = ds.getConnection();
-        assertNotNull(connection);
-
-        execute(connection, "CREATE TABLE TEST(ID INT PRIMARY KEY, NAME VARCHAR(255))");
-        execute(connection, "INSERT INTO TEST(ID, NAME) VALUES(1, 'foo')");
-        connection.commit();
-
-        final PreparedStatement statement = ds.getConnection().prepareStatement("SELECT NAME FROM TEST");
-        statement.execute();
-        final ResultSet set = statement.getResultSet();
-
-        assertTrue(set.next());
-        assertEquals("foo", set.getString("NAME"));
-    }
-
-    @Test
-    public void lookup() throws NamingException {
-        final Object o = container.getContext().lookup("java:app/jdbc/persister");
-        assertNotNull(o);
-        assertEquals(persister.getDs(), o);
-    }
-
-    private void execute(final Connection connection, final String sql) throws SQLException {
-        connection.prepareStatement(sql).execute();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.dsdef;
+
+import org.apache.openejb.resource.jdbc.dbcp.DbcpManagedDataSource;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.inject.Inject;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class DataSourceDefinitionTest {
+
+    private static EJBContainer container;
+
+    @Inject
+    private Persister persister;
+
+    @BeforeClass
+    public static void start() {
+        container = EJBContainer.createEJBContainer();
+    }
+
+    @Before
+    public void inject() throws NamingException {
+        container.getContext().bind("inject", this);
+    }
+
+    @AfterClass
+    public static void stop() {
+        container.close();
+    }
+
+    @Test
+    public void checkDs() throws SQLException {
+        final DataSource ds = persister.getDs();
+        assertNotNull(ds);
+        assertThat(ds, instanceOf(DbcpManagedDataSource.class));
+
+        final DbcpManagedDataSource castedDs = (DbcpManagedDataSource) ds;
+
+        final String driver = castedDs.getDriverClassName();
+        assertEquals("org.h2.jdbcx.JdbcDataSource", driver);
+
+        final String user = castedDs.getUserName();
+        assertEquals("sa", user);
+
+        final String url = castedDs.getUrl();
+        assertEquals("jdbc:h2:mem:persister", url);
+
+        final int initPoolSize = castedDs.getInitialSize();
+        assertEquals(1, initPoolSize);
+
+        final int maxIdle = castedDs.getMaxIdle();
+        assertEquals(3, maxIdle);
+
+        final Connection connection = ds.getConnection();
+        assertNotNull(connection);
+
+        execute(connection, "CREATE TABLE TEST(ID INT PRIMARY KEY, NAME VARCHAR(255))");
+        execute(connection, "INSERT INTO TEST(ID, NAME) VALUES(1, 'foo')");
+        connection.commit();
+
+        final PreparedStatement statement = ds.getConnection().prepareStatement("SELECT NAME FROM TEST");
+        statement.execute();
+        final ResultSet set = statement.getResultSet();
+
+        assertTrue(set.next());
+        assertEquals("foo", set.getString("NAME"));
+    }
+
+    @Test
+    public void lookup() throws NamingException {
+        final Object o = container.getContext().lookup("java:app/jdbc/persister");
+        assertNotNull(o);
+        assertEquals(persister.getDs(), o);
+    }
+
+    private void execute(final Connection connection, final String sql) throws SQLException {
+        connection.prepareStatement(sql).execute();
+    }
+}


[25/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java
index 8e87390..7870e89 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java
@@ -1,571 +1,571 @@
-/**
- * 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.was.v6.ejbbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.commonbnd.EjbRefBinding;
-import org.apache.openejb.jee.was.v6.commonbnd.MessageDestinationRefBinding;
-import org.apache.openejb.jee.was.v6.commonbnd.ResourceEnvRefBinding;
-import org.apache.openejb.jee.was.v6.commonbnd.ResourceRefBinding;
-import org.apache.openejb.jee.was.v6.ejb.EnterpriseBean;
-import org.apache.openejb.jee.was.v6.webservice.clientbnd.ServiceRefBinding;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for EnterpriseBeanBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EnterpriseBeanBinding">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="enterpriseBean" type="{ejb.xmi}EnterpriseBean"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="datasource" type="{commonbnd.xmi}ResourceRefBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="resRefBindings" type="{commonbnd.xmi}ResourceRefBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="ejbRefBindings" type="{commonbnd.xmi}EjbRefBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="resourceEnvRefBindings" type="{commonbnd.xmi}ResourceEnvRefBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="cmpConnectionFactory" type="{ejbbnd.xmi}CMPConnectionFactoryBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="serviceRefBindings" type="{webservice_clientbnd.xmi}ServiceRefBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="messageDestinationRefBindings" type="{commonbnd.xmi}MessageDestinationRefBinding"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="ejbName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="enterpriseBean" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EnterpriseBeanBinding", propOrder = {"enterpriseBeans",
-    "datasources", "resRefBindings", "ejbRefBindings",
-    "resourceEnvRefBindings", "cmpConnectionFactories",
-    "serviceRefBindings", "messageDestinationRefBindings", "extensions"})
-public class EnterpriseBeanBinding {
-
-    @XmlElement(name = "enterpriseBean")
-    protected List<EnterpriseBean> enterpriseBeans;
-    @XmlElement(name = "datasource")
-    protected List<ResourceRefBinding> datasources;
-    protected List<ResourceRefBinding> resRefBindings;
-    protected List<EjbRefBinding> ejbRefBindings;
-    protected List<ResourceEnvRefBinding> resourceEnvRefBindings;
-    @XmlElement(name = "cmpConnectionFactory")
-    protected List<CMPConnectionFactoryBinding> cmpConnectionFactories;
-    protected List<ServiceRefBinding> serviceRefBindings;
-    protected List<MessageDestinationRefBinding> messageDestinationRefBindings;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String ejbName;
-    @XmlAttribute
-    protected String enterpriseBean;
-    @XmlAttribute
-    protected String jndiName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the enterpriseBeans 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 enterpriseBeans property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEnterpriseBeans().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EnterpriseBean }
-     */
-    public List<EnterpriseBean> getEnterpriseBeans() {
-        if (enterpriseBeans == null) {
-            enterpriseBeans = new ArrayList<EnterpriseBean>();
-        }
-        return this.enterpriseBeans;
-    }
-
-    /**
-     * Gets the value of the datasources 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 datasources property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDatasources().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceRefBinding }
-     */
-    public List<ResourceRefBinding> getDatasources() {
-        if (datasources == null) {
-            datasources = new ArrayList<ResourceRefBinding>();
-        }
-        return this.datasources;
-    }
-
-    /**
-     * Gets the value of the resRefBindings 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 resRefBindings property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getResRefBindings().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceRefBinding }
-     */
-    public List<ResourceRefBinding> getResRefBindings() {
-        if (resRefBindings == null) {
-            resRefBindings = new ArrayList<ResourceRefBinding>();
-        }
-        return this.resRefBindings;
-    }
-
-    /**
-     * Gets the value of the ejbRefBindings 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 ejbRefBindings property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEjbRefBindings().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EjbRefBinding }
-     */
-    public List<EjbRefBinding> getEjbRefBindings() {
-        if (ejbRefBindings == null) {
-            ejbRefBindings = new ArrayList<EjbRefBinding>();
-        }
-        return this.ejbRefBindings;
-    }
-
-    /**
-     * Gets the value of the resourceEnvRefBindings 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 resourceEnvRefBindings property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getResourceEnvRefBindings().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceEnvRefBinding }
-     */
-    public List<ResourceEnvRefBinding> getResourceEnvRefBindings() {
-        if (resourceEnvRefBindings == null) {
-            resourceEnvRefBindings = new ArrayList<ResourceEnvRefBinding>();
-        }
-        return this.resourceEnvRefBindings;
-    }
-
-    /**
-     * Gets the value of the cmpConnectionFactories 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 cmpConnectionFactories property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getCmpConnectionFactories().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CMPConnectionFactoryBinding }
-     */
-    public List<CMPConnectionFactoryBinding> getCmpConnectionFactories() {
-        if (cmpConnectionFactories == null) {
-            cmpConnectionFactories = new ArrayList<CMPConnectionFactoryBinding>();
-        }
-        return this.cmpConnectionFactories;
-    }
-
-    /**
-     * Gets the value of the serviceRefBindings 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 serviceRefBindings property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getServiceRefBindings().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceRefBinding }
-     */
-    public List<ServiceRefBinding> getServiceRefBindings() {
-        if (serviceRefBindings == null) {
-            serviceRefBindings = new ArrayList<ServiceRefBinding>();
-        }
-        return this.serviceRefBindings;
-    }
-
-    /**
-     * Gets the value of the messageDestinationRefBindings 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 messageDestinationRefBindings property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMessageDestinationRefBindings().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MessageDestinationRefBinding }
-     */
-    public List<MessageDestinationRefBinding> getMessageDestinationRefBindings() {
-        if (messageDestinationRefBindings == null) {
-            messageDestinationRefBindings = new ArrayList<MessageDestinationRefBinding>();
-        }
-        return this.messageDestinationRefBindings;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the ejbName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEjbName() {
-        return ejbName;
-    }
-
-    /**
-     * Sets the value of the ejbName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEjbName(final String value) {
-        this.ejbName = value;
-    }
-
-    /**
-     * Gets the value of the enterpriseBean property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEnterpriseBean() {
-        return enterpriseBean;
-    }
-
-    /**
-     * Sets the value of the enterpriseBean property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEnterpriseBean(final String value) {
-        this.enterpriseBean = value;
-    }
-
-    /**
-     * Gets the value of the jndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getJndiName() {
-        return jndiName;
-    }
-
-    /**
-     * Sets the value of the jndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setJndiName(final String value) {
-        this.jndiName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejbbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.commonbnd.EjbRefBinding;
+import org.apache.openejb.jee.was.v6.commonbnd.MessageDestinationRefBinding;
+import org.apache.openejb.jee.was.v6.commonbnd.ResourceEnvRefBinding;
+import org.apache.openejb.jee.was.v6.commonbnd.ResourceRefBinding;
+import org.apache.openejb.jee.was.v6.ejb.EnterpriseBean;
+import org.apache.openejb.jee.was.v6.webservice.clientbnd.ServiceRefBinding;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for EnterpriseBeanBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EnterpriseBeanBinding">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="enterpriseBean" type="{ejb.xmi}EnterpriseBean"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="datasource" type="{commonbnd.xmi}ResourceRefBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="resRefBindings" type="{commonbnd.xmi}ResourceRefBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="ejbRefBindings" type="{commonbnd.xmi}EjbRefBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="resourceEnvRefBindings" type="{commonbnd.xmi}ResourceEnvRefBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="cmpConnectionFactory" type="{ejbbnd.xmi}CMPConnectionFactoryBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="serviceRefBindings" type="{webservice_clientbnd.xmi}ServiceRefBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="messageDestinationRefBindings" type="{commonbnd.xmi}MessageDestinationRefBinding"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="ejbName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="enterpriseBean" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="jndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EnterpriseBeanBinding", propOrder = {"enterpriseBeans",
+    "datasources", "resRefBindings", "ejbRefBindings",
+    "resourceEnvRefBindings", "cmpConnectionFactories",
+    "serviceRefBindings", "messageDestinationRefBindings", "extensions"})
+public class EnterpriseBeanBinding {
+
+    @XmlElement(name = "enterpriseBean")
+    protected List<EnterpriseBean> enterpriseBeans;
+    @XmlElement(name = "datasource")
+    protected List<ResourceRefBinding> datasources;
+    protected List<ResourceRefBinding> resRefBindings;
+    protected List<EjbRefBinding> ejbRefBindings;
+    protected List<ResourceEnvRefBinding> resourceEnvRefBindings;
+    @XmlElement(name = "cmpConnectionFactory")
+    protected List<CMPConnectionFactoryBinding> cmpConnectionFactories;
+    protected List<ServiceRefBinding> serviceRefBindings;
+    protected List<MessageDestinationRefBinding> messageDestinationRefBindings;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String ejbName;
+    @XmlAttribute
+    protected String enterpriseBean;
+    @XmlAttribute
+    protected String jndiName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the enterpriseBeans 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 enterpriseBeans property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEnterpriseBeans().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EnterpriseBean }
+     */
+    public List<EnterpriseBean> getEnterpriseBeans() {
+        if (enterpriseBeans == null) {
+            enterpriseBeans = new ArrayList<EnterpriseBean>();
+        }
+        return this.enterpriseBeans;
+    }
+
+    /**
+     * Gets the value of the datasources 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 datasources property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDatasources().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceRefBinding }
+     */
+    public List<ResourceRefBinding> getDatasources() {
+        if (datasources == null) {
+            datasources = new ArrayList<ResourceRefBinding>();
+        }
+        return this.datasources;
+    }
+
+    /**
+     * Gets the value of the resRefBindings 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 resRefBindings property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getResRefBindings().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceRefBinding }
+     */
+    public List<ResourceRefBinding> getResRefBindings() {
+        if (resRefBindings == null) {
+            resRefBindings = new ArrayList<ResourceRefBinding>();
+        }
+        return this.resRefBindings;
+    }
+
+    /**
+     * Gets the value of the ejbRefBindings 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 ejbRefBindings property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEjbRefBindings().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EjbRefBinding }
+     */
+    public List<EjbRefBinding> getEjbRefBindings() {
+        if (ejbRefBindings == null) {
+            ejbRefBindings = new ArrayList<EjbRefBinding>();
+        }
+        return this.ejbRefBindings;
+    }
+
+    /**
+     * Gets the value of the resourceEnvRefBindings 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 resourceEnvRefBindings property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getResourceEnvRefBindings().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceEnvRefBinding }
+     */
+    public List<ResourceEnvRefBinding> getResourceEnvRefBindings() {
+        if (resourceEnvRefBindings == null) {
+            resourceEnvRefBindings = new ArrayList<ResourceEnvRefBinding>();
+        }
+        return this.resourceEnvRefBindings;
+    }
+
+    /**
+     * Gets the value of the cmpConnectionFactories 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 cmpConnectionFactories property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getCmpConnectionFactories().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CMPConnectionFactoryBinding }
+     */
+    public List<CMPConnectionFactoryBinding> getCmpConnectionFactories() {
+        if (cmpConnectionFactories == null) {
+            cmpConnectionFactories = new ArrayList<CMPConnectionFactoryBinding>();
+        }
+        return this.cmpConnectionFactories;
+    }
+
+    /**
+     * Gets the value of the serviceRefBindings 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 serviceRefBindings property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getServiceRefBindings().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceRefBinding }
+     */
+    public List<ServiceRefBinding> getServiceRefBindings() {
+        if (serviceRefBindings == null) {
+            serviceRefBindings = new ArrayList<ServiceRefBinding>();
+        }
+        return this.serviceRefBindings;
+    }
+
+    /**
+     * Gets the value of the messageDestinationRefBindings 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 messageDestinationRefBindings property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMessageDestinationRefBindings().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MessageDestinationRefBinding }
+     */
+    public List<MessageDestinationRefBinding> getMessageDestinationRefBindings() {
+        if (messageDestinationRefBindings == null) {
+            messageDestinationRefBindings = new ArrayList<MessageDestinationRefBinding>();
+        }
+        return this.messageDestinationRefBindings;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the ejbName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEjbName() {
+        return ejbName;
+    }
+
+    /**
+     * Sets the value of the ejbName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEjbName(final String value) {
+        this.ejbName = value;
+    }
+
+    /**
+     * Gets the value of the enterpriseBean property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEnterpriseBean() {
+        return enterpriseBean;
+    }
+
+    /**
+     * Sets the value of the enterpriseBean property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEnterpriseBean(final String value) {
+        this.enterpriseBean = value;
+    }
+
+    /**
+     * Gets the value of the jndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getJndiName() {
+        return jndiName;
+    }
+
+    /**
+     * Sets the value of the jndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setJndiName(final String value) {
+        this.jndiName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/MessageDrivenBeanBinding.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/MessageDrivenBeanBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/MessageDrivenBeanBinding.java
index ce8d5ee..25ecbe5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/MessageDrivenBeanBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/MessageDrivenBeanBinding.java
@@ -1,133 +1,133 @@
-/**
- * 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.was.v6.ejbbnd;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Binding information for MessageDrivenBeans.
- * <p/>
- * <p/>
- * <p/>
- * Java class for MessageDrivenBeanBinding complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="MessageDrivenBeanBinding">
- *   &lt;complexContent>
- *     &lt;extension base="{ejbbnd.xmi}EnterpriseBeanBinding">
- *       &lt;attribute name="activationSpecAuthAlias" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="activationSpecJndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="destinationJndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="listenerInputPortName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageDrivenBeanBinding")
-public class MessageDrivenBeanBinding extends EnterpriseBeanBinding {
-
-    @XmlAttribute
-    protected String activationSpecAuthAlias;
-    @XmlAttribute
-    protected String activationSpecJndiName;
-    @XmlAttribute
-    protected String destinationJndiName;
-    @XmlAttribute
-    protected String listenerInputPortName;
-
-    /**
-     * Gets the value of the activationSpecAuthAlias property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getActivationSpecAuthAlias() {
-        return activationSpecAuthAlias;
-    }
-
-    /**
-     * Sets the value of the activationSpecAuthAlias property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setActivationSpecAuthAlias(final String value) {
-        this.activationSpecAuthAlias = value;
-    }
-
-    /**
-     * Gets the value of the activationSpecJndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getActivationSpecJndiName() {
-        return activationSpecJndiName;
-    }
-
-    /**
-     * Sets the value of the activationSpecJndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setActivationSpecJndiName(final String value) {
-        this.activationSpecJndiName = value;
-    }
-
-    /**
-     * Gets the value of the destinationJndiName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDestinationJndiName() {
-        return destinationJndiName;
-    }
-
-    /**
-     * Sets the value of the destinationJndiName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDestinationJndiName(final String value) {
-        this.destinationJndiName = value;
-    }
-
-    /**
-     * Gets the value of the listenerInputPortName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getListenerInputPortName() {
-        return listenerInputPortName;
-    }
-
-    /**
-     * Sets the value of the listenerInputPortName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setListenerInputPortName(final String value) {
-        this.listenerInputPortName = 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.was.v6.ejbbnd;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Binding information for MessageDrivenBeans.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for MessageDrivenBeanBinding complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="MessageDrivenBeanBinding">
+ *   &lt;complexContent>
+ *     &lt;extension base="{ejbbnd.xmi}EnterpriseBeanBinding">
+ *       &lt;attribute name="activationSpecAuthAlias" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="activationSpecJndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="destinationJndiName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="listenerInputPortName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageDrivenBeanBinding")
+public class MessageDrivenBeanBinding extends EnterpriseBeanBinding {
+
+    @XmlAttribute
+    protected String activationSpecAuthAlias;
+    @XmlAttribute
+    protected String activationSpecJndiName;
+    @XmlAttribute
+    protected String destinationJndiName;
+    @XmlAttribute
+    protected String listenerInputPortName;
+
+    /**
+     * Gets the value of the activationSpecAuthAlias property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getActivationSpecAuthAlias() {
+        return activationSpecAuthAlias;
+    }
+
+    /**
+     * Sets the value of the activationSpecAuthAlias property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setActivationSpecAuthAlias(final String value) {
+        this.activationSpecAuthAlias = value;
+    }
+
+    /**
+     * Gets the value of the activationSpecJndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getActivationSpecJndiName() {
+        return activationSpecJndiName;
+    }
+
+    /**
+     * Sets the value of the activationSpecJndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setActivationSpecJndiName(final String value) {
+        this.activationSpecJndiName = value;
+    }
+
+    /**
+     * Gets the value of the destinationJndiName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDestinationJndiName() {
+        return destinationJndiName;
+    }
+
+    /**
+     * Sets the value of the destinationJndiName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDestinationJndiName(final String value) {
+        this.destinationJndiName = value;
+    }
+
+    /**
+     * Gets the value of the listenerInputPortName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getListenerInputPortName() {
+        return listenerInputPortName;
+    }
+
+    /**
+     * Sets the value of the listenerInputPortName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setListenerInputPortName(final String value) {
+        this.listenerInputPortName = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java
index c2d173f..d58e905 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java
@@ -1,128 +1,128 @@
-/**
- * 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.was.v6.ejbbnd;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the org.apache.openejb.jee.was.v6.ejbbnd
- * package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _EJBJarBinding_QNAME = new QName("ejbbnd.xmi",
-        "EJBJarBinding");
-    private final static QName _MessageDrivenBeanBinding_QNAME = new QName(
-        "ejbbnd.xmi", "MessageDrivenBeanBinding");
-    private final static QName _CMPConnectionFactoryBinding_QNAME = new QName(
-        "ejbbnd.xmi", "CMPConnectionFactoryBinding");
-    private final static QName _EnterpriseBeanBinding_QNAME = new QName(
-        "ejbbnd.xmi", "EnterpriseBeanBinding");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package: org.apache.openejb.jee.was.v6.ejbbnd
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link EnterpriseBeanBinding }
-     */
-    public EnterpriseBeanBinding createEnterpriseBeanBinding() {
-        return new EnterpriseBeanBinding();
-    }
-
-    /**
-     * Create an instance of {@link CMPConnectionFactoryBinding }
-     */
-    public CMPConnectionFactoryBinding createCMPConnectionFactoryBinding() {
-        return new CMPConnectionFactoryBinding();
-    }
-
-    /**
-     * Create an instance of {@link EJBJarBinding }
-     */
-    public EJBJarBinding createEJBJarBinding() {
-        return new EJBJarBinding();
-    }
-
-    /**
-     * Create an instance of {@link MessageDrivenBeanBinding }
-     */
-    public MessageDrivenBeanBinding createMessageDrivenBeanBinding() {
-        return new MessageDrivenBeanBinding();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EJBJarBinding }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "ejbbnd.xmi", name = "EJBJarBinding")
-    public JAXBElement<EJBJarBinding> createEJBJarBinding(final EJBJarBinding value) {
-        return new JAXBElement<EJBJarBinding>(_EJBJarBinding_QNAME,
-            EJBJarBinding.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link MessageDrivenBeanBinding }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejbbnd.xmi", name = "MessageDrivenBeanBinding")
-    public JAXBElement<MessageDrivenBeanBinding> createMessageDrivenBeanBinding(
-        final MessageDrivenBeanBinding value) {
-        return new JAXBElement<MessageDrivenBeanBinding>(
-            _MessageDrivenBeanBinding_QNAME,
-            MessageDrivenBeanBinding.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link CMPConnectionFactoryBinding }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejbbnd.xmi", name = "CMPConnectionFactoryBinding")
-    public JAXBElement<CMPConnectionFactoryBinding> createCMPConnectionFactoryBinding(
-        final CMPConnectionFactoryBinding value) {
-        return new JAXBElement<CMPConnectionFactoryBinding>(
-            _CMPConnectionFactoryBinding_QNAME,
-            CMPConnectionFactoryBinding.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link EnterpriseBeanBinding }{@code >}
-     */
-    @XmlElementDecl(namespace = "ejbbnd.xmi", name = "EnterpriseBeanBinding")
-    public JAXBElement<EnterpriseBeanBinding> createEnterpriseBeanBinding(
-        final EnterpriseBeanBinding value) {
-        return new JAXBElement<EnterpriseBeanBinding>(
-            _EnterpriseBeanBinding_QNAME, EnterpriseBeanBinding.class,
-            null, 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.was.v6.ejbbnd;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the org.apache.openejb.jee.was.v6.ejbbnd
+ * package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _EJBJarBinding_QNAME = new QName("ejbbnd.xmi",
+        "EJBJarBinding");
+    private final static QName _MessageDrivenBeanBinding_QNAME = new QName(
+        "ejbbnd.xmi", "MessageDrivenBeanBinding");
+    private final static QName _CMPConnectionFactoryBinding_QNAME = new QName(
+        "ejbbnd.xmi", "CMPConnectionFactoryBinding");
+    private final static QName _EnterpriseBeanBinding_QNAME = new QName(
+        "ejbbnd.xmi", "EnterpriseBeanBinding");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package: org.apache.openejb.jee.was.v6.ejbbnd
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link EnterpriseBeanBinding }
+     */
+    public EnterpriseBeanBinding createEnterpriseBeanBinding() {
+        return new EnterpriseBeanBinding();
+    }
+
+    /**
+     * Create an instance of {@link CMPConnectionFactoryBinding }
+     */
+    public CMPConnectionFactoryBinding createCMPConnectionFactoryBinding() {
+        return new CMPConnectionFactoryBinding();
+    }
+
+    /**
+     * Create an instance of {@link EJBJarBinding }
+     */
+    public EJBJarBinding createEJBJarBinding() {
+        return new EJBJarBinding();
+    }
+
+    /**
+     * Create an instance of {@link MessageDrivenBeanBinding }
+     */
+    public MessageDrivenBeanBinding createMessageDrivenBeanBinding() {
+        return new MessageDrivenBeanBinding();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EJBJarBinding }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "ejbbnd.xmi", name = "EJBJarBinding")
+    public JAXBElement<EJBJarBinding> createEJBJarBinding(final EJBJarBinding value) {
+        return new JAXBElement<EJBJarBinding>(_EJBJarBinding_QNAME,
+            EJBJarBinding.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link MessageDrivenBeanBinding }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejbbnd.xmi", name = "MessageDrivenBeanBinding")
+    public JAXBElement<MessageDrivenBeanBinding> createMessageDrivenBeanBinding(
+        final MessageDrivenBeanBinding value) {
+        return new JAXBElement<MessageDrivenBeanBinding>(
+            _MessageDrivenBeanBinding_QNAME,
+            MessageDrivenBeanBinding.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link CMPConnectionFactoryBinding }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejbbnd.xmi", name = "CMPConnectionFactoryBinding")
+    public JAXBElement<CMPConnectionFactoryBinding> createCMPConnectionFactoryBinding(
+        final CMPConnectionFactoryBinding value) {
+        return new JAXBElement<CMPConnectionFactoryBinding>(
+            _CMPConnectionFactoryBinding_QNAME,
+            CMPConnectionFactoryBinding.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link EnterpriseBeanBinding }{@code >}
+     */
+    @XmlElementDecl(namespace = "ejbbnd.xmi", name = "EnterpriseBeanBinding")
+    public JAXBElement<EnterpriseBeanBinding> createEnterpriseBeanBinding(
+        final EnterpriseBeanBinding value) {
+        return new JAXBElement<EnterpriseBeanBinding>(
+            _EnterpriseBeanBinding_QNAME, EnterpriseBeanBinding.class,
+            null, value);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/package-info.java
index 38202e2..25adc4b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "ejbbnd.xmi") package org.apache.openejb.jee.was.v6.ejbbnd;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "ejbbnd.xmi") package org.apache.openejb.jee.was.v6.ejbbnd;
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ArrayType.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ArrayType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ArrayType.java
index 4e11cdd..788dbe8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ArrayType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ArrayType.java
@@ -1,138 +1,138 @@
-/**
- * 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.was.v6.java;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.ecore.EClassifier;
-
-/**
- * Describes a Java Array type For multi-dimensional arrays, it is unlikely that
- * the component type will be specified directly. This would require
- * instantiating a chain of component types such as
- * String[][][][]->String[][][]->String[][]->String[]->String.
- * <p/>
- * The component type relationship will be computed if the finalComponentType
- * and array dimensions is specified.
- * <p/>
- * For this reason, the preferred way to create is through the JavaRefFactory
- * factory method: createArrayType(JavaClass finalComponentType, int dimensions)
- * <p/>
- * <p/>
- * <p/>
- * Java class for ArrayType complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ArrayType">
- *   &lt;complexContent>
- *     &lt;extension base="{java.xmi}JavaClass">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="componentType" type="{http://www.eclipse.org/emf/2002/Ecore}EClassifier"/>
- *       &lt;/choice>
- *       &lt;attribute name="arrayDimensions" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       &lt;attribute name="componentType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArrayType", propOrder = {"componentTypes"})
-public class ArrayType extends JavaClass {
-
-    @XmlElement(name = "componentType")
-    protected List<EClassifier> componentTypes;
-    @XmlAttribute
-    protected Integer arrayDimensions;
-    @XmlAttribute
-    protected String componentType;
-
-    /**
-     * Gets the value of the componentTypes 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 componentTypes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getComponentTypes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EClassifier }
-     */
-    public List<EClassifier> getComponentTypes() {
-        if (componentTypes == null) {
-            componentTypes = new ArrayList<EClassifier>();
-        }
-        return this.componentTypes;
-    }
-
-    /**
-     * Gets the value of the arrayDimensions property.
-     *
-     * @return possible object is {@link Integer }
-     */
-    public Integer getArrayDimensions() {
-        return arrayDimensions;
-    }
-
-    /**
-     * Sets the value of the arrayDimensions property.
-     *
-     * @param value allowed object is {@link Integer }
-     */
-    public void setArrayDimensions(final Integer value) {
-        this.arrayDimensions = value;
-    }
-
-    /**
-     * Gets the value of the componentType property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getComponentType() {
-        return componentType;
-    }
-
-    /**
-     * Sets the value of the componentType property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setComponentType(final String value) {
-        this.componentType = 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.was.v6.java;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.ecore.EClassifier;
+
+/**
+ * Describes a Java Array type For multi-dimensional arrays, it is unlikely that
+ * the component type will be specified directly. This would require
+ * instantiating a chain of component types such as
+ * String[][][][]->String[][][]->String[][]->String[]->String.
+ * <p/>
+ * The component type relationship will be computed if the finalComponentType
+ * and array dimensions is specified.
+ * <p/>
+ * For this reason, the preferred way to create is through the JavaRefFactory
+ * factory method: createArrayType(JavaClass finalComponentType, int dimensions)
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for ArrayType complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ArrayType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{java.xmi}JavaClass">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="componentType" type="{http://www.eclipse.org/emf/2002/Ecore}EClassifier"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="arrayDimensions" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="componentType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ArrayType", propOrder = {"componentTypes"})
+public class ArrayType extends JavaClass {
+
+    @XmlElement(name = "componentType")
+    protected List<EClassifier> componentTypes;
+    @XmlAttribute
+    protected Integer arrayDimensions;
+    @XmlAttribute
+    protected String componentType;
+
+    /**
+     * Gets the value of the componentTypes 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 componentTypes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getComponentTypes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EClassifier }
+     */
+    public List<EClassifier> getComponentTypes() {
+        if (componentTypes == null) {
+            componentTypes = new ArrayList<EClassifier>();
+        }
+        return this.componentTypes;
+    }
+
+    /**
+     * Gets the value of the arrayDimensions property.
+     *
+     * @return possible object is {@link Integer }
+     */
+    public Integer getArrayDimensions() {
+        return arrayDimensions;
+    }
+
+    /**
+     * Sets the value of the arrayDimensions property.
+     *
+     * @param value allowed object is {@link Integer }
+     */
+    public void setArrayDimensions(final Integer value) {
+        this.arrayDimensions = value;
+    }
+
+    /**
+     * Gets the value of the componentType property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getComponentType() {
+        return componentType;
+    }
+
+    /**
+     * Sets the value of the componentType property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setComponentType(final String value) {
+        this.componentType = value;
+    }
+
+}


[13/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/FileHandler.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/FileHandler.java b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/FileHandler.java
index ba319c2..59fd3f2 100644
--- a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/FileHandler.java
+++ b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/FileHandler.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.disposes;
-
-public class FileHandler implements LogHandler {
-
-    private String name;
-
-    public FileHandler(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void writeLog(String s) {
-        System.out.printf("##### Handler: %s, Writing to the file!\n", getName());
-        // Write to log file
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.disposes;
+
+public class FileHandler implements LogHandler {
+
+    private String name;
+
+    public FileHandler(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void writeLog(String s) {
+        System.out.printf("##### Handler: %s, Writing to the file!\n", getName());
+        // Write to log file
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogFactory.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogFactory.java b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogFactory.java
index baf798c..fb5b2fc 100644
--- a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogFactory.java
+++ b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogFactory.java
@@ -1,54 +1,54 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.disposes;
-
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-
-public class LogFactory {
-
-    private int type = 2;
-
-    @Produces
-    public LogHandler getLogHandler() {
-        switch (type) {
-            case 1:
-                return new FileHandler("@Produces created FileHandler!");
-            case 2:
-                return new DatabaseHandler("@Produces created DatabaseHandler!");
-            case 3:
-            default:
-                return new ConsoleHandler("@Produces created ConsoleHandler!");
-        }
-
-    }
-
-    public void closeLogHandler(@Disposes LogHandler handler) {
-        switch (type) {
-            case 1:
-                System.out.println("Closing File handler!");
-                break;
-            case 2:
-                System.out.println("Closing DB handler!");
-                break;
-            case 3:
-            default:
-                System.out.println("Closing Console handler!");
-        }
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.disposes;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+public class LogFactory {
+
+    private int type = 2;
+
+    @Produces
+    public LogHandler getLogHandler() {
+        switch (type) {
+            case 1:
+                return new FileHandler("@Produces created FileHandler!");
+            case 2:
+                return new DatabaseHandler("@Produces created DatabaseHandler!");
+            case 3:
+            default:
+                return new ConsoleHandler("@Produces created ConsoleHandler!");
+        }
+
+    }
+
+    public void closeLogHandler(@Disposes LogHandler handler) {
+        switch (type) {
+            case 1:
+                System.out.println("Closing File handler!");
+                break;
+            case 2:
+                System.out.println("Closing DB handler!");
+                break;
+            case 3:
+            default:
+                System.out.println("Closing Console handler!");
+        }
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogHandler.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogHandler.java b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogHandler.java
index adc22b7..40d3a56 100644
--- a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogHandler.java
+++ b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LogHandler.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.disposes;
-
-public interface LogHandler {
-
-    public String getName();
-
-    public void writeLog(String s);
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.disposes;
+
+public interface LogHandler {
+
+    public String getName();
+
+    public void writeLog(String s);
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/Logger.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/Logger.java b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/Logger.java
index b46975a..4a0cc31 100644
--- a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/Logger.java
+++ b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/Logger.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.disposes;
-
-public interface Logger {
-
-    public void log(String s);
-
-    public LogHandler getHandler();
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.disposes;
+
+public interface Logger {
+
+    public void log(String s);
+
+    public LogHandler getHandler();
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LoggerImpl.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LoggerImpl.java b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LoggerImpl.java
index 69cc006..10bc230 100644
--- a/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LoggerImpl.java
+++ b/examples/cdi-produces-disposes/src/main/java/org/superbiz/cdi/produces/disposes/LoggerImpl.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.disposes;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-@Named("logger")
-public class LoggerImpl implements Logger {
-
-    @Inject
-    private LogHandler handler;
-
-    @Override
-    public void log(String s) {
-        getHandler().writeLog(s);
-    }
-
-    public LogHandler getHandler() {
-        return handler;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.disposes;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+@Named("logger")
+public class LoggerImpl implements Logger {
+
+    @Inject
+    private LogHandler handler;
+
+    @Override
+    public void log(String s) {
+        getHandler().writeLog(s);
+    }
+
+    public LogHandler getHandler() {
+        return handler;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java b/examples/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java
index 4fcc086..0c954aa 100644
--- a/examples/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java
+++ b/examples/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java
@@ -1,67 +1,67 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.disposes;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.inject.Inject;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class LoggerTest {
-
-    @Inject
-    Logger logger;
-
-    private EJBContainer container;
-
-    @Before
-    public void setUp() {
-        try {
-            container = EJBContainer.createEJBContainer();
-            container.getContext().bind("inject", this);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @After
-    public void cleanUp() {
-        try {
-            container.getContext().unbind("inject");
-            container.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testLogHandler() {
-        assertNotNull(logger);
-        assertFalse("Handler should not be a ConsoleHandler", logger.getHandler() instanceof ConsoleHandler);
-        assertFalse("Handler should not be a FileHandler", logger.getHandler() instanceof FileHandler);
-        assertTrue("Handler should be a DatabaseHandler", logger.getHandler() instanceof DatabaseHandler);
-        logger.log("##### Testing write\n");
-        logger = null;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.disposes;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class LoggerTest {
+
+    @Inject
+    Logger logger;
+
+    private EJBContainer container;
+
+    @Before
+    public void setUp() {
+        try {
+            container = EJBContainer.createEJBContainer();
+            container.getContext().bind("inject", this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @After
+    public void cleanUp() {
+        try {
+            container.getContext().unbind("inject");
+            container.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testLogHandler() {
+        assertNotNull(logger);
+        assertFalse("Handler should not be a ConsoleHandler", logger.getHandler() instanceof ConsoleHandler);
+        assertFalse("Handler should not be a FileHandler", logger.getHandler() instanceof FileHandler);
+        assertTrue("Handler should be a DatabaseHandler", logger.getHandler() instanceof DatabaseHandler);
+        logger.log("##### Testing write\n");
+        logger = null;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/README.md b/examples/cdi-produces-field/README.md
index c2f61d9..60f0387 100644
--- a/examples/cdi-produces-field/README.md
+++ b/examples/cdi-produces-field/README.md
@@ -1,270 +1,270 @@
-Title: CDI field producer
-
-This example shows the usage of the @Produces annotation. @Produces is a CDI mechanism which allows defining a source
- for injection. This example shows one of two ways of declaring a producer. Instead of a producer method (see CDI-produces-disposes example)
-a producer field can be used. A producer field can be used instead of a simple getter method. It could be used to
-inject resources, such as persistence contexts. One caveat to using producer fields over producer
- methods is that a @Disposes method cannot be used in conjunction with @Produces field.
-
-## ConsoleHandler
-
-    package org.superbiz.cdi.produces.field;
-    
-    public class ConsoleHandler implements LogHandler {
-    
-        private String name;
-    
-        public ConsoleHandler(String name) {
-            this.name = name;
-        }
-    
-        @Override
-        public String getName() {
-            return name;
-        }
-    
-        @Override
-        public void writeLog(String s) {
-            System.out.printf("##### Handler: %s, Writing to the console!\n", getName());
-        }
-    }
-
-## DatabaseHandler
-
-    package org.superbiz.cdi.produces.field;
-    
-    public class DatabaseHandler implements LogHandler {
-    
-        private String name;
-    
-        public DatabaseHandler(String name) {
-            this.name = name;
-        }
-    
-        @Override
-        public String getName() {
-            return name;
-        }
-    
-        @Override
-        public void writeLog(String s) {
-            System.out.printf("##### Handler: %s, Writing to the database!\n", getName());
-            // Use connection to write log to database
-        }
-    }
-
-## FileHandler
-
-    package org.superbiz.cdi.produces.field;
-    
-    public class FileHandler implements LogHandler {
-    
-        private String name;
-    
-        public FileHandler(String name) {
-            this.name = name;
-        }
-    
-        @Override
-        public String getName() {
-            return name;
-        }
-    
-        @Override
-        public void writeLog(String s) {
-            System.out.printf("##### Handler: %s, Writing to the file!\n", getName());
-            // Write to log file
-        }
-    }
-
-## LogFactory
-
-	package org.superbiz.cdi.produces.field;
-	
-	import javax.enterprise.inject.Produces;
-	
-	public class LogFactory {
-	
-	    private int type = 2;
-	    
-	    @Produces
-	    LogHandler handler;
-	    
-	    public LogFactory(){
-	    	handler = getLogHandler();
-	    }
-	
-	    public LogHandler getLogHandler() {
-	        switch (type) {
-	            case 1:
-	                return new FileHandler("@Produces created FileHandler!");
-	            case 2:
-	                return new DatabaseHandler("@Produces created DatabaseHandler!");
-	            case 3:
-	            default:
-	                return new ConsoleHandler("@Produces created ConsoleHandler!");
-	        }
-	
-	    }
-	}
-
-## Logger
-
-    package org.superbiz.cdi.produces.field;
-    
-    public interface Logger {
-    
-        public void log(String s);
-    
-        public LogHandler getHandler();
-    }
-
-## LoggerImpl
-
-    package org.superbiz.cdi.produces.field;
-    
-    import javax.inject.Inject;
-    import javax.inject.Named;
-    
-    @Named("logger")
-    public class LoggerImpl implements Logger {
-    
-        @Inject
-        private LogHandler handler;
-    
-        @Override
-        public void log(String s) {
-            getHandler().writeLog(s);
-        }
-    
-        public LogHandler getHandler() {
-            return handler;
-        }
-    }
-
-## LogHandler
-
-    package org.superbiz.cdi.produces.field;
-    
-    public interface LogHandler {
-    
-        public String getName();
-    
-        public void writeLog(String s);
-    }
-
-## beans.xml
-
-    <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-                                http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-    
-    </beans>
-
-## LoggerTest
-
-    package org.superbiz.cdi.produces.field;
-    
-    import org.junit.After;
-    import org.junit.Before;
-    import org.junit.Test;
-    
-    import javax.ejb.embeddable.EJBContainer;
-    import javax.inject.Inject;
-    import javax.naming.Context;
-    
-    import static junit.framework.Assert.assertNotNull;
-    import static org.junit.Assert.assertFalse;
-    import static org.junit.Assert.assertTrue;
-    
-    public class LoggerTest {
-    
-        @Inject
-        Logger logger;
-    
-        private Context ctxt;
-    
-        @Before
-        public void setUp() {
-            try {
-                ctxt = EJBContainer.createEJBContainer().getContext();
-                ctxt.bind("inject", this);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    
-        @After
-        public void cleanUp() {
-            try {
-                ctxt.unbind("inject");
-                ctxt.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    
-        @Test
-        public void testLogHandler() {
-            assertNotNull(logger);
-            assertFalse("Handler should not be a ConsoleHandler", logger.getHandler() instanceof ConsoleHandler);
-            assertFalse("Handler should not be a FileHandler", logger.getHandler() instanceof FileHandler);
-            assertTrue("Handler should be a DatabaseHandler", logger.getHandler() instanceof DatabaseHandler);
-            logger.log("##### Testing write\n");
-            logger = null;
-        }
-    
-    }
-
-# Running
-
-    
-    -------------------------------------------------------
-	 T E S T S
-	-------------------------------------------------------
-	Running org.superbiz.cdi.produces.field.LoggerTest
-	INFO - ********************************************************************************
-	INFO - OpenEJB http://tomee.apache.org/
-	INFO - Startup: Thu May 10 01:28:19 CDT 2012
-	INFO - Copyright 1999-2012 (C) Apache OpenEJB Project, All Rights Reserved.
-	INFO - Version: 7.0.0-SNAPSHOT
-	INFO - Build date: 20120510
-	INFO - Build time: 04:06
-	INFO - ********************************************************************************
-	INFO - openejb.home = /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
-	INFO - openejb.base = /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
-	INFO - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@a81b1fb
-	INFO - succeeded in installing singleton service
-	INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
-	INFO - Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
-	INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
-	INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-	INFO - Creating TransactionManager(id=Default Transaction Manager)
-	INFO - Creating SecurityService(id=Default Security Service)
-	INFO - Inspecting classpath for applications: 26 urls. Consider adjusting your exclude/include.  Current settings: openejb.deployments.classpath.exclude='', openejb.deployments.classpath.include='.*'
-	INFO - Searched 26 classpath urls in 2015 milliseconds.  Average 77 milliseconds per url.
-	INFO - Beginning load: /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field/target/classes
-	INFO - Configuring enterprise application: /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
-	INFO - Auto-deploying ejb cdi-produces-field.Comp: EjbDeployment(deployment-id=cdi-produces-field.Comp)
-	INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-	INFO - Auto-creating a container for bean cdi-produces-field.Comp: Container(type=MANAGED, id=Default Managed Container)
-	INFO - Creating Container(id=Default Managed Container)
-	INFO - Using directory /tmp for stateful session passivation
-	INFO - Enterprise application "/home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field" loaded.
-	INFO - Assembling app: /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
-	INFO - ignoreXmlConfiguration == true
-	INFO - ignoreXmlConfiguration == true
-	INFO - existing thread singleton service in SystemInstance() org.apache.openejb.cdi.ThreadSingletonServiceImpl@a81b1fb
-	INFO - OpenWebBeans Container is starting...
-	INFO - Adding OpenWebBeansPlugin : [CdiPlugin]
-	INFO - All injection points were validated successfully.
-	INFO - OpenWebBeans Container has started, it took [69] ms.
-	INFO - Deployed Application(path=/home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field)
-	##### Handler: @Produces created DatabaseHandler!, Writing to the database!
-	INFO - Undeploying app: /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
-	Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.79 sec
-	
-	Results :
-	
-	Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-    
+Title: CDI field producer
+
+This example shows the usage of the @Produces annotation. @Produces is a CDI mechanism which allows defining a source
+ for injection. This example shows one of two ways of declaring a producer. Instead of a producer method (see CDI-produces-disposes example)
+a producer field can be used. A producer field can be used instead of a simple getter method. It could be used to
+inject resources, such as persistence contexts. One caveat to using producer fields over producer
+ methods is that a @Disposes method cannot be used in conjunction with @Produces field.
+
+## ConsoleHandler
+
+    package org.superbiz.cdi.produces.field;
+    
+    public class ConsoleHandler implements LogHandler {
+    
+        private String name;
+    
+        public ConsoleHandler(String name) {
+            this.name = name;
+        }
+    
+        @Override
+        public String getName() {
+            return name;
+        }
+    
+        @Override
+        public void writeLog(String s) {
+            System.out.printf("##### Handler: %s, Writing to the console!\n", getName());
+        }
+    }
+
+## DatabaseHandler
+
+    package org.superbiz.cdi.produces.field;
+    
+    public class DatabaseHandler implements LogHandler {
+    
+        private String name;
+    
+        public DatabaseHandler(String name) {
+            this.name = name;
+        }
+    
+        @Override
+        public String getName() {
+            return name;
+        }
+    
+        @Override
+        public void writeLog(String s) {
+            System.out.printf("##### Handler: %s, Writing to the database!\n", getName());
+            // Use connection to write log to database
+        }
+    }
+
+## FileHandler
+
+    package org.superbiz.cdi.produces.field;
+    
+    public class FileHandler implements LogHandler {
+    
+        private String name;
+    
+        public FileHandler(String name) {
+            this.name = name;
+        }
+    
+        @Override
+        public String getName() {
+            return name;
+        }
+    
+        @Override
+        public void writeLog(String s) {
+            System.out.printf("##### Handler: %s, Writing to the file!\n", getName());
+            // Write to log file
+        }
+    }
+
+## LogFactory
+
+	package org.superbiz.cdi.produces.field;
+	
+	import javax.enterprise.inject.Produces;
+	
+	public class LogFactory {
+	
+	    private int type = 2;
+	    
+	    @Produces
+	    LogHandler handler;
+	    
+	    public LogFactory(){
+	    	handler = getLogHandler();
+	    }
+	
+	    public LogHandler getLogHandler() {
+	        switch (type) {
+	            case 1:
+	                return new FileHandler("@Produces created FileHandler!");
+	            case 2:
+	                return new DatabaseHandler("@Produces created DatabaseHandler!");
+	            case 3:
+	            default:
+	                return new ConsoleHandler("@Produces created ConsoleHandler!");
+	        }
+	
+	    }
+	}
+
+## Logger
+
+    package org.superbiz.cdi.produces.field;
+    
+    public interface Logger {
+    
+        public void log(String s);
+    
+        public LogHandler getHandler();
+    }
+
+## LoggerImpl
+
+    package org.superbiz.cdi.produces.field;
+    
+    import javax.inject.Inject;
+    import javax.inject.Named;
+    
+    @Named("logger")
+    public class LoggerImpl implements Logger {
+    
+        @Inject
+        private LogHandler handler;
+    
+        @Override
+        public void log(String s) {
+            getHandler().writeLog(s);
+        }
+    
+        public LogHandler getHandler() {
+            return handler;
+        }
+    }
+
+## LogHandler
+
+    package org.superbiz.cdi.produces.field;
+    
+    public interface LogHandler {
+    
+        public String getName();
+    
+        public void writeLog(String s);
+    }
+
+## beans.xml
+
+    <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+                                http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+    
+    </beans>
+
+## LoggerTest
+
+    package org.superbiz.cdi.produces.field;
+    
+    import org.junit.After;
+    import org.junit.Before;
+    import org.junit.Test;
+    
+    import javax.ejb.embeddable.EJBContainer;
+    import javax.inject.Inject;
+    import javax.naming.Context;
+    
+    import static junit.framework.Assert.assertNotNull;
+    import static org.junit.Assert.assertFalse;
+    import static org.junit.Assert.assertTrue;
+    
+    public class LoggerTest {
+    
+        @Inject
+        Logger logger;
+    
+        private Context ctxt;
+    
+        @Before
+        public void setUp() {
+            try {
+                ctxt = EJBContainer.createEJBContainer().getContext();
+                ctxt.bind("inject", this);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    
+        @After
+        public void cleanUp() {
+            try {
+                ctxt.unbind("inject");
+                ctxt.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    
+        @Test
+        public void testLogHandler() {
+            assertNotNull(logger);
+            assertFalse("Handler should not be a ConsoleHandler", logger.getHandler() instanceof ConsoleHandler);
+            assertFalse("Handler should not be a FileHandler", logger.getHandler() instanceof FileHandler);
+            assertTrue("Handler should be a DatabaseHandler", logger.getHandler() instanceof DatabaseHandler);
+            logger.log("##### Testing write\n");
+            logger = null;
+        }
+    
+    }
+
+# Running
+
+    
+    -------------------------------------------------------
+	 T E S T S
+	-------------------------------------------------------
+	Running org.superbiz.cdi.produces.field.LoggerTest
+	INFO - ********************************************************************************
+	INFO - OpenEJB http://tomee.apache.org/
+	INFO - Startup: Thu May 10 01:28:19 CDT 2012
+	INFO - Copyright 1999-2012 (C) Apache OpenEJB Project, All Rights Reserved.
+	INFO - Version: 7.0.0-SNAPSHOT
+	INFO - Build date: 20120510
+	INFO - Build time: 04:06
+	INFO - ********************************************************************************
+	INFO - openejb.home = /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
+	INFO - openejb.base = /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
+	INFO - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@a81b1fb
+	INFO - succeeded in installing singleton service
+	INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
+	INFO - Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
+	INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+	INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+	INFO - Creating TransactionManager(id=Default Transaction Manager)
+	INFO - Creating SecurityService(id=Default Security Service)
+	INFO - Inspecting classpath for applications: 26 urls. Consider adjusting your exclude/include.  Current settings: openejb.deployments.classpath.exclude='', openejb.deployments.classpath.include='.*'
+	INFO - Searched 26 classpath urls in 2015 milliseconds.  Average 77 milliseconds per url.
+	INFO - Beginning load: /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field/target/classes
+	INFO - Configuring enterprise application: /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
+	INFO - Auto-deploying ejb cdi-produces-field.Comp: EjbDeployment(deployment-id=cdi-produces-field.Comp)
+	INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+	INFO - Auto-creating a container for bean cdi-produces-field.Comp: Container(type=MANAGED, id=Default Managed Container)
+	INFO - Creating Container(id=Default Managed Container)
+	INFO - Using directory /tmp for stateful session passivation
+	INFO - Enterprise application "/home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field" loaded.
+	INFO - Assembling app: /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
+	INFO - ignoreXmlConfiguration == true
+	INFO - ignoreXmlConfiguration == true
+	INFO - existing thread singleton service in SystemInstance() org.apache.openejb.cdi.ThreadSingletonServiceImpl@a81b1fb
+	INFO - OpenWebBeans Container is starting...
+	INFO - Adding OpenWebBeansPlugin : [CdiPlugin]
+	INFO - All injection points were validated successfully.
+	INFO - OpenWebBeans Container has started, it took [69] ms.
+	INFO - Deployed Application(path=/home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field)
+	##### Handler: @Produces created DatabaseHandler!, Writing to the database!
+	INFO - Undeploying app: /home/daniel/projects/openejb/source/openejb/examples/cdi-produces-field
+	Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.79 sec
+	
+	Results :
+	
+	Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+    

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/ConsoleHandler.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/ConsoleHandler.java b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/ConsoleHandler.java
index f8852e1..6c6b5cf 100644
--- a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/ConsoleHandler.java
+++ b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/ConsoleHandler.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.field;
-
-public class ConsoleHandler implements LogHandler {
-
-    private String name;
-
-    public ConsoleHandler(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void writeLog(String s) {
-        System.out.printf("##### Handler: %s, Writing to the console!\n", getName());
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.field;
+
+public class ConsoleHandler implements LogHandler {
+
+    private String name;
+
+    public ConsoleHandler(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void writeLog(String s) {
+        System.out.printf("##### Handler: %s, Writing to the console!\n", getName());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/DatabaseHandler.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/DatabaseHandler.java b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/DatabaseHandler.java
index ef9a658..3dbab3e 100644
--- a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/DatabaseHandler.java
+++ b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/DatabaseHandler.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.field;
-
-public class DatabaseHandler implements LogHandler {
-
-    private String name;
-
-    public DatabaseHandler(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void writeLog(String s) {
-        System.out.printf("##### Handler: %s, Writing to the database!\n", getName());
-        // Use connection to write log to database
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.field;
+
+public class DatabaseHandler implements LogHandler {
+
+    private String name;
+
+    public DatabaseHandler(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void writeLog(String s) {
+        System.out.printf("##### Handler: %s, Writing to the database!\n", getName());
+        // Use connection to write log to database
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/FileHandler.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/FileHandler.java b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/FileHandler.java
index 3681058..35556b4 100644
--- a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/FileHandler.java
+++ b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/FileHandler.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.field;
-
-public class FileHandler implements LogHandler {
-
-    private String name;
-
-    public FileHandler(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void writeLog(String s) {
-        System.out.printf("##### Handler: %s, Writing to the file!\n", getName());
-        // Write to log file
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.field;
+
+public class FileHandler implements LogHandler {
+
+    private String name;
+
+    public FileHandler(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void writeLog(String s) {
+        System.out.printf("##### Handler: %s, Writing to the file!\n", getName());
+        // Write to log file
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogFactory.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogFactory.java b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogFactory.java
index 87e9410..c135b20 100644
--- a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogFactory.java
+++ b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogFactory.java
@@ -1,44 +1,44 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.field;
-
-import javax.enterprise.inject.Produces;
-
-public class LogFactory {
-
-    private int type = 2;
-
-    @Produces
-    LogHandler handler;
-
-    public LogFactory() {
-        handler = getLogHandler();
-    }
-
-    public LogHandler getLogHandler() {
-        switch (type) {
-            case 1:
-                return new FileHandler("@Produces created FileHandler!");
-            case 2:
-                return new DatabaseHandler("@Produces created DatabaseHandler!");
-            case 3:
-            default:
-                return new ConsoleHandler("@Produces created ConsoleHandler!");
-        }
-
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.field;
+
+import javax.enterprise.inject.Produces;
+
+public class LogFactory {
+
+    private int type = 2;
+
+    @Produces
+    LogHandler handler;
+
+    public LogFactory() {
+        handler = getLogHandler();
+    }
+
+    public LogHandler getLogHandler() {
+        switch (type) {
+            case 1:
+                return new FileHandler("@Produces created FileHandler!");
+            case 2:
+                return new DatabaseHandler("@Produces created DatabaseHandler!");
+            case 3:
+            default:
+                return new ConsoleHandler("@Produces created ConsoleHandler!");
+        }
+
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogHandler.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogHandler.java b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogHandler.java
index b0c892a..981db18 100644
--- a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogHandler.java
+++ b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LogHandler.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.field;
-
-public interface LogHandler {
-
-    public String getName();
-
-    public void writeLog(String s);
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.field;
+
+public interface LogHandler {
+
+    public String getName();
+
+    public void writeLog(String s);
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/Logger.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/Logger.java b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/Logger.java
index 8dd628e..541ba5f 100644
--- a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/Logger.java
+++ b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/Logger.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.field;
-
-public interface Logger {
-
-    public void log(String s);
-
-    public LogHandler getHandler();
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.field;
+
+public interface Logger {
+
+    public void log(String s);
+
+    public LogHandler getHandler();
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LoggerImpl.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LoggerImpl.java b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LoggerImpl.java
index ca039fe..2750e6d 100644
--- a/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LoggerImpl.java
+++ b/examples/cdi-produces-field/src/main/java/org/superbiz/cdi/produces/field/LoggerImpl.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.field;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-@Named("logger")
-public class LoggerImpl implements Logger {
-
-    @Inject
-    private LogHandler handler;
-
-    @Override
-    public void log(String s) {
-        getHandler().writeLog(s);
-    }
-
-    public LogHandler getHandler() {
-        return handler;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.field;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+@Named("logger")
+public class LoggerImpl implements Logger {
+
+    @Inject
+    private LogHandler handler;
+
+    @Override
+    public void log(String s) {
+        getHandler().writeLog(s);
+    }
+
+    public LogHandler getHandler() {
+        return handler;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/main/resources/META-INF/beans.xml b/examples/cdi-produces-field/src/main/resources/META-INF/beans.xml
index 04392fd..c33918a 100644
--- a/examples/cdi-produces-field/src/main/resources/META-INF/beans.xml
+++ b/examples/cdi-produces-field/src/main/resources/META-INF/beans.xml
@@ -1,24 +1,24 @@
-<?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.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-                            http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
-</beans>
+<?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.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+                            http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java b/examples/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java
index 6a7b434..873f8fe 100644
--- a/examples/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java
+++ b/examples/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java
@@ -1,67 +1,67 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.produces.field;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.inject.Inject;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class LoggerTest {
-
-    @Inject
-    Logger logger;
-
-    private EJBContainer container;
-
-    @Before
-    public void setUp() {
-        try {
-            container = EJBContainer.createEJBContainer();
-            container.getContext().bind("inject", this);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @After
-    public void cleanUp() {
-        try {
-            container.getContext().unbind("inject");
-            container.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testLogHandler() {
-        assertNotNull(logger);
-        assertFalse("Handler should not be a ConsoleHandler", logger.getHandler() instanceof ConsoleHandler);
-        assertFalse("Handler should not be a FileHandler", logger.getHandler() instanceof FileHandler);
-        assertTrue("Handler should be a DatabaseHandler", logger.getHandler() instanceof DatabaseHandler);
-        logger.log("##### Testing write\n");
-        logger = null;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.produces.field;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class LoggerTest {
+
+    @Inject
+    Logger logger;
+
+    private EJBContainer container;
+
+    @Before
+    public void setUp() {
+        try {
+            container = EJBContainer.createEJBContainer();
+            container.getContext().bind("inject", this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @After
+    public void cleanUp() {
+        try {
+            container.getContext().unbind("inject");
+            container.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testLogHandler() {
+        assertNotNull(logger);
+        assertFalse("Handler should not be a ConsoleHandler", logger.getHandler() instanceof ConsoleHandler);
+        assertFalse("Handler should not be a FileHandler", logger.getHandler() instanceof FileHandler);
+        assertTrue("Handler should be a DatabaseHandler", logger.getHandler() instanceof DatabaseHandler);
+        logger.log("##### Testing write\n");
+        logger = null;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-realm/src/main/java/org/superbiz/AuthBean.java
----------------------------------------------------------------------
diff --git a/examples/cdi-realm/src/main/java/org/superbiz/AuthBean.java b/examples/cdi-realm/src/main/java/org/superbiz/AuthBean.java
index d74f34d..778c67d 100644
--- a/examples/cdi-realm/src/main/java/org/superbiz/AuthBean.java
+++ b/examples/cdi-realm/src/main/java/org/superbiz/AuthBean.java
@@ -1,48 +1,48 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-import javax.enterprise.context.RequestScoped;
-import java.security.Principal;
-
-@RequestScoped // just to show we can be bound to the request but @ApplicationScoped is what makes sense
-public class AuthBean {
-    public Principal authenticate(final String username, String password) {
-        if (("userA".equals(username) || "userB".equals(username)) && "test".equals(password)) {
-            return new Principal() {
-                @Override
-                public String getName() {
-                    return username;
-                }
-
-                @Override
-                public String toString() {
-                    return username;
-                }
-            };
-        }
-        return null;
-    }
-
-    public boolean hasRole(final Principal principal, final String role) {
-        return principal != null && (
-                principal.getName().equals("userA") && (role.equals("admin")
-                        || role.equals("user"))
-                        || principal.getName().equals("userB") && (role.equals("user"))
-        );
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+import javax.enterprise.context.RequestScoped;
+import java.security.Principal;
+
+@RequestScoped // just to show we can be bound to the request but @ApplicationScoped is what makes sense
+public class AuthBean {
+    public Principal authenticate(final String username, String password) {
+        if (("userA".equals(username) || "userB".equals(username)) && "test".equals(password)) {
+            return new Principal() {
+                @Override
+                public String getName() {
+                    return username;
+                }
+
+                @Override
+                public String toString() {
+                    return username;
+                }
+            };
+        }
+        return null;
+    }
+
+    public boolean hasRole(final Principal principal, final String role) {
+        return principal != null && (
+                principal.getName().equals("userA") && (role.equals("admin")
+                        || role.equals("user"))
+                        || principal.getName().equals("userB") && (role.equals("user"))
+        );
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-realm/src/main/java/org/superbiz/SecuredServlet.java
----------------------------------------------------------------------
diff --git a/examples/cdi-realm/src/main/java/org/superbiz/SecuredServlet.java b/examples/cdi-realm/src/main/java/org/superbiz/SecuredServlet.java
index ec1a18f..63aa90b 100644
--- a/examples/cdi-realm/src/main/java/org/superbiz/SecuredServlet.java
+++ b/examples/cdi-realm/src/main/java/org/superbiz/SecuredServlet.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet("/servlet")
-public class SecuredServlet extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
-        resp.getWriter().write("Servlet!");
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet("/servlet")
+public class SecuredServlet extends HttpServlet {
+    @Override
+    protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+        resp.getWriter().write("Servlet!");
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-realm/src/test/java/org/superbiz/AuthBeanTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-realm/src/test/java/org/superbiz/AuthBeanTest.java b/examples/cdi-realm/src/test/java/org/superbiz/AuthBeanTest.java
index 9f22037..ed27f94 100644
--- a/examples/cdi-realm/src/test/java/org/superbiz/AuthBeanTest.java
+++ b/examples/cdi-realm/src/test/java/org/superbiz/AuthBeanTest.java
@@ -1,102 +1,102 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.apache.openejb.arquillian.common.IO;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.asset.FileAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-@RunWith(Arquillian.class)
-public class AuthBeanTest {
-    @Deployment(testable = false)
-    public static WebArchive createDeployment() {
-        return ShrinkWrap.create(WebArchive.class, "low-typed-realm.war")
-                .addClasses(SecuredServlet.class, AuthBean.class)
-                .addAsManifestResource(new FileAsset(new File("src/main/webapp/META-INF/context.xml")), "context.xml")
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
-    }
-
-    @ArquillianResource
-    private URL webapp;
-
-    @Test
-    public void success() throws IOException {
-        assertEquals("200 Servlet!", get("userA", "test"));
-    }
-
-    @Test
-    public void failure() throws IOException {
-        assertThat(get("userA", "oops, wrong password"), startsWith("401"));
-    }
-
-    private String get(final String user, final String password) {
-        final BasicCredentialsProvider basicCredentialsProvider = new BasicCredentialsProvider();
-        basicCredentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(user, password));
-        final CloseableHttpClient client = HttpClients.custom()
-                .setDefaultCredentialsProvider(basicCredentialsProvider).build();
-
-        final HttpHost httpHost = new HttpHost(webapp.getHost(), webapp.getPort(), webapp.getProtocol());
-        final AuthCache authCache = new BasicAuthCache();
-        final BasicScheme basicAuth = new BasicScheme();
-        authCache.put(httpHost, basicAuth);
-        final HttpClientContext context = HttpClientContext.create();
-        context.setAuthCache(authCache);
-
-        final HttpGet get = new HttpGet(webapp.toExternalForm() + "servlet");
-        CloseableHttpResponse response = null;
-        try {
-            response = client.execute(httpHost, get, context);
-            return response.getStatusLine().getStatusCode() + " " + EntityUtils.toString(response.getEntity());
-        } catch (final IOException e) {
-            throw new IllegalStateException(e);
-        } finally {
-            try {
-                IO.close(response);
-            } catch (final IOException e) {
-                // no-op
-            }
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.apache.openejb.arquillian.common.IO;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.FileAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+@RunWith(Arquillian.class)
+public class AuthBeanTest {
+    @Deployment(testable = false)
+    public static WebArchive createDeployment() {
+        return ShrinkWrap.create(WebArchive.class, "low-typed-realm.war")
+                .addClasses(SecuredServlet.class, AuthBean.class)
+                .addAsManifestResource(new FileAsset(new File("src/main/webapp/META-INF/context.xml")), "context.xml")
+                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+    }
+
+    @ArquillianResource
+    private URL webapp;
+
+    @Test
+    public void success() throws IOException {
+        assertEquals("200 Servlet!", get("userA", "test"));
+    }
+
+    @Test
+    public void failure() throws IOException {
+        assertThat(get("userA", "oops, wrong password"), startsWith("401"));
+    }
+
+    private String get(final String user, final String password) {
+        final BasicCredentialsProvider basicCredentialsProvider = new BasicCredentialsProvider();
+        basicCredentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(user, password));
+        final CloseableHttpClient client = HttpClients.custom()
+                .setDefaultCredentialsProvider(basicCredentialsProvider).build();
+
+        final HttpHost httpHost = new HttpHost(webapp.getHost(), webapp.getPort(), webapp.getProtocol());
+        final AuthCache authCache = new BasicAuthCache();
+        final BasicScheme basicAuth = new BasicScheme();
+        authCache.put(httpHost, basicAuth);
+        final HttpClientContext context = HttpClientContext.create();
+        context.setAuthCache(authCache);
+
+        final HttpGet get = new HttpGet(webapp.toExternalForm() + "servlet");
+        CloseableHttpResponse response = null;
+        try {
+            response = client.execute(httpHost, get, context);
+            return response.getStatusLine().getStatusCode() + " " + EntityUtils.toString(response.getEntity());
+        } catch (final IOException e) {
+            throw new IllegalStateException(e);
+        } finally {
+            try {
+                IO.close(response);
+            } catch (final IOException e) {
+                // no-op
+            }
+        }
+    }
+}


[02/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java
----------------------------------------------------------------------
diff --git a/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java b/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java
index 8d6eed4..d893c25 100644
--- a/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java
+++ b/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java
@@ -1,68 +1,68 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.h3jpa;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-public class Movie {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long id;
-
-    private String director;
-    private String title;
-    private int year;
-
-    public Movie() {
-    }
-
-    public Movie(String director, String title, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.h3jpa;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Movie {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    private String director;
+    private String title;
+    private int year;
+
+    public Movie() {
+    }
+
+    public Movie(String director, String title, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java
----------------------------------------------------------------------
diff --git a/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java b/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java
index af15cff..e268eb9 100644
--- a/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java
+++ b/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java
@@ -1,45 +1,45 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.h3jpa;
-
-import javax.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Query;
-import java.util.List;
-
-@Stateful
-public class Movies {
-
-    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
-    private EntityManager entityManager;
-
-    public void addMovie(Movie movie) throws Exception {
-        entityManager.persist(movie);
-    }
-
-    public void deleteMovie(Movie movie) throws Exception {
-        entityManager.remove(movie);
-    }
-
-    public List<Movie> getMovies() throws Exception {
-        Query query = entityManager.createQuery("SELECT m from Movie as m");
-        return query.getResultList();
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.h3jpa;
+
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
+import java.util.List;
+
+@Stateful
+public class Movies {
+
+    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
+    private EntityManager entityManager;
+
+    public void addMovie(Movie movie) throws Exception {
+        entityManager.persist(movie);
+    }
+
+    public void deleteMovie(Movie movie) throws Exception {
+        entityManager.remove(movie);
+    }
+
+    public List<Movie> getMovies() throws Exception {
+        Query query = entityManager.createQuery("SELECT m from Movie as m");
+        return query.getResultList();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
----------------------------------------------------------------------
diff --git a/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java b/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
index 4f73ead..93f8d39 100644
--- a/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
+++ b/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
@@ -1,53 +1,53 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.injection.h3jpa;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
- */
-public class MoviesTest extends TestCase {
-
-    public void test() throws Exception {
-        final Properties p = new Properties();
-        p.put("movieDatabase", "new://Resource?type=DataSource");
-        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-        final Context context = EJBContainer.createEJBContainer(p).getContext();
-        Movies movies = (Movies) context.lookup("java:global/jpa-hibernate/Movies");
-
-        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
-        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
-
-        List<Movie> list = movies.getMovies();
-        assertEquals("List.size()", 3, list.size());
-
-        for (Movie movie : list) {
-            movies.deleteMovie(movie);
-        }
-
-        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.injection.h3jpa;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
+ */
+public class MoviesTest extends TestCase {
+
+    public void test() throws Exception {
+        final Properties p = new Properties();
+        p.put("movieDatabase", "new://Resource?type=DataSource");
+        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+        final Context context = EJBContainer.createEJBContainer(p).getContext();
+        Movies movies = (Movies) context.lookup("java:global/jpa-hibernate/Movies");
+
+        movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+        movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
+        movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+        List<Movie> list = movies.getMovies();
+        assertEquals("List.size()", 3, list.size());
+
+        for (Movie movie : list) {
+            movies.deleteMovie(movie);
+        }
+
+        assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
----------------------------------------------------------------------
diff --git a/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java b/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
index 817be8a..a0cfaa5 100644
--- a/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
+++ b/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
@@ -1,28 +1,28 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.jsf;
-
-import javax.ejb.Stateless;
-
-@Stateless
-public class Calculator {
-
-    public double add(double x, double y) {
-        return x + y;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.jsf;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class Calculator {
+
+    public double add(double x, double y) {
+        return x + y;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
----------------------------------------------------------------------
diff --git a/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java b/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
index 4dc2a16..84654ac 100644
--- a/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
+++ b/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.jsf;
-
-import javax.ejb.Remote;
-
-@Remote
-public interface Calculator {
-
-    public double add(double x, double y);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.jsf;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface Calculator {
+
+    public double add(double x, double y);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorImpl.java
----------------------------------------------------------------------
diff --git a/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorImpl.java b/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorImpl.java
index 43bedd0..a89b3af 100644
--- a/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorImpl.java
+++ b/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorImpl.java
@@ -1,28 +1,28 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.jsf;
-
-import javax.ejb.Stateless;
-
-@Stateless
-public class CalculatorImpl implements Calculator {
-
-    public double add(double x, double y) {
-        return x + y;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.jsf;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class CalculatorImpl implements Calculator {
+
+    public double add(double x, double y) {
+        return x + y;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/BlueBean.java
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/BlueBean.java b/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/BlueBean.java
index 468cba0..c7d4ebf 100644
--- a/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/BlueBean.java
+++ b/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/BlueBean.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ejblookup;
-
-import javax.ejb.EJBException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-//START SNIPPET: code
-public class BlueBean implements Friend {
-
-    public String sayHello() {
-        return "Blue says, Hello!";
-    }
-
-    public String helloFromFriend() {
-        try {
-            Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
-            return "My friend " + friend.sayHello();
-        } catch (NamingException e) {
-            throw new EJBException(e);
-        }
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ejblookup;
+
+import javax.ejb.EJBException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+//START SNIPPET: code
+public class BlueBean implements Friend {
+
+    public String sayHello() {
+        return "Blue says, Hello!";
+    }
+
+    public String helloFromFriend() {
+        try {
+            Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
+            return "My friend " + friend.sayHello();
+        } catch (NamingException e) {
+            throw new EJBException(e);
+        }
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/Friend.java
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/Friend.java b/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/Friend.java
index 7778acc..b499fb0 100644
--- a/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/Friend.java
+++ b/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/Friend.java
@@ -1,34 +1,34 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ejblookup;
-
-/**
- * This is an EJB 3 local business interface
- * A local business interface may be annotated with the @Local
- * annotation, but it's optional. A business interface which is
- * not annotated with @Local or @Remote is assumed to be Local
- * if the bean does not implement any other interfaces
- */
-//START SNIPPET: code
-public interface Friend {
-
-    public String sayHello();
-
-    public String helloFromFriend();
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ejblookup;
+
+/**
+ * This is an EJB 3 local business interface
+ * A local business interface may be annotated with the @Local
+ * annotation, but it's optional. A business interface which is
+ * not annotated with @Local or @Remote is assumed to be Local
+ * if the bean does not implement any other interfaces
+ */
+//START SNIPPET: code
+public interface Friend {
+
+    public String sayHello();
+
+    public String helloFromFriend();
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/RedBean.java
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/RedBean.java b/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/RedBean.java
index 4c95b70..c0cadec 100644
--- a/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/RedBean.java
+++ b/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/RedBean.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ejblookup;
-
-import javax.ejb.EJBException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-//START SNIPPET: code
-public class RedBean implements Friend {
-
-    public String sayHello() {
-        return "Red says, Hello!";
-    }
-
-    public String helloFromFriend() {
-        try {
-            Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
-            return "My friend " + friend.sayHello();
-        } catch (NamingException e) {
-            throw new EJBException(e);
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ejblookup;
+
+import javax.ejb.EJBException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+//START SNIPPET: code
+public class RedBean implements Friend {
+
+    public String sayHello() {
+        return "Red says, Hello!";
+    }
+
+    public String helloFromFriend() {
+        try {
+            Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
+            return "My friend " + friend.sayHello();
+        } catch (NamingException e) {
+            throw new EJBException(e);
+        }
+    }
+}
 //END SNIPPET: code
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java b/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
index 78f5686..1aa061c 100644
--- a/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
+++ b/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
@@ -1,54 +1,54 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ejblookup;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-
-//START SNIPPET: code
-public class EjbDependencyTest extends TestCase {
-
-    private Context context;
-
-    protected void setUp() throws Exception {
-        context = EJBContainer.createEJBContainer().getContext();
-    }
-
-    public void testRed() throws Exception {
-
-        Friend red = (Friend) context.lookup("java:global/wombat/RedBean");
-
-        assertNotNull(red);
-        assertEquals("Red says, Hello!", red.sayHello());
-        assertEquals("My friend Blue says, Hello!", red.helloFromFriend());
-
-    }
-
-    public void testBlue() throws Exception {
-
-        Friend blue = (Friend) context.lookup("java:global/wombat/BlueBean");
-
-        assertNotNull(blue);
-        assertEquals("Blue says, Hello!", blue.sayHello());
-        assertEquals("My friend Red says, Hello!", blue.helloFromFriend());
-
-    }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ejblookup;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+
+//START SNIPPET: code
+public class EjbDependencyTest extends TestCase {
+
+    private Context context;
+
+    protected void setUp() throws Exception {
+        context = EJBContainer.createEJBContainer().getContext();
+    }
+
+    public void testRed() throws Exception {
+
+        Friend red = (Friend) context.lookup("java:global/wombat/RedBean");
+
+        assertNotNull(red);
+        assertEquals("Red says, Hello!", red.sayHello());
+        assertEquals("My friend Blue says, Hello!", red.helloFromFriend());
+
+    }
+
+    public void testBlue() throws Exception {
+
+        Friend blue = (Friend) context.lookup("java:global/wombat/BlueBean");
+
+        assertNotNull(blue);
+        assertEquals("Blue says, Hello!", blue.sayHello());
+        assertEquals("My friend Red says, Hello!", blue.helloFromFriend());
+
+    }
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java b/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java
index e84823c..65b42e3 100644
--- a/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java
+++ b/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java
@@ -1,43 +1,43 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ejblookup;
-
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-//START SNIPPET: code
-@Stateless
-@EJB(beanInterface = Friend.class, beanName = "RedBean", name = "myFriend")
-public class BlueBean implements Friend {
-
-    public String sayHello() {
-        return "Blue says, Hello!";
-    }
-
-    public String helloFromFriend() {
-        try {
-            Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
-            return "My friend " + friend.sayHello();
-        } catch (NamingException e) {
-            throw new EJBException(e);
-        }
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ejblookup;
+
+import javax.ejb.EJB;
+import javax.ejb.EJBException;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+//START SNIPPET: code
+@Stateless
+@EJB(beanInterface = Friend.class, beanName = "RedBean", name = "myFriend")
+public class BlueBean implements Friend {
+
+    public String sayHello() {
+        return "Blue says, Hello!";
+    }
+
+    public String helloFromFriend() {
+        try {
+            Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
+            return "My friend " + friend.sayHello();
+        } catch (NamingException e) {
+            throw new EJBException(e);
+        }
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java b/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java
index 8a3c836..04803a2 100644
--- a/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java
+++ b/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ejblookup;
-
-import javax.ejb.Local;
-
-/**
- * This is an EJB 3 local business interface
- * A local business interface may be annotated with the @Local
- * annotation, but it's optional. A business interface which is
- * not annotated with @Local or @Remote is assumed to be Local
- * if the bean does not implement any other interfaces
- */
-//START SNIPPET: code
-@Local
-public interface Friend {
-
-    public String sayHello();
-
-    public String helloFromFriend();
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ejblookup;
+
+import javax.ejb.Local;
+
+/**
+ * This is an EJB 3 local business interface
+ * A local business interface may be annotated with the @Local
+ * annotation, but it's optional. A business interface which is
+ * not annotated with @Local or @Remote is assumed to be Local
+ * if the bean does not implement any other interfaces
+ */
+//START SNIPPET: code
+@Local
+public interface Friend {
+
+    public String sayHello();
+
+    public String helloFromFriend();
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java b/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java
index 6e76c893..ac853da 100644
--- a/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java
+++ b/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java
@@ -1,43 +1,43 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ejblookup;
-
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-//START SNIPPET: code
-@Stateless
-@EJB(beanInterface = Friend.class, beanName = "BlueBean", name = "myFriend")
-public class RedBean implements Friend {
-
-    public String sayHello() {
-        return "Red says, Hello!";
-    }
-
-    public String helloFromFriend() {
-        try {
-            Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
-            return "My friend " + friend.sayHello();
-        } catch (NamingException e) {
-            throw new EJBException(e);
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ejblookup;
+
+import javax.ejb.EJB;
+import javax.ejb.EJBException;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+//START SNIPPET: code
+@Stateless
+@EJB(beanInterface = Friend.class, beanName = "BlueBean", name = "myFriend")
+public class RedBean implements Friend {
+
+    public String sayHello() {
+        return "Red says, Hello!";
+    }
+
+    public String helloFromFriend() {
+        try {
+            Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
+            return "My friend " + friend.sayHello();
+        } catch (NamingException e) {
+            throw new EJBException(e);
+        }
+    }
+}
 //END SNIPPET: code
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java b/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
index b3b6504..a3bee25 100644
--- a/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
+++ b/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
@@ -1,54 +1,54 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.ejblookup;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-
-//START SNIPPET: code
-public class EjbDependencyTest extends TestCase {
-
-    private Context context;
-
-    protected void setUp() throws Exception {
-        context = EJBContainer.createEJBContainer().getContext();
-    }
-
-    public void testRed() throws Exception {
-
-        final Friend red = (Friend) context.lookup("java:global/lookup-of-ejbs/RedBean");
-
-        assertNotNull(red);
-        assertEquals("Red says, Hello!", red.sayHello());
-        assertEquals("My friend Blue says, Hello!", red.helloFromFriend());
-
-    }
-
-    public void testBlue() throws Exception {
-
-        final Friend blue = (Friend) context.lookup("java:global/lookup-of-ejbs/BlueBean");
-
-        assertNotNull(blue);
-        assertEquals("Blue says, Hello!", blue.sayHello());
-        assertEquals("My friend Red says, Hello!", blue.helloFromFriend());
-
-    }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.ejblookup;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+
+//START SNIPPET: code
+public class EjbDependencyTest extends TestCase {
+
+    private Context context;
+
+    protected void setUp() throws Exception {
+        context = EJBContainer.createEJBContainer().getContext();
+    }
+
+    public void testRed() throws Exception {
+
+        final Friend red = (Friend) context.lookup("java:global/lookup-of-ejbs/RedBean");
+
+        assertNotNull(red);
+        assertEquals("Red says, Hello!", red.sayHello());
+        assertEquals("My friend Blue says, Hello!", red.helloFromFriend());
+
+    }
+
+    public void testBlue() throws Exception {
+
+        final Friend blue = (Friend) context.lookup("java:global/lookup-of-ejbs/BlueBean");
+
+        assertNotNull(blue);
+        assertEquals("Blue says, Hello!", blue.sayHello());
+        assertEquals("My friend Red says, Hello!", blue.helloFromFriend());
+
+    }
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java
----------------------------------------------------------------------
diff --git a/examples/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java b/examples/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java
index 00c2eb3..8d28ecb 100755
--- a/examples/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java
+++ b/examples/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java
@@ -1,48 +1,48 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.mbean;
-
-import javax.management.Description;
-import javax.management.MBean;
-import javax.management.ManagedAttribute;
-import javax.management.ManagedOperation;
-
-@MBean
-@Description("play with me to guess a number")
-public class GuessHowManyMBean {
-
-    private int value = 0;
-
-    @ManagedAttribute
-    @Description("you are cheating!")
-    public int getValue() {
-        return value;
-    }
-
-    @ManagedAttribute
-    public void setValue(int value) {
-        this.value = value;
-    }
-
-    @ManagedOperation
-    public String tryValue(int userValue) {
-        if (userValue == value) {
-            return "winner";
-        }
-        return "not the correct value, please have another try";
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.mbean;
+
+import javax.management.Description;
+import javax.management.MBean;
+import javax.management.ManagedAttribute;
+import javax.management.ManagedOperation;
+
+@MBean
+@Description("play with me to guess a number")
+public class GuessHowManyMBean {
+
+    private int value = 0;
+
+    @ManagedAttribute
+    @Description("you are cheating!")
+    public int getValue() {
+        return value;
+    }
+
+    @ManagedAttribute
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    @ManagedOperation
+    public String tryValue(int userValue) {
+        if (userValue == value) {
+            return "winner";
+        }
+        return "not the correct value, please have another try";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java
----------------------------------------------------------------------
diff --git a/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java b/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java
index b74daf0..8714350 100755
--- a/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java
+++ b/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java
@@ -1,51 +1,51 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.mbean;
-
-import org.apache.openejb.monitoring.LocalMBeanServer;
-import org.junit.Test;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.management.Attribute;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import java.lang.management.ManagementFactory;
-import java.util.Properties;
-
-import static org.junit.Assert.assertEquals;
-
-public class GuessHowManyMBeanTest {
-
-    private static final String OBJECT_NAME = "openejb.user.mbeans:group=org.superbiz.mbean,application=mbean-auto-registration,name=GuessHowManyMBean";
-
-    @Test
-    public void play() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(LocalMBeanServer.OPENEJB_JMX_ACTIVE, Boolean.TRUE.toString());
-        EJBContainer container = EJBContainer.createEJBContainer(properties);
-
-        MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-        ObjectName objectName = new ObjectName(OBJECT_NAME);
-        assertEquals(0, server.getAttribute(objectName, "value"));
-        server.setAttribute(objectName, new Attribute("value", 3));
-        assertEquals(3, server.getAttribute(objectName, "value"));
-        assertEquals("winner", server.invoke(objectName, "tryValue", new Object[]{3}, null));
-        assertEquals("not the correct value, please have another try", server.invoke(objectName, "tryValue", new Object[]{2}, null));
-
-        container.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.mbean;
+
+import org.apache.openejb.monitoring.LocalMBeanServer;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.management.Attribute;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.lang.management.ManagementFactory;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+
+public class GuessHowManyMBeanTest {
+
+    private static final String OBJECT_NAME = "openejb.user.mbeans:group=org.superbiz.mbean,application=mbean-auto-registration,name=GuessHowManyMBean";
+
+    @Test
+    public void play() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(LocalMBeanServer.OPENEJB_JMX_ACTIVE, Boolean.TRUE.toString());
+        EJBContainer container = EJBContainer.createEJBContainer(properties);
+
+        MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+        ObjectName objectName = new ObjectName(OBJECT_NAME);
+        assertEquals(0, server.getAttribute(objectName, "value"));
+        server.setAttribute(objectName, new Attribute("value", 3));
+        assertEquals(3, server.getAttribute(objectName, "value"));
+        assertEquals("winner", server.invoke(objectName, "tryValue", new Object[]{3}, null));
+        assertEquals("not the correct value, please have another try", server.invoke(objectName, "tryValue", new Object[]{2}, null));
+
+        container.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/Movie.java
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/Movie.java b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/Movie.java
index bbeec38..4e067bb 100644
--- a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/Movie.java
+++ b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/Movie.java
@@ -1,102 +1,102 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.moviefun;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@Entity
-@XmlRootElement(name = "movie")
-public class Movie {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long id;
-
-    private String director;
-    private String title;
-    private int year;
-    private String genre;
-    private int rating;
-
-    public Movie() {
-    }
-
-    public Movie(String title, String director, String genre, int rating, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-        this.genre = genre;
-        this.rating = rating;
-    }
-
-    public Movie(String director, String title, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String genre) {
-        this.genre = genre;
-    }
-
-    public int getRating() {
-        return rating;
-    }
-
-    public void setRating(int rating) {
-        this.rating = rating;
-    }
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.moviefun;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@Entity
+@XmlRootElement(name = "movie")
+public class Movie {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    private String director;
+    private String title;
+    private int year;
+    private String genre;
+    private int rating;
+
+    public Movie() {
+    }
+
+    public Movie(String title, String director, String genre, int rating, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+        this.genre = genre;
+        this.rating = rating;
+    }
+
+    public Movie(String director, String title, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+    public String getGenre() {
+        return genre;
+    }
+
+    public void setGenre(String genre) {
+        this.genre = genre;
+    }
+
+    public int getRating() {
+        return rating;
+    }
+
+    public void setRating(int rating) {
+        this.rating = rating;
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/MoviesBean.java
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/MoviesBean.java b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/MoviesBean.java
index ff94d67..2580c9f 100644
--- a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/MoviesBean.java
+++ b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/MoviesBean.java
@@ -1,91 +1,91 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.moviefun;
-
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.EntityType;
-import java.util.List;
-
-@Stateless
-public class MoviesBean {
-
-    @PersistenceContext(unitName = "movie-unit")
-    private EntityManager entityManager;
-
-    public Movie find(Long id) {
-        return entityManager.find(Movie.class, id);
-    }
-
-    public void addMovie(Movie movie) {
-        entityManager.persist(movie);
-    }
-
-    public void editMovie(Movie movie) {
-        entityManager.merge(movie);
-    }
-
-    public void deleteMovie(long id) {
-        Movie movie = entityManager.find(Movie.class, id);
-        entityManager.remove(movie);
-    }
-
-    public List<Movie> getMovies(Integer firstResult, Integer maxResults, String field, String searchTerm) {
-        CriteriaBuilder qb = entityManager.getCriteriaBuilder();
-        CriteriaQuery<Movie> cq = qb.createQuery(Movie.class);
-        Root<Movie> root = cq.from(Movie.class);
-        EntityType<Movie> type = entityManager.getMetamodel().entity(Movie.class);
-        if (field != null && searchTerm != null && !"".equals(field.trim()) && !"".equals(searchTerm.trim())) {
-            Path<String> path = root.get(type.getDeclaredSingularAttribute(field.trim(), String.class));
-            Predicate condition = qb.like(path, "%" + searchTerm.trim() + "%");
-            cq.where(condition);
-        }
-        TypedQuery<Movie> q = entityManager.createQuery(cq);
-        if (maxResults != null) {
-            q.setMaxResults(maxResults);
-        }
-        if (firstResult != null) {
-            q.setFirstResult(firstResult);
-        }
-        return q.getResultList();
-    }
-
-    public int count(String field, String searchTerm) {
-        CriteriaBuilder qb = entityManager.getCriteriaBuilder();
-        CriteriaQuery<Long> cq = qb.createQuery(Long.class);
-        Root<Movie> root = cq.from(Movie.class);
-        EntityType<Movie> type = entityManager.getMetamodel().entity(Movie.class);
-        cq.select(qb.count(root));
-        if (field != null && searchTerm != null && !"".equals(field.trim()) && !"".equals(searchTerm.trim())) {
-            Path<String> path = root.get(type.getDeclaredSingularAttribute(field.trim(), String.class));
-            Predicate condition = qb.like(path, "%" + searchTerm.trim() + "%");
-            cq.where(condition);
-        }
-        return entityManager.createQuery(cq).getSingleResult().intValue();
-    }
-
-    public void clean() {
-        entityManager.createQuery("delete from Movie").executeUpdate();
-    }
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.moviefun;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.metamodel.EntityType;
+import java.util.List;
+
+@Stateless
+public class MoviesBean {
+
+    @PersistenceContext(unitName = "movie-unit")
+    private EntityManager entityManager;
+
+    public Movie find(Long id) {
+        return entityManager.find(Movie.class, id);
+    }
+
+    public void addMovie(Movie movie) {
+        entityManager.persist(movie);
+    }
+
+    public void editMovie(Movie movie) {
+        entityManager.merge(movie);
+    }
+
+    public void deleteMovie(long id) {
+        Movie movie = entityManager.find(Movie.class, id);
+        entityManager.remove(movie);
+    }
+
+    public List<Movie> getMovies(Integer firstResult, Integer maxResults, String field, String searchTerm) {
+        CriteriaBuilder qb = entityManager.getCriteriaBuilder();
+        CriteriaQuery<Movie> cq = qb.createQuery(Movie.class);
+        Root<Movie> root = cq.from(Movie.class);
+        EntityType<Movie> type = entityManager.getMetamodel().entity(Movie.class);
+        if (field != null && searchTerm != null && !"".equals(field.trim()) && !"".equals(searchTerm.trim())) {
+            Path<String> path = root.get(type.getDeclaredSingularAttribute(field.trim(), String.class));
+            Predicate condition = qb.like(path, "%" + searchTerm.trim() + "%");
+            cq.where(condition);
+        }
+        TypedQuery<Movie> q = entityManager.createQuery(cq);
+        if (maxResults != null) {
+            q.setMaxResults(maxResults);
+        }
+        if (firstResult != null) {
+            q.setFirstResult(firstResult);
+        }
+        return q.getResultList();
+    }
+
+    public int count(String field, String searchTerm) {
+        CriteriaBuilder qb = entityManager.getCriteriaBuilder();
+        CriteriaQuery<Long> cq = qb.createQuery(Long.class);
+        Root<Movie> root = cq.from(Movie.class);
+        EntityType<Movie> type = entityManager.getMetamodel().entity(Movie.class);
+        cq.select(qb.count(root));
+        if (field != null && searchTerm != null && !"".equals(field.trim()) && !"".equals(searchTerm.trim())) {
+            Path<String> path = root.get(type.getDeclaredSingularAttribute(field.trim(), String.class));
+            Predicate condition = qb.like(path, "%" + searchTerm.trim() + "%");
+            cq.where(condition);
+        }
+        return entityManager.createQuery(cq).getSingleResult().intValue();
+    }
+
+    public void clean() {
+        entityManager.createQuery("delete from Movie").executeUpdate();
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/ApplicationConfig.java
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/ApplicationConfig.java b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/ApplicationConfig.java
index 7466bb4..65c89fd 100644
--- a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/ApplicationConfig.java
+++ b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/ApplicationConfig.java
@@ -1,33 +1,33 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.moviefun.rest;
-
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-@ApplicationPath("/rest")
-public class ApplicationConfig extends Application {
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Set<Class<?>> getClasses() {
-        return new HashSet<Class<?>>(Arrays.asList(LoadRest.class, MoviesRest.class));
-    }
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.moviefun.rest;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+@ApplicationPath("/rest")
+public class ApplicationConfig extends Application {
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Set<Class<?>> getClasses() {
+        return new HashSet<Class<?>>(Arrays.asList(LoadRest.class, MoviesRest.class));
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/LoadRest.java
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/LoadRest.java b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/LoadRest.java
index a2b23d8..6969221 100644
--- a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/LoadRest.java
+++ b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/LoadRest.java
@@ -1,42 +1,42 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.moviefun.rest;
-
-import org.superbiz.moviefun.Movie;
-import org.superbiz.moviefun.MoviesBean;
-
-import javax.ejb.EJB;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-
-@Path("load")
-public class LoadRest {
-    @EJB
-    private MoviesBean moviesBean;
-
-    @POST
-    public void load() {
-        moviesBean.addMovie(new Movie("Wedding Crashers", "David Dobkin", "Comedy", 7, 2005));
-        moviesBean.addMovie(new Movie("Starsky & Hutch", "Todd Phillips", "Action", 6, 2004));
-        moviesBean.addMovie(new Movie("Shanghai Knights", "David Dobkin", "Action", 6, 2003));
-        moviesBean.addMovie(new Movie("I-Spy", "Betty Thomas", "Adventure", 5, 2002));
-        moviesBean.addMovie(new Movie("The Royal Tenenbaums", "Wes Anderson", "Comedy", 8, 2001));
-        moviesBean.addMovie(new Movie("Zoolander", "Ben Stiller", "Comedy", 6, 2001));
-        moviesBean.addMovie(new Movie("Shanghai Noon", "Tom Dey", "Comedy", 7, 2000));
-    }
-
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.moviefun.rest;
+
+import org.superbiz.moviefun.Movie;
+import org.superbiz.moviefun.MoviesBean;
+
+import javax.ejb.EJB;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+@Path("load")
+public class LoadRest {
+    @EJB
+    private MoviesBean moviesBean;
+
+    @POST
+    public void load() {
+        moviesBean.addMovie(new Movie("Wedding Crashers", "David Dobkin", "Comedy", 7, 2005));
+        moviesBean.addMovie(new Movie("Starsky & Hutch", "Todd Phillips", "Action", 6, 2004));
+        moviesBean.addMovie(new Movie("Shanghai Knights", "David Dobkin", "Action", 6, 2003));
+        moviesBean.addMovie(new Movie("I-Spy", "Betty Thomas", "Adventure", 5, 2002));
+        moviesBean.addMovie(new Movie("The Royal Tenenbaums", "Wes Anderson", "Comedy", 8, 2001));
+        moviesBean.addMovie(new Movie("Zoolander", "Ben Stiller", "Comedy", 6, 2001));
+        moviesBean.addMovie(new Movie("Shanghai Noon", "Tom Dey", "Comedy", 7, 2000));
+    }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/MoviesRest.java
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/MoviesRest.java b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/MoviesRest.java
index 946513c..335052a 100644
--- a/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/MoviesRest.java
+++ b/examples/moviefun-rest/src/main/java/org/superbiz/moviefun/rest/MoviesRest.java
@@ -1,80 +1,80 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.moviefun.rest;
-
-import org.superbiz.moviefun.Movie;
-import org.superbiz.moviefun.MoviesBean;
-
-import javax.ejb.EJB;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import java.util.List;
-
-@Path("movies")
-@Produces({"application/json"})
-public class MoviesRest {
-
-    @EJB
-    private MoviesBean service;
-
-    @GET
-    @Path("{id}")
-    public Movie find(@PathParam("id") Long id) {
-        return service.find(id);
-    }
-
-    @GET
-    public List<Movie> getMovies(@QueryParam("first") Integer first, @QueryParam("max") Integer max,
-                                 @QueryParam("field") String field, @QueryParam("searchTerm") String searchTerm) {
-        return service.getMovies(first, max, field, searchTerm);
-    }
-
-    @POST
-    @Consumes("application/json")
-    public Movie addMovie(Movie movie) {
-        service.addMovie(movie);
-        return movie;
-    }
-
-    @PUT
-    @Path("{id}")
-    @Consumes("application/json")
-    public Movie editMovie(Movie movie) {
-        service.editMovie(movie);
-        return movie;
-    }
-
-    @DELETE
-    @Path("{id}")
-    public void deleteMovie(@PathParam("id") long id) {
-        service.deleteMovie(id);
-    }
-
-    @GET
-    @Path("count")
-    public int count(@QueryParam("field") String field, @QueryParam("searchTerm") String searchTerm) {
-        return service.count(field, searchTerm);
-    }
-
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.moviefun.rest;
+
+import org.superbiz.moviefun.Movie;
+import org.superbiz.moviefun.MoviesBean;
+
+import javax.ejb.EJB;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import java.util.List;
+
+@Path("movies")
+@Produces({"application/json"})
+public class MoviesRest {
+
+    @EJB
+    private MoviesBean service;
+
+    @GET
+    @Path("{id}")
+    public Movie find(@PathParam("id") Long id) {
+        return service.find(id);
+    }
+
+    @GET
+    public List<Movie> getMovies(@QueryParam("first") Integer first, @QueryParam("max") Integer max,
+                                 @QueryParam("field") String field, @QueryParam("searchTerm") String searchTerm) {
+        return service.getMovies(first, max, field, searchTerm);
+    }
+
+    @POST
+    @Consumes("application/json")
+    public Movie addMovie(Movie movie) {
+        service.addMovie(movie);
+        return movie;
+    }
+
+    @PUT
+    @Path("{id}")
+    @Consumes("application/json")
+    public Movie editMovie(Movie movie) {
+        service.editMovie(movie);
+        return movie;
+    }
+
+    @DELETE
+    @Path("{id}")
+    public void deleteMovie(@PathParam("id") long id) {
+        service.deleteMovie(id);
+    }
+
+    @GET
+    @Path("count")
+    public int count(@QueryParam("field") String field, @QueryParam("searchTerm") String searchTerm) {
+        return service.count(field, searchTerm);
+    }
+
 }
\ No newline at end of file


[18/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
index 8d091b6..eabbae2 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
@@ -1,56 +1,56 @@
-/*
- * 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.jpa.integration.eclipselink;
-
-import org.eclipse.persistence.platform.server.JMXServerPlatformBase;
-import org.eclipse.persistence.sessions.DatabaseSession;
-import org.eclipse.persistence.transaction.JTATransactionController;
-
-import javax.management.MBeanServer;
-import javax.transaction.TransactionManager;
-
-public class OpenEJBServerPlatform extends JMXServerPlatformBase {
-    public OpenEJBServerPlatform(final DatabaseSession newDatabaseSession) {
-        super(newDatabaseSession);
-        try {
-            mBeanServer = MBeanServer.class.cast(
-                OpenEJBServerPlatform.class.getClassLoader().loadClass("org.apache.openejb.monitoring.LocalMBeanServer")
-                    .getMethod("get").invoke(null));
-        } catch (final Exception e) {
-            // no-op
-        }
-    }
-
-    @Override
-    public boolean isRuntimeServicesEnabledDefault() {
-        return "true".equalsIgnoreCase(System.getProperty("openejb.eclipselink.jmx", "true"));
-    }
-
-    @Override
-    public Class getExternalTransactionControllerClass() {
-        return OpenEJBJTATransactionController.class;
-    }
-
-    public static class OpenEJBJTATransactionController extends JTATransactionController {
-        @Override
-        protected TransactionManager acquireTransactionManager() throws Exception {
-            return TransactionManager.class.cast(
-                OpenEJBJTATransactionController.class.getClassLoader().loadClass("org.apache.openejb.OpenEJB")
-                    .getDeclaredMethod("getTransactionManager").invoke(null));
-        }
-    }
-}
+/*
+ * 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.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.platform.server.JMXServerPlatformBase;
+import org.eclipse.persistence.sessions.DatabaseSession;
+import org.eclipse.persistence.transaction.JTATransactionController;
+
+import javax.management.MBeanServer;
+import javax.transaction.TransactionManager;
+
+public class OpenEJBServerPlatform extends JMXServerPlatformBase {
+    public OpenEJBServerPlatform(final DatabaseSession newDatabaseSession) {
+        super(newDatabaseSession);
+        try {
+            mBeanServer = MBeanServer.class.cast(
+                OpenEJBServerPlatform.class.getClassLoader().loadClass("org.apache.openejb.monitoring.LocalMBeanServer")
+                    .getMethod("get").invoke(null));
+        } catch (final Exception e) {
+            // no-op
+        }
+    }
+
+    @Override
+    public boolean isRuntimeServicesEnabledDefault() {
+        return "true".equalsIgnoreCase(System.getProperty("openejb.eclipselink.jmx", "true"));
+    }
+
+    @Override
+    public Class getExternalTransactionControllerClass() {
+        return OpenEJBJTATransactionController.class;
+    }
+
+    public static class OpenEJBJTATransactionController extends JTATransactionController {
+        @Override
+        protected TransactionManager acquireTransactionManager() throws Exception {
+            return TransactionManager.class.cast(
+                OpenEJBJTATransactionController.class.getClassLoader().loadClass("org.apache.openejb.OpenEJB")
+                    .getDeclaredMethod("getTransactionManager").invoke(null));
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/doap_tomee.rdf
----------------------------------------------------------------------
diff --git a/doap_tomee.rdf b/doap_tomee.rdf
index ce0ca8b..506246b 100644
--- a/doap_tomee.rdf
+++ b/doap_tomee.rdf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ====================================================================== -->
 <!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
@@ -11,7 +11,7 @@
 <!--                                                                        -->
 <!-- ====================================================================== -->
 
-<rdf:RDF xml:lang="en" xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:asfext="http://projects.apache.org/ns/asfext#">
+<rdf:RDF xml:lang="en" xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:asfext="http://projects.apache.org/ns/asfext#">
   <Project rdf:about="http://tomee.apache.org/tomee">
 
     <!-- ====================================================================== -->
@@ -27,7 +27,7 @@
     <description xml:lang="en">Apache TomEE Web Profile delivers Servlets, JSP, JSF, JTA, JPA, CDI, Bean Validation and EJB
               Lite. Apache TomEE Plus has all the features of TomEE with the addition of JAX-RS (RESTfull Services),
               JAX-WS (Web Services), JMS (Java Message Service) and JCA (the Java Connector Architecture). The
-              additional functionality is delivered via Apache CXF, Apache ActiveMQ and the Geronimo Connector library</description>
+              additional functionality is delivered via Apache CXF, Apache ActiveMQ and the Geronimo Connector library</description>
     <shortdesc xml:lang="en">Apache TomEE is an all-Apache Java EE 6 Web Profile stack for Apache Tomcat</shortdesc>
 
     <!-- ====================================================================== -->
@@ -76,20 +76,20 @@
     <!-- Anonymous Source Repository.                                           -->
     <!-- ====================================================================== -->
 
-    <repository>
-      <Repository>
-        <location rdf:resource="http://svn.apache.org/viewvc/tomee/tomee/trunk/"/>
-      </Repository>
+    <repository>
+      <Repository>
+        <location rdf:resource="http://svn.apache.org/viewvc/tomee/tomee/trunk/"/>
+      </Repository>
     </repository>
 
     <!-- ====================================================================== -->
     <!-- Developer Source Repository.                                           -->
     <!-- ====================================================================== -->
 
-    <repository>
-      <Repository>
-        <location rdf:resource="https://svn.apache.org/repos/asf/tomee/tomee/trunk"/>
-      </Repository>
+    <repository>
+      <Repository>
+        <location rdf:resource="https://svn.apache.org/repos/asf/tomee/tomee/trunk"/>
+      </Repository>
     </repository>
 
     <!-- ====================================================================== -->
@@ -113,42 +113,42 @@
     <!-- ====================================================================== -->
     <!-- Project releases.                                                      -->
     <!-- ====================================================================== -->
-
-    <release>
-      <Version>
-        <name>Apache TomEE</name>
-        <revision>1.7.0</revision>
-        <file-release>http://repo.maven.apache.org/maven2/org/apache/openejb/tomee/1.7.0/tomee-1.7.0.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache OpenEJB</name>
-        <revision>4.7.0</revision>
-        <file-release>http://central.maven.org/maven2/org/apache/openejb/openejb/4.7.0/openejb-4.7.0.pom</file-release>
-      </Version>
+
+    <release>
+      <Version>
+        <name>Apache TomEE</name>
+        <revision>1.7.0</revision>
+        <file-release>http://repo.maven.apache.org/maven2/org/apache/openejb/tomee/1.7.0/tomee-1.7.0.pom</file-release>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>Apache OpenEJB</name>
+        <revision>4.7.0</revision>
+        <file-release>http://central.maven.org/maven2/org/apache/openejb/openejb/4.7.0/openejb-4.7.0.pom</file-release>
+      </Version>
     </release>
 
     <!-- ====================================================================== -->
     <!-- ASF extension.                                                         -->
     <!-- ====================================================================== -->
 
-    <asfext:pmc rdf:resource="http://tomee.apache.org"/>
-    <asfext:name>Apache TomEE</asfext:name>
-    <foaf:homepage rdf:resource="http://tomee.apache.org"/>
-    <asfext:charter>Apache TomEE provides an all-Apache Java EE 6 Web Profile stack for Apache Tomcat</asfext:charter>
-    <asfext:chair>
-      <foaf:Person>
-        <foaf:name>David Blevins</foaf:name>
-      </foaf:Person>
-    </asfext:chair>
-    <asfext:implements>
-      <asfext:Standard>
-        <asfext:title>Java EE 6 Web Profile</asfext:title>
-        <asfext:body>Java Community Process</asfext:body>
-        <asfext:id>JSR 316</asfext:id>
-        <asfext:url>https://jcp.org/en/jsr/detail?id=316</asfext:url>
-      </asfext:Standard>
-    </asfext:implements>
-  </Project>
+    <asfext:pmc rdf:resource="http://tomee.apache.org"/>
+    <asfext:name>Apache TomEE</asfext:name>
+    <foaf:homepage rdf:resource="http://tomee.apache.org"/>
+    <asfext:charter>Apache TomEE provides an all-Apache Java EE 6 Web Profile stack for Apache Tomcat</asfext:charter>
+    <asfext:chair>
+      <foaf:Person>
+        <foaf:name>David Blevins</foaf:name>
+      </foaf:Person>
+    </asfext:chair>
+    <asfext:implements>
+      <asfext:Standard>
+        <asfext:title>Java EE 6 Web Profile</asfext:title>
+        <asfext:body>Java Community Process</asfext:body>
+        <asfext:id>JSR 316</asfext:id>
+        <asfext:url>https://jcp.org/en/jsr/detail?id=316</asfext:url>
+      </asfext:Standard>
+    </asfext:implements>
+  </Project>
 </rdf:RDF>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/BusyBee.java
----------------------------------------------------------------------
diff --git a/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/BusyBee.java b/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/BusyBee.java
index 420bcc3..6cb0316 100644
--- a/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/BusyBee.java
+++ b/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/BusyBee.java
@@ -1,66 +1,66 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.accesstimeout;
-
-import org.superbiz.accesstimeout.api.AwaitBriefly;
-import org.superbiz.accesstimeout.api.AwaitForever;
-import org.superbiz.accesstimeout.api.AwaitNever;
-
-import javax.ejb.Asynchronous;
-import javax.ejb.Lock;
-import javax.ejb.Singleton;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
-
-import static javax.ejb.LockType.WRITE;
-
-/**
- * @version $Revision$ $Date$
- */
-@Singleton
-@Lock(WRITE)
-public class BusyBee {
-
-    @Asynchronous
-    public Future stayBusy(CountDownLatch ready) {
-        ready.countDown();
-
-        try {
-            new CountDownLatch(1).await();
-        } catch (InterruptedException e) {
-            Thread.interrupted();
-        }
-
-        return null;
-    }
-
-    @AwaitNever
-    public void doItNow() {
-        // do something
-    }
-
-    @AwaitBriefly
-    public void doItSoon() {
-        // do something
-    }
-
-    @AwaitForever
-    public void justDoIt() {
-        // do something
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.accesstimeout;
+
+import org.superbiz.accesstimeout.api.AwaitBriefly;
+import org.superbiz.accesstimeout.api.AwaitForever;
+import org.superbiz.accesstimeout.api.AwaitNever;
+
+import javax.ejb.Asynchronous;
+import javax.ejb.Lock;
+import javax.ejb.Singleton;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+
+import static javax.ejb.LockType.WRITE;
+
+/**
+ * @version $Revision$ $Date$
+ */
+@Singleton
+@Lock(WRITE)
+public class BusyBee {
+
+    @Asynchronous
+    public Future stayBusy(CountDownLatch ready) {
+        ready.countDown();
+
+        try {
+            new CountDownLatch(1).await();
+        } catch (InterruptedException e) {
+            Thread.interrupted();
+        }
+
+        return null;
+    }
+
+    @AwaitNever
+    public void doItNow() {
+        // do something
+    }
+
+    @AwaitBriefly
+    public void doItSoon() {
+        // do something
+    }
+
+    @AwaitForever
+    public void justDoIt() {
+        // do something
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitBriefly.java
----------------------------------------------------------------------
diff --git a/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitBriefly.java b/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitBriefly.java
index f42494a..7132780 100644
--- a/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitBriefly.java
+++ b/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitBriefly.java
@@ -1,33 +1,33 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.accesstimeout.api;
-
-import javax.ejb.AccessTimeout;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.concurrent.TimeUnit;
-
-@Metatype
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-
-@AccessTimeout(value = 5, unit = TimeUnit.SECONDS)
-public @interface AwaitBriefly {
-
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.accesstimeout.api;
+
+import javax.ejb.AccessTimeout;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.concurrent.TimeUnit;
+
+@Metatype
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+
+@AccessTimeout(value = 5, unit = TimeUnit.SECONDS)
+public @interface AwaitBriefly {
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitForever.java
----------------------------------------------------------------------
diff --git a/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitForever.java b/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitForever.java
index f40d43c..e0f1243 100644
--- a/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitForever.java
+++ b/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitForever.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.accesstimeout.api;
-
-import javax.ejb.AccessTimeout;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Metatype
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-
-@AccessTimeout(-1)
-public @interface AwaitForever {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.accesstimeout.api;
+
+import javax.ejb.AccessTimeout;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Metatype
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+
+@AccessTimeout(-1)
+public @interface AwaitForever {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitNever.java
----------------------------------------------------------------------
diff --git a/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitNever.java b/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitNever.java
index d3ad371..80c60af 100644
--- a/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitNever.java
+++ b/examples/access-timeout-meta/src/main/java/org/superbiz/accesstimeout/api/AwaitNever.java
@@ -1,32 +1,32 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.accesstimeout.api;
-
-import javax.ejb.AccessTimeout;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Metatype
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-
-@AccessTimeout(1)
-public @interface AwaitNever {
-
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.accesstimeout.api;
+
+import javax.ejb.AccessTimeout;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Metatype
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+
+@AccessTimeout(1)
+public @interface AwaitNever {
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/access-timeout-meta/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java
----------------------------------------------------------------------
diff --git a/examples/access-timeout-meta/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java b/examples/access-timeout-meta/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java
index 7d0e498..0d786cf 100644
--- a/examples/access-timeout-meta/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java
+++ b/examples/access-timeout-meta/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java
@@ -1,82 +1,82 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.accesstimeout;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @version $Revision$ $Date$
- */
-public class BusyBeeTest extends TestCase {
-
-    public void test() throws Exception {
-
-        final Context context = EJBContainer.createEJBContainer().getContext();
-
-        final CountDownLatch ready = new CountDownLatch(1);
-
-        final BusyBee busyBee = (BusyBee) context.lookup("java:global/access-timeout-meta/BusyBee");
-
-        // This asynchronous method will never exit 
-        busyBee.stayBusy(ready);
-
-        // Are you working yet little bee?
-        ready.await();
-
-        // OK, Bee is busy
-
-        { // Timeout Immediately
-            final long start = System.nanoTime();
-
-            try {
-                busyBee.doItNow();
-
-                fail("The bee should be busy");
-            } catch (Exception e) {
-                // the bee is still too busy as expected
-            }
-
-            assertEquals(0, seconds(start));
-        }
-
-        { // Timeout in 5 seconds
-            final long start = System.nanoTime();
-
-            try {
-                busyBee.doItSoon();
-
-                fail("The bee should be busy");
-            } catch (Exception e) {
-                // the bee is still too busy as expected
-            }
-
-            assertEquals(5, seconds(start));
-        }
-
-        // This will wait forever, give it a try if you have that long
-        //busyBee.justDoIt();
-    }
-
-    private long seconds(long start) {
-        return TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.accesstimeout;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public class BusyBeeTest extends TestCase {
+
+    public void test() throws Exception {
+
+        final Context context = EJBContainer.createEJBContainer().getContext();
+
+        final CountDownLatch ready = new CountDownLatch(1);
+
+        final BusyBee busyBee = (BusyBee) context.lookup("java:global/access-timeout-meta/BusyBee");
+
+        // This asynchronous method will never exit 
+        busyBee.stayBusy(ready);
+
+        // Are you working yet little bee?
+        ready.await();
+
+        // OK, Bee is busy
+
+        { // Timeout Immediately
+            final long start = System.nanoTime();
+
+            try {
+                busyBee.doItNow();
+
+                fail("The bee should be busy");
+            } catch (Exception e) {
+                // the bee is still too busy as expected
+            }
+
+            assertEquals(0, seconds(start));
+        }
+
+        { // Timeout in 5 seconds
+            final long start = System.nanoTime();
+
+            try {
+                busyBee.doItSoon();
+
+                fail("The bee should be busy");
+            } catch (Exception e) {
+                // the bee is still too busy as expected
+            }
+
+            assertEquals(5, seconds(start));
+        }
+
+        // This will wait forever, give it a try if you have that long
+        //busyBee.justDoIt();
+    }
+
+    private long seconds(long start) {
+        return TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/access-timeout/src/main/java/org/superbiz/accesstimeout/BusyBee.java
----------------------------------------------------------------------
diff --git a/examples/access-timeout/src/main/java/org/superbiz/accesstimeout/BusyBee.java b/examples/access-timeout/src/main/java/org/superbiz/accesstimeout/BusyBee.java
index e9c00f1..920b3a5 100644
--- a/examples/access-timeout/src/main/java/org/superbiz/accesstimeout/BusyBee.java
+++ b/examples/access-timeout/src/main/java/org/superbiz/accesstimeout/BusyBee.java
@@ -1,64 +1,64 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.accesstimeout;
-
-import javax.ejb.AccessTimeout;
-import javax.ejb.Asynchronous;
-import javax.ejb.Lock;
-import javax.ejb.Singleton;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import static javax.ejb.LockType.WRITE;
-
-/**
- * @version $Revision$ $Date$
- */
-@Singleton
-@Lock(WRITE)
-public class BusyBee {
-
-    @Asynchronous
-    public Future stayBusy(CountDownLatch ready) {
-        ready.countDown();
-
-        try {
-            new CountDownLatch(1).await();
-        } catch (InterruptedException e) {
-            Thread.interrupted();
-        }
-
-        return null;
-    }
-
-    @AccessTimeout(0)
-    public void doItNow() {
-        // do something
-    }
-
-    @AccessTimeout(value = 5, unit = TimeUnit.SECONDS)
-    public void doItSoon() {
-        // do something
-    }
-
-    @AccessTimeout(-1)
-    public void justDoIt() {
-        // do something
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.accesstimeout;
+
+import javax.ejb.AccessTimeout;
+import javax.ejb.Asynchronous;
+import javax.ejb.Lock;
+import javax.ejb.Singleton;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import static javax.ejb.LockType.WRITE;
+
+/**
+ * @version $Revision$ $Date$
+ */
+@Singleton
+@Lock(WRITE)
+public class BusyBee {
+
+    @Asynchronous
+    public Future stayBusy(CountDownLatch ready) {
+        ready.countDown();
+
+        try {
+            new CountDownLatch(1).await();
+        } catch (InterruptedException e) {
+            Thread.interrupted();
+        }
+
+        return null;
+    }
+
+    @AccessTimeout(0)
+    public void doItNow() {
+        // do something
+    }
+
+    @AccessTimeout(value = 5, unit = TimeUnit.SECONDS)
+    public void doItSoon() {
+        // do something
+    }
+
+    @AccessTimeout(-1)
+    public void justDoIt() {
+        // do something
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/access-timeout/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java
----------------------------------------------------------------------
diff --git a/examples/access-timeout/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java b/examples/access-timeout/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java
index 2201b6f..61d7bad 100644
--- a/examples/access-timeout/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java
+++ b/examples/access-timeout/src/test/java/org/superbiz/accesstimeout/BusyBeeTest.java
@@ -1,82 +1,82 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.accesstimeout;
-
-import junit.framework.TestCase;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @version $Revision$ $Date$
- */
-public class BusyBeeTest extends TestCase {
-
-    public void test() throws Exception {
-
-        final Context context = EJBContainer.createEJBContainer().getContext();
-
-        final CountDownLatch ready = new CountDownLatch(1);
-
-        final BusyBee busyBee = (BusyBee) context.lookup("java:global/access-timeout/BusyBee");
-
-        // This asynchronous method will never exit 
-        busyBee.stayBusy(ready);
-
-        // Are you working yet little bee?
-        ready.await();
-
-        // OK, Bee is busy
-
-        { // Timeout Immediately
-            final long start = System.nanoTime();
-
-            try {
-                busyBee.doItNow();
-
-                fail("The bee should be busy");
-            } catch (Exception e) {
-                // the bee is still too busy as expected
-            }
-
-            assertEquals(0, seconds(start));
-        }
-
-        { // Timeout in 5 seconds
-            final long start = System.nanoTime();
-
-            try {
-                busyBee.doItSoon();
-
-                fail("The bee should be busy");
-            } catch (Exception e) {
-                // the bee is still too busy as expected
-            }
-
-            assertEquals(5, seconds(start));
-        }
-
-        // This will wait forever, give it a try if you have that long
-        //busyBee.justDoIt();
-    }
-
-    private long seconds(long start) {
-        return TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.accesstimeout;
+
+import junit.framework.TestCase;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public class BusyBeeTest extends TestCase {
+
+    public void test() throws Exception {
+
+        final Context context = EJBContainer.createEJBContainer().getContext();
+
+        final CountDownLatch ready = new CountDownLatch(1);
+
+        final BusyBee busyBee = (BusyBee) context.lookup("java:global/access-timeout/BusyBee");
+
+        // This asynchronous method will never exit 
+        busyBee.stayBusy(ready);
+
+        // Are you working yet little bee?
+        ready.await();
+
+        // OK, Bee is busy
+
+        { // Timeout Immediately
+            final long start = System.nanoTime();
+
+            try {
+                busyBee.doItNow();
+
+                fail("The bee should be busy");
+            } catch (Exception e) {
+                // the bee is still too busy as expected
+            }
+
+            assertEquals(0, seconds(start));
+        }
+
+        { // Timeout in 5 seconds
+            final long start = System.nanoTime();
+
+            try {
+                busyBee.doItSoon();
+
+                fail("The bee should be busy");
+            } catch (Exception e) {
+                // the bee is still too busy as expected
+            }
+
+            assertEquals(5, seconds(start));
+        }
+
+        // This will wait forever, give it a try if you have that long
+        //busyBee.justDoIt();
+    }
+
+    private long seconds(long start) {
+        return TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movie.java
----------------------------------------------------------------------
diff --git a/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movie.java b/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movie.java
index bcc375a..106978f 100644
--- a/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movie.java
+++ b/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movie.java
@@ -1,61 +1,61 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.altdd;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Movie {
-
-    private String director;
-    private String title;
-    private int year;
-
-    public Movie() {
-    }
-
-    public Movie(String director, String title, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.altdd;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Movie {
+
+    private String director;
+    private String title;
+    private int year;
+
+    public Movie() {
+    }
+
+    public Movie(String director, String title, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movies.java
----------------------------------------------------------------------
diff --git a/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movies.java b/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movies.java
index 61e72ad..9317194 100644
--- a/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movies.java
+++ b/examples/alternate-descriptors/src/main/java/org/superbiz/altdd/Movies.java
@@ -1,50 +1,50 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.altdd;
-
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Query;
-import java.util.List;
-
-import static javax.ejb.TransactionAttributeType.MANDATORY;
-
-//START SNIPPET: code
-@Stateful
-@TransactionAttribute(MANDATORY)
-public class Movies {
-
-    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.TRANSACTION)
-    private EntityManager entityManager;
-
-    public void addMovie(Movie movie) throws Exception {
-        entityManager.persist(movie);
-    }
-
-    public void deleteMovie(Movie movie) throws Exception {
-        entityManager.remove(movie);
-    }
-
-    public List<Movie> getMovies() throws Exception {
-        Query query = entityManager.createQuery("SELECT m from Movie as m");
-        return query.getResultList();
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.altdd;
+
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
+import java.util.List;
+
+import static javax.ejb.TransactionAttributeType.MANDATORY;
+
+//START SNIPPET: code
+@Stateful
+@TransactionAttribute(MANDATORY)
+public class Movies {
+
+    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.TRANSACTION)
+    private EntityManager entityManager;
+
+    public void addMovie(Movie movie) throws Exception {
+        entityManager.persist(movie);
+    }
+
+    public void deleteMovie(Movie movie) throws Exception {
+        entityManager.remove(movie);
+    }
+
+    public List<Movie> getMovies() throws Exception {
+        Query query = entityManager.createQuery("SELECT m from Movie as m");
+        return query.getResultList();
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/alternate-descriptors/src/test/java/org/superbiz/altdd/MoviesTest.java
----------------------------------------------------------------------
diff --git a/examples/alternate-descriptors/src/test/java/org/superbiz/altdd/MoviesTest.java b/examples/alternate-descriptors/src/test/java/org/superbiz/altdd/MoviesTest.java
index 29a94e5..fbf0460 100644
--- a/examples/alternate-descriptors/src/test/java/org/superbiz/altdd/MoviesTest.java
+++ b/examples/alternate-descriptors/src/test/java/org/superbiz/altdd/MoviesTest.java
@@ -1,99 +1,99 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.altdd;
-
-import junit.framework.TestCase;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.embeddable.EJBContainer;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.transaction.RollbackException;
-import javax.transaction.UserTransaction;
-import java.util.List;
-import java.util.Properties;
-
-//START SNIPPET: code
-public class MoviesTest extends TestCase {
-
-    @EJB
-    private Movies movies;
-
-    @Resource
-    private UserTransaction userTransaction;
-
-    @PersistenceContext
-    private EntityManager entityManager;
-
-    public void setUp() throws Exception {
-        Properties p = new Properties();
-        p.put("movieDatabase", "new://Resource?type=DataSource");
-        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-        p.put("openejb.altdd.prefix", "test");
-
-        EJBContainer.createEJBContainer(p).getContext().bind("inject", this);
-    }
-
-    public void test() throws Exception {
-
-        userTransaction.begin();
-
-        try {
-            entityManager.persist(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
-            entityManager.persist(new Movie("Joel Coen", "Fargo", 1996));
-            entityManager.persist(new Movie("Joel Coen", "The Big Lebowski", 1998));
-
-            List<Movie> list = movies.getMovies();
-            assertEquals("List.size()", 3, list.size());
-
-            for (Movie movie : list) {
-                movies.deleteMovie(movie);
-            }
-
-            assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
-
-        } finally {
-            try {
-                userTransaction.commit();
-                fail("Transaction should have been rolled back");
-            } catch (RollbackException e) {
-                // Good, we don't want to clean up the db
-            }
-        }
-    }
-
-    public static class Interceptor {
-
-        @Resource
-        private SessionContext sessionContext;
-
-        @AroundInvoke
-        public Object invoke(InvocationContext context) throws Exception {
-
-            sessionContext.setRollbackOnly();
-
-            return context.proceed();
-        }
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.altdd;
+
+import junit.framework.TestCase;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.ejb.SessionContext;
+import javax.ejb.embeddable.EJBContainer;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.RollbackException;
+import javax.transaction.UserTransaction;
+import java.util.List;
+import java.util.Properties;
+
+//START SNIPPET: code
+public class MoviesTest extends TestCase {
+
+    @EJB
+    private Movies movies;
+
+    @Resource
+    private UserTransaction userTransaction;
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    public void setUp() throws Exception {
+        Properties p = new Properties();
+        p.put("movieDatabase", "new://Resource?type=DataSource");
+        p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+        p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+        p.put("openejb.altdd.prefix", "test");
+
+        EJBContainer.createEJBContainer(p).getContext().bind("inject", this);
+    }
+
+    public void test() throws Exception {
+
+        userTransaction.begin();
+
+        try {
+            entityManager.persist(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
+            entityManager.persist(new Movie("Joel Coen", "Fargo", 1996));
+            entityManager.persist(new Movie("Joel Coen", "The Big Lebowski", 1998));
+
+            List<Movie> list = movies.getMovies();
+            assertEquals("List.size()", 3, list.size());
+
+            for (Movie movie : list) {
+                movies.deleteMovie(movie);
+            }
+
+            assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
+
+        } finally {
+            try {
+                userTransaction.commit();
+                fail("Transaction should have been rolled back");
+            } catch (RollbackException e) {
+                // Good, we don't want to clean up the db
+            }
+        }
+    }
+
+    public static class Interceptor {
+
+        @Resource
+        private SessionContext sessionContext;
+
+        @AroundInvoke
+        public Object invoke(InvocationContext context) throws Exception {
+
+            sessionContext.setRollbackOnly();
+
+            return context.proceed();
+        }
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applet/src/main/java/org/superbiz/applet/Calculator.java
----------------------------------------------------------------------
diff --git a/examples/applet/src/main/java/org/superbiz/applet/Calculator.java b/examples/applet/src/main/java/org/superbiz/applet/Calculator.java
index bb34178..7362de0 100644
--- a/examples/applet/src/main/java/org/superbiz/applet/Calculator.java
+++ b/examples/applet/src/main/java/org/superbiz/applet/Calculator.java
@@ -1,25 +1,25 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.applet;
-
-import javax.ejb.Remote;
-
-@Remote
-public interface Calculator {
-
-    public double add(double x, double y);
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.applet;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface Calculator {
+
+    public double add(double x, double y);
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applet/src/main/java/org/superbiz/applet/CalculatorApplet.java
----------------------------------------------------------------------
diff --git a/examples/applet/src/main/java/org/superbiz/applet/CalculatorApplet.java b/examples/applet/src/main/java/org/superbiz/applet/CalculatorApplet.java
index eb16e25..52703ad 100644
--- a/examples/applet/src/main/java/org/superbiz/applet/CalculatorApplet.java
+++ b/examples/applet/src/main/java/org/superbiz/applet/CalculatorApplet.java
@@ -1,100 +1,100 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.applet;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Properties;
-
-public class CalculatorApplet extends JApplet {
-
-    JTextArea area;
-
-    JTextField field1;
-    JTextField field2;
-    JLabel label1;
-    JLabel label2;
-    JButton button;
-    JLabel label3;
-    Context ctx;
-
-    public void init() {
-        try {
-            SwingUtilities.invokeAndWait(new Runnable() {
-                public void run() {
-                    createUI();
-                }
-            });
-        } catch (Exception e) {
-            System.err.println("createGUI didn't successfully complete");
-        }
-
-    }
-
-    private void createUI() {
-        field1 = new JTextField();
-        field2 = new JTextField();
-        label1 = new JLabel("Enter first number");
-        label2 = new JLabel("Enter second number");
-        label3 = new JLabel("RESULT=");
-        button = new JButton("Add");
-
-        setLayout(new GridLayout(3, 2));
-        add(label1);
-        add(field1);
-        add(label2);
-        add(field2);
-        add(button);
-        add(label3);
-        Properties props = new Properties();
-        props.put(Context.INITIAL_CONTEXT_FACTORY,
-                "org.apache.openejb.client.RemoteInitialContextFactory");
-        props.put(Context.PROVIDER_URL, "http://127.0.0.1:8080/applet/ejb");
-        try {
-            ctx = new InitialContext(props);
-        } catch (NamingException e) {
-            throw new RuntimeException(e);
-        }
-        button.addActionListener(new ActionListener() {
-
-            public void actionPerformed(ActionEvent e) {
-
-                try {
-                    final Object ref = ctx.lookup("CalculatorImplRemote");
-                    Calculator calc = (Calculator) PortableRemoteObject.narrow(
-                            ref, Calculator.class);
-                    String text1 = field1.getText();
-                    String text2 = field2.getText();
-                    int num1 = Integer.parseInt(text1);
-                    int num2 = Integer.parseInt(text2);
-                    double result = calc.add(num1, num2);
-                    label3.setText("RESULT=" + result);
-                } catch (NamingException ex) {
-                    throw new RuntimeException(ex);
-                }
-
-            }
-        });
-
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.applet;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.rmi.PortableRemoteObject;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Properties;
+
+public class CalculatorApplet extends JApplet {
+
+    JTextArea area;
+
+    JTextField field1;
+    JTextField field2;
+    JLabel label1;
+    JLabel label2;
+    JButton button;
+    JLabel label3;
+    Context ctx;
+
+    public void init() {
+        try {
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    createUI();
+                }
+            });
+        } catch (Exception e) {
+            System.err.println("createGUI didn't successfully complete");
+        }
+
+    }
+
+    private void createUI() {
+        field1 = new JTextField();
+        field2 = new JTextField();
+        label1 = new JLabel("Enter first number");
+        label2 = new JLabel("Enter second number");
+        label3 = new JLabel("RESULT=");
+        button = new JButton("Add");
+
+        setLayout(new GridLayout(3, 2));
+        add(label1);
+        add(field1);
+        add(label2);
+        add(field2);
+        add(button);
+        add(label3);
+        Properties props = new Properties();
+        props.put(Context.INITIAL_CONTEXT_FACTORY,
+                "org.apache.openejb.client.RemoteInitialContextFactory");
+        props.put(Context.PROVIDER_URL, "http://127.0.0.1:8080/applet/ejb");
+        try {
+            ctx = new InitialContext(props);
+        } catch (NamingException e) {
+            throw new RuntimeException(e);
+        }
+        button.addActionListener(new ActionListener() {
+
+            public void actionPerformed(ActionEvent e) {
+
+                try {
+                    final Object ref = ctx.lookup("CalculatorImplRemote");
+                    Calculator calc = (Calculator) PortableRemoteObject.narrow(
+                            ref, Calculator.class);
+                    String text1 = field1.getText();
+                    String text2 = field2.getText();
+                    int num1 = Integer.parseInt(text1);
+                    int num2 = Integer.parseInt(text2);
+                    double result = calc.add(num1, num2);
+                    label3.setText("RESULT=" + result);
+                } catch (NamingException ex) {
+                    throw new RuntimeException(ex);
+                }
+
+            }
+        });
+
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applet/src/main/java/org/superbiz/applet/CalculatorImpl.java
----------------------------------------------------------------------
diff --git a/examples/applet/src/main/java/org/superbiz/applet/CalculatorImpl.java b/examples/applet/src/main/java/org/superbiz/applet/CalculatorImpl.java
index 6fccc92..ef0c074 100644
--- a/examples/applet/src/main/java/org/superbiz/applet/CalculatorImpl.java
+++ b/examples/applet/src/main/java/org/superbiz/applet/CalculatorImpl.java
@@ -1,28 +1,28 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.applet;
-
-import javax.ejb.Stateless;
-
-@Stateless
-public class CalculatorImpl implements Calculator {
-
-    public double add(double x, double y) {
-        return x + y;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.applet;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class CalculatorImpl implements Calculator {
+
+    public double add(double x, double y) {
+        return x + y;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/applet/src/test/java/org/superbiz/JNDILookupTest.java
----------------------------------------------------------------------
diff --git a/examples/applet/src/test/java/org/superbiz/JNDILookupTest.java b/examples/applet/src/test/java/org/superbiz/JNDILookupTest.java
index 1663148..45bf18e 100644
--- a/examples/applet/src/test/java/org/superbiz/JNDILookupTest.java
+++ b/examples/applet/src/test/java/org/superbiz/JNDILookupTest.java
@@ -1,46 +1,46 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.superbiz.applet.Calculator;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-import java.util.Properties;
-
-public class JNDILookupTest {
-
-    @Test
-    public void test() {
-        Properties props = new Properties();
-        props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
-        props.put(Context.PROVIDER_URL, "http://127.0.0.1:8080/tomee/ejb");
-        try {
-            Context ctx = new InitialContext(props);
-            System.out.println("Found context " + ctx);
-            final Object ref = ctx.lookup("CalculatorImplRemote");
-            Calculator calc = (Calculator) PortableRemoteObject.narrow(ref, Calculator.class);
-            double result = calc.add(10, 30);
-            Assert.assertEquals(40, result, 0.5);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.superbiz.applet.Calculator;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+import java.util.Properties;
+
+public class JNDILookupTest {
+
+    @Test
+    public void test() {
+        Properties props = new Properties();
+        props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+        props.put(Context.PROVIDER_URL, "http://127.0.0.1:8080/tomee/ejb");
+        try {
+            Context ctx = new InitialContext(props);
+            System.out.println("Found context " + ctx);
+            final Object ref = ctx.lookup("CalculatorImplRemote");
+            Calculator calc = (Calculator) PortableRemoteObject.narrow(ref, Calculator.class);
+            double result = calc.add(10, 30);
+            Assert.assertEquals(40, result, 0.5);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/application-composer/src/main/java/org/superbiz/composed/Movie.java
----------------------------------------------------------------------
diff --git a/examples/application-composer/src/main/java/org/superbiz/composed/Movie.java b/examples/application-composer/src/main/java/org/superbiz/composed/Movie.java
index 88d71df..143f2ab 100644
--- a/examples/application-composer/src/main/java/org/superbiz/composed/Movie.java
+++ b/examples/application-composer/src/main/java/org/superbiz/composed/Movie.java
@@ -1,61 +1,61 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.composed;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Movie {
-
-    private String director;
-    private String title;
-    private int year;
-
-    public Movie() {
-    }
-
-    public Movie(String director, String title, int year) {
-        this.director = director;
-        this.title = title;
-        this.year = year;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.composed;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Movie {
+
+    private String director;
+    private String title;
+    private int year;
+
+    public Movie() {
+    }
+
+    public Movie(String director, String title, int year) {
+        this.director = director;
+        this.title = title;
+        this.year = year;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/application-composer/src/main/java/org/superbiz/composed/Movies.java
----------------------------------------------------------------------
diff --git a/examples/application-composer/src/main/java/org/superbiz/composed/Movies.java b/examples/application-composer/src/main/java/org/superbiz/composed/Movies.java
index 36b2343..417280e 100644
--- a/examples/application-composer/src/main/java/org/superbiz/composed/Movies.java
+++ b/examples/application-composer/src/main/java/org/superbiz/composed/Movies.java
@@ -1,31 +1,31 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.composed;
-
-import java.util.List;
-
-/**
- * @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
- */
-public interface Movies {
-
-    void addMovie(Movie movie) throws Exception;
-
-    void deleteMovie(Movie movie) throws Exception;
-
-    List<Movie> getMovies() throws Exception;
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.composed;
+
+import java.util.List;
+
+/**
+ * @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
+ */
+public interface Movies {
+
+    void addMovie(Movie movie) throws Exception;
+
+    void deleteMovie(Movie movie) throws Exception;
+
+    List<Movie> getMovies() throws Exception;
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/application-composer/src/main/java/org/superbiz/composed/MoviesImpl.java
----------------------------------------------------------------------
diff --git a/examples/application-composer/src/main/java/org/superbiz/composed/MoviesImpl.java b/examples/application-composer/src/main/java/org/superbiz/composed/MoviesImpl.java
index 933d53e..b99f2e5 100644
--- a/examples/application-composer/src/main/java/org/superbiz/composed/MoviesImpl.java
+++ b/examples/application-composer/src/main/java/org/superbiz/composed/MoviesImpl.java
@@ -1,50 +1,50 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.composed;
-
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Query;
-import java.util.List;
-
-import static javax.ejb.TransactionAttributeType.MANDATORY;
-
-//START SNIPPET: code
-@Stateful(name = "Movies")
-@TransactionAttribute(MANDATORY)
-public class MoviesImpl implements Movies {
-
-    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.TRANSACTION)
-    private EntityManager entityManager;
-
-    public void addMovie(Movie movie) throws Exception {
-        entityManager.persist(movie);
-    }
-
-    public void deleteMovie(Movie movie) throws Exception {
-        entityManager.remove(movie);
-    }
-
-    public List<Movie> getMovies() throws Exception {
-        Query query = entityManager.createQuery("SELECT m from Movie as m");
-        return query.getResultList();
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.composed;
+
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
+import java.util.List;
+
+import static javax.ejb.TransactionAttributeType.MANDATORY;
+
+//START SNIPPET: code
+@Stateful(name = "Movies")
+@TransactionAttribute(MANDATORY)
+public class MoviesImpl implements Movies {
+
+    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.TRANSACTION)
+    private EntityManager entityManager;
+
+    public void addMovie(Movie movie) throws Exception {
+        entityManager.persist(movie);
+    }
+
+    public void deleteMovie(Movie movie) throws Exception {
+        entityManager.remove(movie);
+    }
+
+    public List<Movie> getMovies() throws Exception {
+        Query query = entityManager.createQuery("SELECT m from Movie as m");
+        return query.getResultList();
+    }
+}
+//END SNIPPET: code


[43/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyJoinColumn.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyJoinColumn.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyJoinColumn.java
index 5bdbb49..ef0e3b6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyJoinColumn.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MapKeyJoinColumn.java
@@ -1,243 +1,243 @@
-/**
- * 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.XmlType;
-
-
-/**
- * @Target({METHOD, FIELD}) @Retention(RUNTIME)
- * public @interface MapKeyJoinColumn {
- * String name() default "";
- * String referencedColumnName() default "";
- * boolean unique() default false;
- * boolean nullable() default false;
- * boolean insertable() default true;
- * boolean updatable() default true;
- * String columnDefinition() default "";
- * String table() default "";
- * }
- * <p/>
- * <p/>
- * <p/>
- * <p>Java class for map-key-join-column complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="map-key-join-column">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="referenced-column-name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="unique" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="nullable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="insertable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="updatable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="column-definition" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="table" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "map-key-join-column")
-public class MapKeyJoinColumn {
-
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute(name = "referenced-column-name")
-    protected String referencedColumnName;
-    @XmlAttribute
-    protected Boolean unique;
-    @XmlAttribute
-    protected Boolean nullable;
-    @XmlAttribute
-    protected Boolean insertable;
-    @XmlAttribute
-    protected Boolean updatable;
-    @XmlAttribute(name = "column-definition")
-    protected String columnDefinition;
-    @XmlAttribute
-    protected String table;
-
-    /**
-     * 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 referencedColumnName property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getReferencedColumnName() {
-        return referencedColumnName;
-    }
-
-    /**
-     * Sets the value of the referencedColumnName property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setReferencedColumnName(final String value) {
-        this.referencedColumnName = value;
-    }
-
-    /**
-     * Gets the value of the unique property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isUnique() {
-        return unique;
-    }
-
-    /**
-     * Sets the value of the unique property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setUnique(final Boolean value) {
-        this.unique = value;
-    }
-
-    /**
-     * Gets the value of the nullable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isNullable() {
-        return nullable;
-    }
-
-    /**
-     * Sets the value of the nullable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setNullable(final Boolean value) {
-        this.nullable = value;
-    }
-
-    /**
-     * Gets the value of the insertable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isInsertable() {
-        return insertable;
-    }
-
-    /**
-     * Sets the value of the insertable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setInsertable(final Boolean value) {
-        this.insertable = value;
-    }
-
-    /**
-     * Gets the value of the updatable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isUpdatable() {
-        return updatable;
-    }
-
-    /**
-     * Sets the value of the updatable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setUpdatable(final Boolean value) {
-        this.updatable = value;
-    }
-
-    /**
-     * Gets the value of the columnDefinition property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getColumnDefinition() {
-        return columnDefinition;
-    }
-
-    /**
-     * Sets the value of the columnDefinition property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setColumnDefinition(final String value) {
-        this.columnDefinition = value;
-    }
-
-    /**
-     * Gets the value of the table property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getTable() {
-        return table;
-    }
-
-    /**
-     * Sets the value of the table property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setTable(final String value) {
-        this.table = 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.XmlType;
+
+
+/**
+ * @Target({METHOD, FIELD}) @Retention(RUNTIME)
+ * public @interface MapKeyJoinColumn {
+ * String name() default "";
+ * String referencedColumnName() default "";
+ * boolean unique() default false;
+ * boolean nullable() default false;
+ * boolean insertable() default true;
+ * boolean updatable() default true;
+ * String columnDefinition() default "";
+ * String table() default "";
+ * }
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p>Java class for map-key-join-column complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="map-key-join-column">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="referenced-column-name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="unique" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="nullable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="insertable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="updatable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="column-definition" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="table" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "map-key-join-column")
+public class MapKeyJoinColumn {
+
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute(name = "referenced-column-name")
+    protected String referencedColumnName;
+    @XmlAttribute
+    protected Boolean unique;
+    @XmlAttribute
+    protected Boolean nullable;
+    @XmlAttribute
+    protected Boolean insertable;
+    @XmlAttribute
+    protected Boolean updatable;
+    @XmlAttribute(name = "column-definition")
+    protected String columnDefinition;
+    @XmlAttribute
+    protected String table;
+
+    /**
+     * 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 referencedColumnName property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getReferencedColumnName() {
+        return referencedColumnName;
+    }
+
+    /**
+     * Sets the value of the referencedColumnName property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setReferencedColumnName(final String value) {
+        this.referencedColumnName = value;
+    }
+
+    /**
+     * Gets the value of the unique property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isUnique() {
+        return unique;
+    }
+
+    /**
+     * Sets the value of the unique property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setUnique(final Boolean value) {
+        this.unique = value;
+    }
+
+    /**
+     * Gets the value of the nullable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isNullable() {
+        return nullable;
+    }
+
+    /**
+     * Sets the value of the nullable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setNullable(final Boolean value) {
+        this.nullable = value;
+    }
+
+    /**
+     * Gets the value of the insertable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isInsertable() {
+        return insertable;
+    }
+
+    /**
+     * Sets the value of the insertable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setInsertable(final Boolean value) {
+        this.insertable = value;
+    }
+
+    /**
+     * Gets the value of the updatable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isUpdatable() {
+        return updatable;
+    }
+
+    /**
+     * Sets the value of the updatable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setUpdatable(final Boolean value) {
+        this.updatable = value;
+    }
+
+    /**
+     * Gets the value of the columnDefinition property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getColumnDefinition() {
+        return columnDefinition;
+    }
+
+    /**
+     * Sets the value of the columnDefinition property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setColumnDefinition(final String value) {
+        this.columnDefinition = value;
+    }
+
+    /**
+     * Gets the value of the table property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getTable() {
+        return table;
+    }
+
+    /**
+     * Sets the value of the table property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setTable(final String value) {
+        this.table = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OrderColumn.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OrderColumn.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OrderColumn.java
index 96cb5fa..398d0b8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OrderColumn.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OrderColumn.java
@@ -1,171 +1,171 @@
-/**
- * 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.XmlType;
-
-
-/**
- * @Target({METHOD, FIELD}) @Retention(RUNTIME)
- * public @interface OrderColumn {
- * String name() default "";
- * boolean nullable() default true;
- * boolean insertable() default true;
- * boolean updatable() default true;
- * String columnDefinition() default "";
- * }
- * <p/>
- * <p/>
- * <p/>
- * <p>Java class for order-column complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="order-column">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="nullable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="insertable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="updatable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="column-definition" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "order-column")
-public class OrderColumn {
-
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected Boolean nullable;
-    @XmlAttribute
-    protected Boolean insertable;
-    @XmlAttribute
-    protected Boolean updatable;
-    @XmlAttribute(name = "column-definition")
-    protected String columnDefinition;
-
-    /**
-     * 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 nullable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isNullable() {
-        return nullable;
-    }
-
-    /**
-     * Sets the value of the nullable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setNullable(final Boolean value) {
-        this.nullable = value;
-    }
-
-    /**
-     * Gets the value of the insertable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isInsertable() {
-        return insertable;
-    }
-
-    /**
-     * Sets the value of the insertable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setInsertable(final Boolean value) {
-        this.insertable = value;
-    }
-
-    /**
-     * Gets the value of the updatable property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isUpdatable() {
-        return updatable;
-    }
-
-    /**
-     * Sets the value of the updatable property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setUpdatable(final Boolean value) {
-        this.updatable = value;
-    }
-
-    /**
-     * Gets the value of the columnDefinition property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getColumnDefinition() {
-        return columnDefinition;
-    }
-
-    /**
-     * Sets the value of the columnDefinition property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setColumnDefinition(final String value) {
-        this.columnDefinition = 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.XmlType;
+
+
+/**
+ * @Target({METHOD, FIELD}) @Retention(RUNTIME)
+ * public @interface OrderColumn {
+ * String name() default "";
+ * boolean nullable() default true;
+ * boolean insertable() default true;
+ * boolean updatable() default true;
+ * String columnDefinition() default "";
+ * }
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p>Java class for order-column complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="order-column">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="nullable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="insertable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="updatable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="column-definition" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "order-column")
+public class OrderColumn {
+
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected Boolean nullable;
+    @XmlAttribute
+    protected Boolean insertable;
+    @XmlAttribute
+    protected Boolean updatable;
+    @XmlAttribute(name = "column-definition")
+    protected String columnDefinition;
+
+    /**
+     * 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 nullable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isNullable() {
+        return nullable;
+    }
+
+    /**
+     * Sets the value of the nullable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setNullable(final Boolean value) {
+        this.nullable = value;
+    }
+
+    /**
+     * Gets the value of the insertable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isInsertable() {
+        return insertable;
+    }
+
+    /**
+     * Sets the value of the insertable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setInsertable(final Boolean value) {
+        this.insertable = value;
+    }
+
+    /**
+     * Gets the value of the updatable property.
+     *
+     * @return possible object is
+     * {@link Boolean }
+     */
+    public Boolean isUpdatable() {
+        return updatable;
+    }
+
+    /**
+     * Sets the value of the updatable property.
+     *
+     * @param value allowed object is
+     *              {@link Boolean }
+     */
+    public void setUpdatable(final Boolean value) {
+        this.updatable = value;
+    }
+
+    /**
+     * Gets the value of the columnDefinition property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getColumnDefinition() {
+        return columnDefinition;
+    }
+
+    /**
+     * Sets the value of the columnDefinition property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setColumnDefinition(final String value) {
+        this.columnDefinition = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/CompatibilityDescriptionGroup.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/CompatibilityDescriptionGroup.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/CompatibilityDescriptionGroup.java
index 9e2e55f..3b63a54 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/CompatibilityDescriptionGroup.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/CompatibilityDescriptionGroup.java
@@ -1,130 +1,130 @@
-/**
- * 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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for CompatibilityDescriptionGroup complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="CompatibilityDescriptionGroup">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}DescriptionGroup">
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="largeIcon" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="smallIcon" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CompatibilityDescriptionGroup")
-public class CompatibilityDescriptionGroup extends DescriptionGroup {
-
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String displayName;
-    @XmlAttribute
-    protected String largeIcon;
-    @XmlAttribute
-    protected String smallIcon;
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the displayName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    /**
-     * Sets the value of the displayName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDisplayName(final String value) {
-        this.displayName = value;
-    }
-
-    /**
-     * Gets the value of the largeIcon property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLargeIcon() {
-        return largeIcon;
-    }
-
-    /**
-     * Sets the value of the largeIcon property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLargeIcon(final String value) {
-        this.largeIcon = value;
-    }
-
-    /**
-     * Gets the value of the smallIcon property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getSmallIcon() {
-        return smallIcon;
-    }
-
-    /**
-     * Sets the value of the smallIcon property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setSmallIcon(final String value) {
-        this.smallIcon = 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for CompatibilityDescriptionGroup complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="CompatibilityDescriptionGroup">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}DescriptionGroup">
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="largeIcon" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="smallIcon" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CompatibilityDescriptionGroup")
+public class CompatibilityDescriptionGroup extends DescriptionGroup {
+
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String displayName;
+    @XmlAttribute
+    protected String largeIcon;
+    @XmlAttribute
+    protected String smallIcon;
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the displayName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * Sets the value of the displayName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDisplayName(final String value) {
+        this.displayName = value;
+    }
+
+    /**
+     * Gets the value of the largeIcon property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLargeIcon() {
+        return largeIcon;
+    }
+
+    /**
+     * Sets the value of the largeIcon property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLargeIcon(final String value) {
+        this.largeIcon = value;
+    }
+
+    /**
+     * Gets the value of the smallIcon property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getSmallIcon() {
+        return smallIcon;
+    }
+
+    /**
+     * Sets the value of the smallIcon property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setSmallIcon(final String value) {
+        this.smallIcon = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java
index 67c34c3..d3980fc 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java
@@ -1,293 +1,293 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 The description type is used by a description element to
- * provide text describing the parent element. The elements that use this
- * type should include any information that the Deployment Component's
- * Deployment File file producer wants to provide to the consumer of the
- * Deployment Component's Deployment File (i.e., to the Deployer).
- * Typically, the tools used by such a Deployment File consumer will
- * display the description when processing the parent element that
- * contains the description.
- * <p/>
- * The lang attribute defines the language that the description is
- * provided in. The default value is "en" (English).
- * <p/>
- * <p/>
- * <p/>
- * Java class for Description complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Description">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="lang" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Description", propOrder = {"extensions"})
-public class Description {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String lang;
-    @XmlAttribute
-    protected String value;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the lang property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLang() {
-        return lang;
-    }
-
-    /**
-     * Sets the value of the lang property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLang(final String value) {
-        this.lang = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setValue(final String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 The description type is used by a description element to
+ * provide text describing the parent element. The elements that use this
+ * type should include any information that the Deployment Component's
+ * Deployment File file producer wants to provide to the consumer of the
+ * Deployment Component's Deployment File (i.e., to the Deployer).
+ * Typically, the tools used by such a Deployment File consumer will
+ * display the description when processing the parent element that
+ * contains the description.
+ * <p/>
+ * The lang attribute defines the language that the description is
+ * provided in. The default value is "en" (English).
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for Description complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Description">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="lang" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Description", propOrder = {"extensions"})
+public class Description {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String lang;
+    @XmlAttribute
+    protected String value;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the lang property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLang() {
+        return lang;
+    }
+
+    /**
+     * Sets the value of the lang property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLang(final String value) {
+        this.lang = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java
index 558393e..2a21ff9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java
@@ -1,340 +1,340 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 This group keeps the usage of the contained description
- * related elements consistent across J2EE deployment descriptors.
- * <p/>
- * <p/>
- * <p/>
- * Java class for DescriptionGroup complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="DescriptionGroup">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="icons" type="{common.xmi}IconType"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="displayNames" type="{common.xmi}DisplayName"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DescriptionGroup", propOrder = {"icons", "displayNames",
-    "descriptions", "extensions"})
-public class DescriptionGroup {
-
-    protected List<IconType> icons;
-    protected List<DisplayName> displayNames;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the icons 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 icons property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getIcons().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link IconType }
-     */
-    public List<IconType> getIcons() {
-        if (icons == null) {
-            icons = new ArrayList<IconType>();
-        }
-        return this.icons;
-    }
-
-    /**
-     * Gets the value of the displayNames 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 displayNames property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDisplayNames().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link DisplayName }
-     */
-    public List<DisplayName> getDisplayNames() {
-        if (displayNames == null) {
-            displayNames = new ArrayList<DisplayName>();
-        }
-        return this.displayNames;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 This group keeps the usage of the contained description
+ * related elements consistent across J2EE deployment descriptors.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for DescriptionGroup complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="DescriptionGroup">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="icons" type="{common.xmi}IconType"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="displayNames" type="{common.xmi}DisplayName"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DescriptionGroup", propOrder = {"icons", "displayNames",
+    "descriptions", "extensions"})
+public class DescriptionGroup {
+
+    protected List<IconType> icons;
+    protected List<DisplayName> displayNames;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the icons 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 icons property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getIcons().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link IconType }
+     */
+    public List<IconType> getIcons() {
+        if (icons == null) {
+            icons = new ArrayList<IconType>();
+        }
+        return this.icons;
+    }
+
+    /**
+     * Gets the value of the displayNames 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 displayNames property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDisplayNames().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link DisplayName }
+     */
+    public List<DisplayName> getDisplayNames() {
+        if (displayNames == null) {
+            displayNames = new ArrayList<DisplayName>();
+        }
+        return this.displayNames;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}


[12/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-request-scope/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-request-scope/README.md b/examples/cdi-request-scope/README.md
index 4658c45..1b2aa49 100644
--- a/examples/cdi-request-scope/README.md
+++ b/examples/cdi-request-scope/README.md
@@ -1,150 +1,150 @@
-Title: CDI @RequestScoped
-
-This example show the use of `@RequestScoped` annotation for injected objects. An object
-which is defined as `@RequestScoped` is created once for every request and is shared by all the
-bean that inject it throughout a request.
-
-# Example
-
-This example depicts a similar scenario to cdi-application-scope. A restaurant guest orders
-a soup from the waiter. The order is passed to the chef who prepares it and passes it back
-the waiter who in turn delivers it to the guest.
-
-## Waiter
-
-The `Waiter` session bean receives a request from the test class via the `orderSoup()` method.
-A `Soup` insance will be created in this method and will be shared throughout the request with
-the `Chef` bean. The method passes the request to the `Chef` bean. It then returns the name of
-the soup to the test class. 
-
-    @Stateless
-    public class Waiter {
-
-        @Inject
-        private Soup soup;
-
-        @EJB
-        private Chef chef;
-
-        public String orderSoup(String name){
-            soup.setName(name);
-            return chef.prepareSoup().getName();
-        }
-    }
-
-## Soup
-
-The `Soup` class is an injectable POJO, defined as `@RequestScoped`. This means that an instance
-will be created only once for every request and will be shared by all the beans injecting it.
-
-    @RequestScoped
-    public class Soup {
-
-        private String name = "Soup of the day";
-
-        @PostConstruct
-        public void afterCreate() {
-            System.out.println("Soup created");
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name){
-            this.name = name;
-        }
-    }
-
-## Chef
-
-The `Chef` class is a simple session bean with an injected `Soup` field. Normally, the soup
-parameter would be passed as a `prepareSoup()` argument, but for the need of this example
-it's passed by the request context. 
-
-    @Stateless
-    public class Chef {
-
-        @Inject
-        private Soup soup;
-
-        public Soup prepareSoup() {
-            return soup;
-        }
-    }
-
-# Test Case
-
-This is the entry class for this example.
-
-    public class RestaurantTest {
-
-        private static String TOMATO_SOUP = "Tomato Soup";
-        private EJBContainer container;
-
-        @EJB
-        private Waiter joe;
-
-        @Before
-        public void startContainer() throws Exception {
-            container = EJBContainer.createEJBContainer();
-            container.getContext().bind("inject", this);
-        }
-
-        @Test
-        public void orderSoup(){
-            String soup = joe.orderSoup(TOMATO_SOUP);
-            assertEquals(TOMATO_SOUP, soup);
-            soup = joe.orderSoup(POTATO_SOUP);
-            assertEquals(POTATO_SOUP, soup);
-        }
-
-        @After
-        public void closeContainer() throws Exception {
-            container.close();
-        }
-    }
-
-# Running
-
-In the output you can see that there were two `Soup` instances created - one for
-each request.
-
-    -------------------------------------------------------
-     T E S T S
-    -------------------------------------------------------
-    Running org.superbiz.cdi.requestscope.RestaurantTest
-    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20111224-11:09
-    http://tomee.apache.org/
-    INFO - openejb.home = C:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
-    INFO - openejb.base = C:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
-    INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
-    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
-    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
-    INFO - Found EjbModule in classpath: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope\target\classes
-    INFO - Beginning load: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope\target\classes
-    INFO - Configuring enterprise application: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
-    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
-    INFO - Auto-creating a container for bean cdi-request-scope.Comp: Container(type=MANAGED, id=Default Managed Container)
-    INFO - Configuring Service(id=Default Stateless Container, type=Container, provider-id=Default Stateless Container)
-    INFO - Auto-creating a container for bean Chef: Container(type=STATELESS, id=Default Stateless Container)
-    INFO - Enterprise application "c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope" loaded.
-    INFO - Assembling app: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
-    INFO - Jndi(name="java:global/cdi-request-scope/Chef!org.superbiz.cdi.requestscope.Chef")
-    INFO - Jndi(name="java:global/cdi-request-scope/Chef")
-    INFO - Jndi(name="java:global/cdi-request-scope/Waiter!org.superbiz.cdi.requestscope.Waiter")
-    INFO - Jndi(name="java:global/cdi-request-scope/Waiter")
-    INFO - Created Ejb(deployment-id=Chef, ejb-name=Chef, container=Default Stateless Container)
-    INFO - Created Ejb(deployment-id=Waiter, ejb-name=Waiter, container=Default Stateless Container)
-    INFO - Started Ejb(deployment-id=Chef, ejb-name=Chef, container=Default Stateless Container)
-    INFO - Started Ejb(deployment-id=Waiter, ejb-name=Waiter, container=Default Stateless Container)
-    INFO - Deployed Application(path=c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope)
-    Soup created
-    Soup created
-    INFO - Undeploying app: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.412 sec
-
-    Results :
-
-    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
+Title: CDI @RequestScoped
+
+This example show the use of `@RequestScoped` annotation for injected objects. An object
+which is defined as `@RequestScoped` is created once for every request and is shared by all the
+bean that inject it throughout a request.
+
+# Example
+
+This example depicts a similar scenario to cdi-application-scope. A restaurant guest orders
+a soup from the waiter. The order is passed to the chef who prepares it and passes it back
+the waiter who in turn delivers it to the guest.
+
+## Waiter
+
+The `Waiter` session bean receives a request from the test class via the `orderSoup()` method.
+A `Soup` insance will be created in this method and will be shared throughout the request with
+the `Chef` bean. The method passes the request to the `Chef` bean. It then returns the name of
+the soup to the test class. 
+
+    @Stateless
+    public class Waiter {
+
+        @Inject
+        private Soup soup;
+
+        @EJB
+        private Chef chef;
+
+        public String orderSoup(String name){
+            soup.setName(name);
+            return chef.prepareSoup().getName();
+        }
+    }
+
+## Soup
+
+The `Soup` class is an injectable POJO, defined as `@RequestScoped`. This means that an instance
+will be created only once for every request and will be shared by all the beans injecting it.
+
+    @RequestScoped
+    public class Soup {
+
+        private String name = "Soup of the day";
+
+        @PostConstruct
+        public void afterCreate() {
+            System.out.println("Soup created");
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name){
+            this.name = name;
+        }
+    }
+
+## Chef
+
+The `Chef` class is a simple session bean with an injected `Soup` field. Normally, the soup
+parameter would be passed as a `prepareSoup()` argument, but for the need of this example
+it's passed by the request context. 
+
+    @Stateless
+    public class Chef {
+
+        @Inject
+        private Soup soup;
+
+        public Soup prepareSoup() {
+            return soup;
+        }
+    }
+
+# Test Case
+
+This is the entry class for this example.
+
+    public class RestaurantTest {
+
+        private static String TOMATO_SOUP = "Tomato Soup";
+        private EJBContainer container;
+
+        @EJB
+        private Waiter joe;
+
+        @Before
+        public void startContainer() throws Exception {
+            container = EJBContainer.createEJBContainer();
+            container.getContext().bind("inject", this);
+        }
+
+        @Test
+        public void orderSoup(){
+            String soup = joe.orderSoup(TOMATO_SOUP);
+            assertEquals(TOMATO_SOUP, soup);
+            soup = joe.orderSoup(POTATO_SOUP);
+            assertEquals(POTATO_SOUP, soup);
+        }
+
+        @After
+        public void closeContainer() throws Exception {
+            container.close();
+        }
+    }
+
+# Running
+
+In the output you can see that there were two `Soup` instances created - one for
+each request.
+
+    -------------------------------------------------------
+     T E S T S
+    -------------------------------------------------------
+    Running org.superbiz.cdi.requestscope.RestaurantTest
+    Apache OpenEJB 7.0.0-SNAPSHOT    build: 20111224-11:09
+    http://tomee.apache.org/
+    INFO - openejb.home = C:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
+    INFO - openejb.base = C:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
+    INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
+    INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+    INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+    INFO - Found EjbModule in classpath: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope\target\classes
+    INFO - Beginning load: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope\target\classes
+    INFO - Configuring enterprise application: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
+    INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+    INFO - Auto-creating a container for bean cdi-request-scope.Comp: Container(type=MANAGED, id=Default Managed Container)
+    INFO - Configuring Service(id=Default Stateless Container, type=Container, provider-id=Default Stateless Container)
+    INFO - Auto-creating a container for bean Chef: Container(type=STATELESS, id=Default Stateless Container)
+    INFO - Enterprise application "c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope" loaded.
+    INFO - Assembling app: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
+    INFO - Jndi(name="java:global/cdi-request-scope/Chef!org.superbiz.cdi.requestscope.Chef")
+    INFO - Jndi(name="java:global/cdi-request-scope/Chef")
+    INFO - Jndi(name="java:global/cdi-request-scope/Waiter!org.superbiz.cdi.requestscope.Waiter")
+    INFO - Jndi(name="java:global/cdi-request-scope/Waiter")
+    INFO - Created Ejb(deployment-id=Chef, ejb-name=Chef, container=Default Stateless Container)
+    INFO - Created Ejb(deployment-id=Waiter, ejb-name=Waiter, container=Default Stateless Container)
+    INFO - Started Ejb(deployment-id=Chef, ejb-name=Chef, container=Default Stateless Container)
+    INFO - Started Ejb(deployment-id=Waiter, ejb-name=Waiter, container=Default Stateless Container)
+    INFO - Deployed Application(path=c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope)
+    Soup created
+    Soup created
+    INFO - Undeploying app: c:\Users\Daniel\workspaces\openejb\openejb\examples\cdi-request-scope
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.412 sec
+
+    Results :
+
+    Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Chef.java
----------------------------------------------------------------------
diff --git a/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Chef.java b/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Chef.java
index 7185113..c795bea 100644
--- a/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Chef.java
+++ b/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Chef.java
@@ -1,31 +1,31 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.requestscope;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-
-@Stateless
-public class Chef {
-
-    @Inject
-    private Soup soup;
-
-    public Soup prepareSoup() {
-        return soup;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.requestscope;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+
+@Stateless
+public class Chef {
+
+    @Inject
+    private Soup soup;
+
+    public Soup prepareSoup() {
+        return soup;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Soup.java
----------------------------------------------------------------------
diff --git a/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Soup.java b/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Soup.java
index 3bce620..d86a608 100644
--- a/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Soup.java
+++ b/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Soup.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.requestscope;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-
-@RequestScoped
-public class Soup {
-
-    private String name = "Soup of the day";
-
-    @PostConstruct
-    public void afterCreate() {
-        System.out.println("Soup created");
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.requestscope;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+public class Soup {
+
+    private String name = "Soup of the day";
+
+    @PostConstruct
+    public void afterCreate() {
+        System.out.println("Soup created");
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Waiter.java
----------------------------------------------------------------------
diff --git a/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Waiter.java b/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Waiter.java
index 53559a7..f14e4d9 100644
--- a/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Waiter.java
+++ b/examples/cdi-request-scope/src/main/java/org/superbiz/cdi/requestscope/Waiter.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.requestscope;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-
-@Stateless
-public class Waiter {
-
-    @Inject
-    private Soup soup;
-
-    @EJB
-    private Chef chef;
-
-    public String orderSoup(String name) {
-        soup.setName(name);
-        return chef.prepareSoup().getName();
-    }
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.requestscope;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+
+@Stateless
+public class Waiter {
+
+    @Inject
+    private Soup soup;
+
+    @EJB
+    private Chef chef;
+
+    public String orderSoup(String name) {
+        soup.setName(name);
+        return chef.prepareSoup().getName();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-request-scope/src/test/java/org/superbiz/cdi/requestscope/RestaurantTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-request-scope/src/test/java/org/superbiz/cdi/requestscope/RestaurantTest.java b/examples/cdi-request-scope/src/test/java/org/superbiz/cdi/requestscope/RestaurantTest.java
index fa64175..4a811ea 100644
--- a/examples/cdi-request-scope/src/test/java/org/superbiz/cdi/requestscope/RestaurantTest.java
+++ b/examples/cdi-request-scope/src/test/java/org/superbiz/cdi/requestscope/RestaurantTest.java
@@ -1,55 +1,55 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.requestscope;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-
-import static org.junit.Assert.assertEquals;
-
-public class RestaurantTest {
-
-    private static final String TOMATO_SOUP = "Tomato Soup";
-    private static final String POTATO_SOUP = "Potato Soup";
-    private EJBContainer container;
-
-    @EJB
-    private Waiter joe;
-
-    @Before
-    public void startContainer() throws Exception {
-        container = EJBContainer.createEJBContainer();
-        container.getContext().bind("inject", this);
-    }
-
-    @Test
-    public void orderSoup() {
-        String soup = joe.orderSoup(TOMATO_SOUP);
-        assertEquals(TOMATO_SOUP, soup);
-        soup = joe.orderSoup(POTATO_SOUP);
-        assertEquals(POTATO_SOUP, soup);
-    }
-
-    @After
-    public void closeContainer() throws Exception {
-        container.close();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.requestscope;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+
+import static org.junit.Assert.assertEquals;
+
+public class RestaurantTest {
+
+    private static final String TOMATO_SOUP = "Tomato Soup";
+    private static final String POTATO_SOUP = "Potato Soup";
+    private EJBContainer container;
+
+    @EJB
+    private Waiter joe;
+
+    @Before
+    public void startContainer() throws Exception {
+        container = EJBContainer.createEJBContainer();
+        container.getContext().bind("inject", this);
+    }
+
+    @Test
+    public void orderSoup() {
+        String soup = joe.orderSoup(TOMATO_SOUP);
+        assertEquals(TOMATO_SOUP, soup);
+        soup = joe.orderSoup(POTATO_SOUP);
+        assertEquals(POTATO_SOUP, soup);
+    }
+
+    @After
+    public void closeContainer() throws Exception {
+        container.close();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/AnswerBean.java
----------------------------------------------------------------------
diff --git a/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/AnswerBean.java b/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/AnswerBean.java
index 2ba85a7..37655dc 100644
--- a/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/AnswerBean.java
+++ b/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/AnswerBean.java
@@ -1,40 +1,40 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.session;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-
-// just to take care to refresh it, otherwise using postcontruct you can see kind of cache effect on session bean
-@RequestScoped
-public class AnswerBean {
-
-    @Inject
-    private SessionBean bean;
-
-    private String value;
-
-    @PostConstruct
-    public void init() {
-        value = '{' + bean.getName() + '}';
-    }
-
-    public String value() {
-        return 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.session;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+// just to take care to refresh it, otherwise using postcontruct you can see kind of cache effect on session bean
+@RequestScoped
+public class AnswerBean {
+
+    @Inject
+    private SessionBean bean;
+
+    private String value;
+
+    @PostConstruct
+    public void init() {
+        value = '{' + bean.getName() + '}';
+    }
+
+    public String value() {
+        return value;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/InputServlet.java
----------------------------------------------------------------------
diff --git a/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/InputServlet.java b/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/InputServlet.java
index 220408b..af5d614 100644
--- a/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/InputServlet.java
+++ b/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/InputServlet.java
@@ -1,44 +1,44 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.session;
-
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet(name = "input-servlet", urlPatterns = {"/set-name"})
-public class InputServlet extends HttpServlet {
-
-    @Inject
-    private SessionBean bean;
-
-    @Override
-    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        final String name = req.getParameter("name");
-        if (name == null || name.isEmpty()) {
-            resp.getWriter().write("please add a parameter name=xxx");
-        } else {
-            bean.setName(name);
-            resp.getWriter().write("done, go to /name servlet");
-        }
-
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.session;
+
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "input-servlet", urlPatterns = {"/set-name"})
+public class InputServlet extends HttpServlet {
+
+    @Inject
+    private SessionBean bean;
+
+    @Override
+    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        final String name = req.getParameter("name");
+        if (name == null || name.isEmpty()) {
+            resp.getWriter().write("please add a parameter name=xxx");
+        } else {
+            bean.setName(name);
+            resp.getWriter().write("done, go to /name servlet");
+        }
+
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/OutputServlet.java
----------------------------------------------------------------------
diff --git a/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/OutputServlet.java b/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/OutputServlet.java
index 11f623d..78c64a6 100644
--- a/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/OutputServlet.java
+++ b/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/OutputServlet.java
@@ -1,42 +1,42 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.session;
-
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet(name = "output-servlet", urlPatterns = {"/name"})
-public class OutputServlet extends HttpServlet {
-
-    @Inject
-    private AnswerBean bean;
-
-    @Override
-    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        final String name = bean.value();
-        if (name == null || name.isEmpty()) {
-            resp.getWriter().write("please go to servlet /set-name please");
-        } else {
-            resp.getWriter().write("name = " + name);
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.session;
+
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "output-servlet", urlPatterns = {"/name"})
+public class OutputServlet extends HttpServlet {
+
+    @Inject
+    private AnswerBean bean;
+
+    @Override
+    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        final String name = bean.value();
+        if (name == null || name.isEmpty()) {
+            resp.getWriter().write("please go to servlet /set-name please");
+        } else {
+            resp.getWriter().write("name = " + name);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/SessionBean.java
----------------------------------------------------------------------
diff --git a/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/SessionBean.java b/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/SessionBean.java
index 0381af1..cc48047 100644
--- a/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/SessionBean.java
+++ b/examples/cdi-session-scope/src/main/java/org/superbiz/cdi/session/SessionBean.java
@@ -1,34 +1,34 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.cdi.session;
-
-import javax.enterprise.context.SessionScoped;
-import java.io.Serializable;
-
-@SessionScoped
-public class SessionBean implements Serializable {
-
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.cdi.session;
+
+import javax.enterprise.context.SessionScoped;
+import java.io.Serializable;
+
+@SessionScoped
+public class SessionBean implements Serializable {
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java
----------------------------------------------------------------------
diff --git a/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java b/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java
index adace70..b6a537d 100644
--- a/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java
+++ b/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java
@@ -1,51 +1,51 @@
-/*
- * 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.superbiz.jaxws;
-
-import org.apache.ziplock.IO;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.net.URL;
-
-@RunWith(Arquillian.class)
-public class Rot13Test {
-
-    @ArquillianResource
-    private URL url;
-
-    @Deployment(testable = false)
-    public static WebArchive war() {
-        return ShrinkWrap.create(WebArchive.class)
-                .addClass(Rot13.class)
-                .addAsWebInfResource(new ClassLoaderAsset("META-INF/openejb-jar.xml"), ArchivePaths.create("openejb-jar.xml"));
-    }
-
-    @Test
-    public void checkWSDLIsDeployedWhereItIsConfigured() throws Exception {
-        final String wsdl = IO.slurp(new URL(url.toExternalForm() + "tool/rot13?wsdl"));
-        Assert.assertTrue(wsdl.contains("Rot13"));
-    }
-}
+/*
+ * 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.superbiz.jaxws;
+
+import org.apache.ziplock.IO;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.net.URL;
+
+@RunWith(Arquillian.class)
+public class Rot13Test {
+
+    @ArquillianResource
+    private URL url;
+
+    @Deployment(testable = false)
+    public static WebArchive war() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addClass(Rot13.class)
+                .addAsWebInfResource(new ClassLoaderAsset("META-INF/openejb-jar.xml"), ArchivePaths.create("openejb-jar.xml"));
+    }
+
+    @Test
+    public void checkWSDLIsDeployedWhereItIsConfigured() throws Exception {
+        final String wsdl = IO.slurp(new URL(url.toExternalForm() + "tool/rot13?wsdl"));
+        Assert.assertTrue(wsdl.contains("Rot13"));
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/client-resource-lookup-preview/src/test/java/org/superbiz/client/SenderTest.java
----------------------------------------------------------------------
diff --git a/examples/client-resource-lookup-preview/src/test/java/org/superbiz/client/SenderTest.java b/examples/client-resource-lookup-preview/src/test/java/org/superbiz/client/SenderTest.java
index be1b6de..ae06449 100644
--- a/examples/client-resource-lookup-preview/src/test/java/org/superbiz/client/SenderTest.java
+++ b/examples/client-resource-lookup-preview/src/test/java/org/superbiz/client/SenderTest.java
@@ -1,55 +1,55 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.client;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.jms.ConnectionFactory;
-import javax.jms.Queue;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-public class SenderTest {
-
-    @BeforeClass
-    public static void configureClientResources() {
-        // can be set this way or with the key Resource/<type>
-        // in fact we create on client side a mini jndi tree
-        // the key is the jndi name (the one used for the lookup)
-        System.setProperty("aConnectionFactory", "connectionfactory:org.apache.activemq.ActiveMQConnectionFactory:tcp://localhost:11616");
-        System.setProperty("aQueue", "queue:org.apache.activemq.command.ActiveMQQueue:LISTENER");
-    }
-
-    @Test
-    public void send() throws Exception {
-        final Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
-        final Context context = new InitialContext(properties);
-
-        final Queue destination = (Queue) context.lookup("java:aQueue");
-        assertNotNull(destination);
-        assertEquals("LISTENER", destination.getQueueName());
-
-        final ConnectionFactory connectionFactory = (ConnectionFactory) context.lookup("java:aConnectionFactory");
-        assertNotNull(connectionFactory);
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.client;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.Queue;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class SenderTest {
+
+    @BeforeClass
+    public static void configureClientResources() {
+        // can be set this way or with the key Resource/<type>
+        // in fact we create on client side a mini jndi tree
+        // the key is the jndi name (the one used for the lookup)
+        System.setProperty("aConnectionFactory", "connectionfactory:org.apache.activemq.ActiveMQConnectionFactory:tcp://localhost:11616");
+        System.setProperty("aQueue", "queue:org.apache.activemq.command.ActiveMQQueue:LISTENER");
+    }
+
+    @Test
+    public void send() throws Exception {
+        final Properties properties = new Properties();
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+        final Context context = new InitialContext(properties);
+
+        final Queue destination = (Queue) context.lookup("java:aQueue");
+        assertNotNull(destination);
+        assertEquals("LISTENER", destination.getQueueName());
+
+        final ConnectionFactory connectionFactory = (ConnectionFactory) context.lookup("java:aConnectionFactory");
+        assertNotNull(connectionFactory);
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java
index 3f2dfee..da55649 100644
--- a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java
+++ b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java
@@ -1,126 +1,126 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-import javax.ejb.Init;
-import javax.ejb.Local;
-import javax.ejb.LocalHome;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Properties;
-
-/**
- * This is an EJB 3 style pojo stateful session bean
- * it does not need to implement javax.ejb.SessionBean
- */
-//START SNIPPET: code
-
-// EJB 3.0 Style business interfaces
-// Each of these interfaces are already annotated in the classes
-// themselves with @Remote and @Local, so annotating them here
-// in the bean class again is not really required.
-@Remote({FriendlyPersonRemote.class})
-@Local({FriendlyPersonLocal.class})
-
-// EJB 2.1 Style component interfaces
-// These interfaces, however, must be annotated here in the bean class.
-// Use of @RemoteHome in the FriendlyPersonEjbHome class itself is not allowed.
-// Use of @LocalHome in the FriendlyPersonEjbLocalHome class itself is also not allowed.
-@RemoteHome(FriendlyPersonEjbHome.class)
-@LocalHome(FriendlyPersonEjbLocalHome.class)
-
-@Stateful
-public class FriendlyPerson implements FriendlyPersonLocal, FriendlyPersonRemote {
-
-    private final HashMap<String, MessageFormat> greetings;
-    private final Properties languagePreferences;
-
-    private String defaultLanguage;
-
-    public FriendlyPerson() {
-        greetings = new HashMap();
-        languagePreferences = new Properties();
-        defaultLanguage = Locale.getDefault().getLanguage();
-
-        addGreeting("en", "Hello {0}!");
-        addGreeting("es", "Hola {0}!");
-        addGreeting("fr", "Bonjour {0}!");
-        addGreeting("pl", "Witaj {0}!");
-    }
-
-    /**
-     * This method corresponds to the FriendlyPersonEjbHome.create() method
-     * and the FriendlyPersonEjbLocalHome.create()
-     * <p/>
-     * If you do not have an EJBHome or EJBLocalHome interface, this method
-     * can be deleted.
-     */
-    @Init
-    public void create() {
-    }
-
-    /**
-     * This method corresponds to the following methods:
-     * - EJBObject.remove()
-     * - EJBHome.remove(ejbObject)
-     * - EJBLocalObject.remove()
-     * - EJBLocalHome.remove(ejbObject)
-     * <p/>
-     * If you do not have an EJBHome or EJBLocalHome interface, this method
-     * can be deleted.
-     */
-    @Remove
-    public void remove() {
-    }
-
-    public String greet(String friend) {
-        String language = languagePreferences.getProperty(friend, defaultLanguage);
-        return greet(language, friend);
-    }
-
-    public String greet(String language, String friend) {
-        MessageFormat greeting = greetings.get(language);
-        if (greeting == null) {
-            Locale locale = new Locale(language);
-            return "Sorry, I don't speak " + locale.getDisplayLanguage() + ".";
-        }
-
-        return greeting.format(new Object[]{friend});
-    }
-
-    public void addGreeting(String language, String message) {
-        greetings.put(language, new MessageFormat(message));
-    }
-
-    public void setLanguagePreferences(String friend, String language) {
-        languagePreferences.put(friend, language);
-    }
-
-    public String getDefaultLanguage() {
-        return defaultLanguage;
-    }
-
-    public void setDefaultLanguage(String defaultLanguage) {
-        this.defaultLanguage = defaultLanguage;
-    }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+import javax.ejb.Init;
+import javax.ejb.Local;
+import javax.ejb.LocalHome;
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Properties;
+
+/**
+ * This is an EJB 3 style pojo stateful session bean
+ * it does not need to implement javax.ejb.SessionBean
+ */
+//START SNIPPET: code
+
+// EJB 3.0 Style business interfaces
+// Each of these interfaces are already annotated in the classes
+// themselves with @Remote and @Local, so annotating them here
+// in the bean class again is not really required.
+@Remote({FriendlyPersonRemote.class})
+@Local({FriendlyPersonLocal.class})
+
+// EJB 2.1 Style component interfaces
+// These interfaces, however, must be annotated here in the bean class.
+// Use of @RemoteHome in the FriendlyPersonEjbHome class itself is not allowed.
+// Use of @LocalHome in the FriendlyPersonEjbLocalHome class itself is also not allowed.
+@RemoteHome(FriendlyPersonEjbHome.class)
+@LocalHome(FriendlyPersonEjbLocalHome.class)
+
+@Stateful
+public class FriendlyPerson implements FriendlyPersonLocal, FriendlyPersonRemote {
+
+    private final HashMap<String, MessageFormat> greetings;
+    private final Properties languagePreferences;
+
+    private String defaultLanguage;
+
+    public FriendlyPerson() {
+        greetings = new HashMap();
+        languagePreferences = new Properties();
+        defaultLanguage = Locale.getDefault().getLanguage();
+
+        addGreeting("en", "Hello {0}!");
+        addGreeting("es", "Hola {0}!");
+        addGreeting("fr", "Bonjour {0}!");
+        addGreeting("pl", "Witaj {0}!");
+    }
+
+    /**
+     * This method corresponds to the FriendlyPersonEjbHome.create() method
+     * and the FriendlyPersonEjbLocalHome.create()
+     * <p/>
+     * If you do not have an EJBHome or EJBLocalHome interface, this method
+     * can be deleted.
+     */
+    @Init
+    public void create() {
+    }
+
+    /**
+     * This method corresponds to the following methods:
+     * - EJBObject.remove()
+     * - EJBHome.remove(ejbObject)
+     * - EJBLocalObject.remove()
+     * - EJBLocalHome.remove(ejbObject)
+     * <p/>
+     * If you do not have an EJBHome or EJBLocalHome interface, this method
+     * can be deleted.
+     */
+    @Remove
+    public void remove() {
+    }
+
+    public String greet(String friend) {
+        String language = languagePreferences.getProperty(friend, defaultLanguage);
+        return greet(language, friend);
+    }
+
+    public String greet(String language, String friend) {
+        MessageFormat greeting = greetings.get(language);
+        if (greeting == null) {
+            Locale locale = new Locale(language);
+            return "Sorry, I don't speak " + locale.getDisplayLanguage() + ".";
+        }
+
+        return greeting.format(new Object[]{friend});
+    }
+
+    public void addGreeting(String language, String message) {
+        greetings.put(language, new MessageFormat(message));
+    }
+
+    public void setLanguagePreferences(String friend, String language) {
+        languagePreferences.put(friend, language);
+    }
+
+    public String getDefaultLanguage() {
+        return defaultLanguage;
+    }
+
+    public void setDefaultLanguage(String defaultLanguage) {
+        this.defaultLanguage = defaultLanguage;
+    }
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbHome.java
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbHome.java b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbHome.java
index ae301a4..31842e5 100644
--- a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbHome.java
+++ b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbHome.java
@@ -1,29 +1,29 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-//START SNIPPET: code
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-import java.rmi.RemoteException;
-
-public interface FriendlyPersonEjbHome extends EJBHome {
-
-    FriendlyPersonEjbObject create() throws CreateException, RemoteException;
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+//START SNIPPET: code
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+import java.rmi.RemoteException;
+
+public interface FriendlyPersonEjbHome extends EJBHome {
+
+    FriendlyPersonEjbObject create() throws CreateException, RemoteException;
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalHome.java
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalHome.java b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalHome.java
index ac00b76..adb52af 100644
--- a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalHome.java
+++ b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalHome.java
@@ -1,29 +1,29 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-//START SNIPPET: code
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import java.rmi.RemoteException;
-
-public interface FriendlyPersonEjbLocalHome extends EJBLocalHome {
-
-    FriendlyPersonEjbLocalObject create() throws CreateException, RemoteException;
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+//START SNIPPET: code
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBLocalHome;
+import java.rmi.RemoteException;
+
+public interface FriendlyPersonEjbLocalHome extends EJBLocalHome {
+
+    FriendlyPersonEjbLocalObject create() throws CreateException, RemoteException;
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalObject.java
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalObject.java b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalObject.java
index 7b11e8e..fd420cd 100644
--- a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalObject.java
+++ b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbLocalObject.java
@@ -1,35 +1,35 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-import javax.ejb.EJBLocalObject;
-
-public interface FriendlyPersonEjbLocalObject extends EJBLocalObject {
-
-    String greet(String friend);
-
-    String greet(String language, String friend);
-
-    void addGreeting(String language, String message);
-
-    void setLanguagePreferences(String friend, String language);
-
-    String getDefaultLanguage();
-
-    void setDefaultLanguage(String defaultLanguage);
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+import javax.ejb.EJBLocalObject;
+
+public interface FriendlyPersonEjbLocalObject extends EJBLocalObject {
+
+    String greet(String friend);
+
+    String greet(String language, String friend);
+
+    void addGreeting(String language, String message);
+
+    void setLanguagePreferences(String friend, String language);
+
+    String getDefaultLanguage();
+
+    void setDefaultLanguage(String defaultLanguage);
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbObject.java
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbObject.java b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbObject.java
index 277111d..d6ce4af 100644
--- a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbObject.java
+++ b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonEjbObject.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-//START SNIPPET: code
-
-import javax.ejb.EJBObject;
-import java.rmi.RemoteException;
-
-public interface FriendlyPersonEjbObject extends EJBObject {
-
-    String greet(String friend) throws RemoteException;
-
-    String greet(String language, String friend) throws RemoteException;
-
-    void addGreeting(String language, String message) throws RemoteException;
-
-    void setLanguagePreferences(String friend, String language) throws RemoteException;
-
-    String getDefaultLanguage() throws RemoteException;
-
-    void setDefaultLanguage(String defaultLanguage) throws RemoteException;
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+//START SNIPPET: code
+
+import javax.ejb.EJBObject;
+import java.rmi.RemoteException;
+
+public interface FriendlyPersonEjbObject extends EJBObject {
+
+    String greet(String friend) throws RemoteException;
+
+    String greet(String language, String friend) throws RemoteException;
+
+    void addGreeting(String language, String message) throws RemoteException;
+
+    void setLanguagePreferences(String friend, String language) throws RemoteException;
+
+    String getDefaultLanguage() throws RemoteException;
+
+    void setDefaultLanguage(String defaultLanguage) throws RemoteException;
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonLocal.java
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonLocal.java b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonLocal.java
index 551bee3..6198708 100644
--- a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonLocal.java
+++ b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonLocal.java
@@ -1,39 +1,39 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-//START SNIPPET: code
-
-import javax.ejb.Local;
-
-@Local
-public interface FriendlyPersonLocal {
-
-    String greet(String friend);
-
-    String greet(String language, String friend);
-
-    void addGreeting(String language, String message);
-
-    void setLanguagePreferences(String friend, String language);
-
-    String getDefaultLanguage();
-
-    void setDefaultLanguage(String defaultLanguage);
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+//START SNIPPET: code
+
+import javax.ejb.Local;
+
+@Local
+public interface FriendlyPersonLocal {
+
+    String greet(String friend);
+
+    String greet(String language, String friend);
+
+    void addGreeting(String language, String message);
+
+    void setLanguagePreferences(String friend, String language);
+
+    String getDefaultLanguage();
+
+    void setDefaultLanguage(String defaultLanguage);
+
+}
+//END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonRemote.java
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonRemote.java b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonRemote.java
index 8b378d1..9444c90 100644
--- a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonRemote.java
+++ b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPersonRemote.java
@@ -1,38 +1,38 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz;
-
-import javax.ejb.Remote;
-
-//START SNIPPET: code
-@Remote
-public interface FriendlyPersonRemote {
-
-    String greet(String friend);
-
-    String greet(String language, String friend);
-
-    void addGreeting(String language, String message);
-
-    void setLanguagePreferences(String friend, String language);
-
-    String getDefaultLanguage();
-
-    void setDefaultLanguage(String defaultLanguage);
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz;
+
+import javax.ejb.Remote;
+
+//START SNIPPET: code
+@Remote
+public interface FriendlyPersonRemote {
+
+    String greet(String friend);
+
+    String greet(String language, String friend);
+
+    void addGreeting(String language, String message);
+
+    void setLanguagePreferences(String friend, String language);
+
+    String getDefaultLanguage();
+
+    void setDefaultLanguage(String defaultLanguage);
+
+}
+//END SNIPPET: code


[34/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java
index d97bd0f..f341feb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java
@@ -1,280 +1,280 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for EStringToStringMapEntry complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EStringToStringMapEntry">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="key" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EStringToStringMapEntry", propOrder = {"extensions"})
-public class EStringToStringMapEntry {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String key;
-    @XmlAttribute
-    protected String value;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the key property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Sets the value of the key property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setKey(final String value) {
-        this.key = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setValue(final String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for EStringToStringMapEntry complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EStringToStringMapEntry">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="key" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EStringToStringMapEntry", propOrder = {"extensions"})
+public class EStringToStringMapEntry {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String key;
+    @XmlAttribute
+    protected String value;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the key property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * Sets the value of the key property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setKey(final String value) {
+        this.key = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStructuralFeature.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStructuralFeature.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStructuralFeature.java
index a2062ae..d0f8845 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStructuralFeature.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStructuralFeature.java
@@ -1,172 +1,172 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EStructuralFeature complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EStructuralFeature">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ETypedElement">
- *       &lt;attribute name="changeable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="defaultValueLiteral" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="derived" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="transient" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="unsettable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="volatile" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EStructuralFeature")
-public class EStructuralFeature extends ETypedElement {
-
-    @XmlAttribute
-    protected Boolean changeable;
-    @XmlAttribute
-    protected String defaultValueLiteral;
-    @XmlAttribute
-    protected Boolean derived;
-    @XmlAttribute(name = "transient")
-    protected Boolean isTransient;
-    @XmlAttribute
-    protected Boolean unsettable;
-    @XmlAttribute(name = "volatile")
-    protected Boolean isVolatile;
-
-    /**
-     * Gets the value of the changeable property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isChangeable() {
-        return changeable;
-    }
-
-    /**
-     * Sets the value of the changeable property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setChangeable(final Boolean value) {
-        this.changeable = value;
-    }
-
-    /**
-     * Gets the value of the defaultValueLiteral property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDefaultValueLiteral() {
-        return defaultValueLiteral;
-    }
-
-    /**
-     * Sets the value of the defaultValueLiteral property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDefaultValueLiteral(final String value) {
-        this.defaultValueLiteral = value;
-    }
-
-    /**
-     * Gets the value of the derived property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isDerived() {
-        return derived;
-    }
-
-    /**
-     * Sets the value of the derived property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setDerived(final Boolean value) {
-        this.derived = value;
-    }
-
-    /**
-     * Gets the value of the isTransient property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsTransient() {
-        return isTransient;
-    }
-
-    /**
-     * Sets the value of the isTransient property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsTransient(final Boolean value) {
-        this.isTransient = value;
-    }
-
-    /**
-     * Gets the value of the unsettable property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isUnsettable() {
-        return unsettable;
-    }
-
-    /**
-     * Sets the value of the unsettable property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setUnsettable(final Boolean value) {
-        this.unsettable = value;
-    }
-
-    /**
-     * Gets the value of the isVolatile property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isIsVolatile() {
-        return isVolatile;
-    }
-
-    /**
-     * Sets the value of the isVolatile property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setIsVolatile(final Boolean value) {
-        this.isVolatile = 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.was.v6.ecore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EStructuralFeature complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EStructuralFeature">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ETypedElement">
+ *       &lt;attribute name="changeable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="defaultValueLiteral" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="derived" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="transient" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="unsettable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="volatile" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EStructuralFeature")
+public class EStructuralFeature extends ETypedElement {
+
+    @XmlAttribute
+    protected Boolean changeable;
+    @XmlAttribute
+    protected String defaultValueLiteral;
+    @XmlAttribute
+    protected Boolean derived;
+    @XmlAttribute(name = "transient")
+    protected Boolean isTransient;
+    @XmlAttribute
+    protected Boolean unsettable;
+    @XmlAttribute(name = "volatile")
+    protected Boolean isVolatile;
+
+    /**
+     * Gets the value of the changeable property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isChangeable() {
+        return changeable;
+    }
+
+    /**
+     * Sets the value of the changeable property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setChangeable(final Boolean value) {
+        this.changeable = value;
+    }
+
+    /**
+     * Gets the value of the defaultValueLiteral property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDefaultValueLiteral() {
+        return defaultValueLiteral;
+    }
+
+    /**
+     * Sets the value of the defaultValueLiteral property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDefaultValueLiteral(final String value) {
+        this.defaultValueLiteral = value;
+    }
+
+    /**
+     * Gets the value of the derived property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isDerived() {
+        return derived;
+    }
+
+    /**
+     * Sets the value of the derived property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setDerived(final Boolean value) {
+        this.derived = value;
+    }
+
+    /**
+     * Gets the value of the isTransient property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsTransient() {
+        return isTransient;
+    }
+
+    /**
+     * Sets the value of the isTransient property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsTransient(final Boolean value) {
+        this.isTransient = value;
+    }
+
+    /**
+     * Gets the value of the unsettable property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isUnsettable() {
+        return unsettable;
+    }
+
+    /**
+     * Sets the value of the unsettable property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setUnsettable(final Boolean value) {
+        this.unsettable = value;
+    }
+
+    /**
+     * Gets the value of the isVolatile property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isIsVolatile() {
+        return isVolatile;
+    }
+
+    /**
+     * Sets the value of the isVolatile property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setIsVolatile(final Boolean value) {
+        this.isVolatile = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ETypedElement.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ETypedElement.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ETypedElement.java
index 99c91a9..ae4c06a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ETypedElement.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ETypedElement.java
@@ -1,187 +1,187 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-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;
-
-/**
- * <p/>
- * Java class for ETypedElement complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ETypedElement">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ENamedElement">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="eType" type="{http://www.eclipse.org/emf/2002/Ecore}EClassifier"/>
- *       &lt;/choice>
- *       &lt;attribute name="eType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="lowerBound" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       &lt;attribute name="ordered" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="unique" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="upperBound" type="{http://www.w3.org/2001/XMLSchema}int" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ETypedElement", propOrder = {"eClassifierETypes"})
-public class ETypedElement extends ENamedElement {
-
-    @XmlElement(name = "eType")
-    protected List<EClassifier> eClassifierETypes;
-    @XmlAttribute
-    protected String eType;
-    @XmlAttribute
-    protected Integer lowerBound;
-    @XmlAttribute
-    protected Boolean ordered;
-    @XmlAttribute
-    protected Boolean unique;
-    @XmlAttribute
-    protected Integer upperBound;
-
-    /**
-     * Gets the value of the eClassifierETypes 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 eClassifierETypes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEClassifierETypes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EClassifier }
-     */
-    public List<EClassifier> getEClassifierETypes() {
-        if (eClassifierETypes == null) {
-            eClassifierETypes = new ArrayList<EClassifier>();
-        }
-        return this.eClassifierETypes;
-    }
-
-    /**
-     * Gets the value of the eType property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEType() {
-        return eType;
-    }
-
-    /**
-     * Sets the value of the eType property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEType(final String value) {
-        this.eType = value;
-    }
-
-    /**
-     * Gets the value of the lowerBound property.
-     *
-     * @return possible object is {@link Integer }
-     */
-    public Integer getLowerBound() {
-        return lowerBound;
-    }
-
-    /**
-     * Sets the value of the lowerBound property.
-     *
-     * @param value allowed object is {@link Integer }
-     */
-    public void setLowerBound(final Integer value) {
-        this.lowerBound = value;
-    }
-
-    /**
-     * Gets the value of the ordered property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isOrdered() {
-        return ordered;
-    }
-
-    /**
-     * Sets the value of the ordered property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setOrdered(final Boolean value) {
-        this.ordered = value;
-    }
-
-    /**
-     * Gets the value of the unique property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isUnique() {
-        return unique;
-    }
-
-    /**
-     * Sets the value of the unique property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setUnique(final Boolean value) {
-        this.unique = value;
-    }
-
-    /**
-     * Gets the value of the upperBound property.
-     *
-     * @return possible object is {@link Integer }
-     */
-    public Integer getUpperBound() {
-        return upperBound;
-    }
-
-    /**
-     * Sets the value of the upperBound property.
-     *
-     * @param value allowed object is {@link Integer }
-     */
-    public void setUpperBound(final Integer value) {
-        this.upperBound = 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+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;
+
+/**
+ * <p/>
+ * Java class for ETypedElement complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ETypedElement">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ENamedElement">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="eType" type="{http://www.eclipse.org/emf/2002/Ecore}EClassifier"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="eType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="lowerBound" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="ordered" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="unique" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="upperBound" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ETypedElement", propOrder = {"eClassifierETypes"})
+public class ETypedElement extends ENamedElement {
+
+    @XmlElement(name = "eType")
+    protected List<EClassifier> eClassifierETypes;
+    @XmlAttribute
+    protected String eType;
+    @XmlAttribute
+    protected Integer lowerBound;
+    @XmlAttribute
+    protected Boolean ordered;
+    @XmlAttribute
+    protected Boolean unique;
+    @XmlAttribute
+    protected Integer upperBound;
+
+    /**
+     * Gets the value of the eClassifierETypes 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 eClassifierETypes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEClassifierETypes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EClassifier }
+     */
+    public List<EClassifier> getEClassifierETypes() {
+        if (eClassifierETypes == null) {
+            eClassifierETypes = new ArrayList<EClassifier>();
+        }
+        return this.eClassifierETypes;
+    }
+
+    /**
+     * Gets the value of the eType property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEType() {
+        return eType;
+    }
+
+    /**
+     * Sets the value of the eType property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEType(final String value) {
+        this.eType = value;
+    }
+
+    /**
+     * Gets the value of the lowerBound property.
+     *
+     * @return possible object is {@link Integer }
+     */
+    public Integer getLowerBound() {
+        return lowerBound;
+    }
+
+    /**
+     * Sets the value of the lowerBound property.
+     *
+     * @param value allowed object is {@link Integer }
+     */
+    public void setLowerBound(final Integer value) {
+        this.lowerBound = value;
+    }
+
+    /**
+     * Gets the value of the ordered property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isOrdered() {
+        return ordered;
+    }
+
+    /**
+     * Sets the value of the ordered property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setOrdered(final Boolean value) {
+        this.ordered = value;
+    }
+
+    /**
+     * Gets the value of the unique property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isUnique() {
+        return unique;
+    }
+
+    /**
+     * Sets the value of the unique property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setUnique(final Boolean value) {
+        this.unique = value;
+    }
+
+    /**
+     * Gets the value of the upperBound property.
+     *
+     * @return possible object is {@link Integer }
+     */
+    public Integer getUpperBound() {
+        return upperBound;
+    }
+
+    /**
+     * Sets the value of the upperBound property.
+     *
+     * @param value allowed object is {@link Integer }
+     */
+    public void setUpperBound(final Integer value) {
+        this.upperBound = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java
index 7b6f689..5703719 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java
@@ -1,387 +1,387 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the org.apache.openejb.jee.was.v6.ecore
- * package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _ETypedElement_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "ETypedElement");
-    private final static QName _EFactory_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EFactory");
-    private final static QName _EOperation_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EOperation");
-    private final static QName _EClassifier_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EClassifier");
-    private final static QName _EStringToStringMapEntry_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EStringToStringMapEntry");
-    private final static QName _EObject_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EObject");
-    private final static QName _EAttribute_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EAttribute");
-    private final static QName _EModelElement_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EModelElement");
-    private final static QName _EEnum_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EEnum");
-    private final static QName _EEnumLiteral_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EEnumLiteral");
-    private final static QName _EReference_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EReference");
-    private final static QName _EStructuralFeature_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EStructuralFeature");
-    private final static QName _EAnnotation_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EAnnotation");
-    private final static QName _ENamedElement_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "ENamedElement");
-    private final static QName _EParameter_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EParameter");
-    private final static QName _EDataType_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EDataType");
-    private final static QName _EClass_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EClass");
-    private final static QName _EPackage_QNAME = new QName(
-        "http://www.eclipse.org/emf/2002/Ecore", "EPackage");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package: org.apache.openejb.jee.was.v6.ecore
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link EFactory }
-     */
-    public EFactory createEFactory() {
-        return new EFactory();
-    }
-
-    /**
-     * Create an instance of {@link EStringToStringMapEntry }
-     */
-    public EStringToStringMapEntry createEStringToStringMapEntry() {
-        return new EStringToStringMapEntry();
-    }
-
-    /**
-     * Create an instance of {@link EOperation }
-     */
-    public EOperation createEOperation() {
-        return new EOperation();
-    }
-
-    /**
-     * Create an instance of {@link EAnnotation }
-     */
-    public EAnnotation createEAnnotation() {
-        return new EAnnotation();
-    }
-
-    /**
-     * Create an instance of {@link EClassifier }
-     */
-    public EClassifier createEClassifier() {
-        return new EClassifier();
-    }
-
-    /**
-     * Create an instance of {@link EClass }
-     */
-    public EClass createEClass() {
-        return new EClass();
-    }
-
-    /**
-     * Create an instance of {@link ETypedElement }
-     */
-    public ETypedElement createETypedElement() {
-        return new ETypedElement();
-    }
-
-    /**
-     * Create an instance of {@link EParameter }
-     */
-    public EParameter createEParameter() {
-        return new EParameter();
-    }
-
-    /**
-     * Create an instance of {@link EStructuralFeature }
-     */
-    public EStructuralFeature createEStructuralFeature() {
-        return new EStructuralFeature();
-    }
-
-    /**
-     * Create an instance of {@link EEnumLiteral }
-     */
-    public EEnumLiteral createEEnumLiteral() {
-        return new EEnumLiteral();
-    }
-
-    /**
-     * Create an instance of {@link EReference }
-     */
-    public EReference createEReference() {
-        return new EReference();
-    }
-
-    /**
-     * Create an instance of {@link EEnum }
-     */
-    public EEnum createEEnum() {
-        return new EEnum();
-    }
-
-    /**
-     * Create an instance of {@link ENamedElement }
-     */
-    public ENamedElement createENamedElement() {
-        return new ENamedElement();
-    }
-
-    /**
-     * Create an instance of {@link EModelElement }
-     */
-    public EModelElement createEModelElement() {
-        return new EModelElement();
-    }
-
-    /**
-     * Create an instance of {@link EPackage }
-     */
-    public EPackage createEPackage() {
-        return new EPackage();
-    }
-
-    /**
-     * Create an instance of {@link EDataType }
-     */
-    public EDataType createEDataType() {
-        return new EDataType();
-    }
-
-    /**
-     * Create an instance of {@link EObject }
-     */
-    public EObject createEObject() {
-        return new EObject();
-    }
-
-    /**
-     * Create an instance of {@link EAttribute }
-     */
-    public EAttribute createEAttribute() {
-        return new EAttribute();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ETypedElement }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "ETypedElement")
-    public JAXBElement<ETypedElement> createETypedElement(final ETypedElement value) {
-        return new JAXBElement<ETypedElement>(_ETypedElement_QNAME,
-            ETypedElement.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EFactory }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EFactory")
-    public JAXBElement<EFactory> createEFactory(final EFactory value) {
-        return new JAXBElement<EFactory>(_EFactory_QNAME, EFactory.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EOperation }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EOperation")
-    public JAXBElement<EOperation> createEOperation(final EOperation value) {
-        return new JAXBElement<EOperation>(_EOperation_QNAME, EOperation.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EClassifier }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EClassifier")
-    public JAXBElement<EClassifier> createEClassifier(final EClassifier value) {
-        return new JAXBElement<EClassifier>(_EClassifier_QNAME,
-            EClassifier.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link EStringToStringMapEntry }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EStringToStringMapEntry")
-    public JAXBElement<EStringToStringMapEntry> createEStringToStringMapEntry(
-        final EStringToStringMapEntry value) {
-        return new JAXBElement<EStringToStringMapEntry>(
-            _EStringToStringMapEntry_QNAME, EStringToStringMapEntry.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EObject }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EObject")
-    public JAXBElement<EObject> createEObject(final EObject value) {
-        return new JAXBElement<EObject>(_EObject_QNAME, EObject.class, null,
-            value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EAttribute }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EAttribute")
-    public JAXBElement<EAttribute> createEAttribute(final EAttribute value) {
-        return new JAXBElement<EAttribute>(_EAttribute_QNAME, EAttribute.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EModelElement }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EModelElement")
-    public JAXBElement<EModelElement> createEModelElement(final EModelElement value) {
-        return new JAXBElement<EModelElement>(_EModelElement_QNAME,
-            EModelElement.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EEnum }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EEnum")
-    public JAXBElement<EEnum> createEEnum(final EEnum value) {
-        return new JAXBElement<EEnum>(_EEnum_QNAME, EEnum.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EEnumLiteral }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EEnumLiteral")
-    public JAXBElement<EEnumLiteral> createEEnumLiteral(final EEnumLiteral value) {
-        return new JAXBElement<EEnumLiteral>(_EEnumLiteral_QNAME,
-            EEnumLiteral.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EReference }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EReference")
-    public JAXBElement<EReference> createEReference(final EReference value) {
-        return new JAXBElement<EReference>(_EReference_QNAME, EReference.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link EStructuralFeature }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EStructuralFeature")
-    public JAXBElement<EStructuralFeature> createEStructuralFeature(
-        final EStructuralFeature value) {
-        return new JAXBElement<EStructuralFeature>(_EStructuralFeature_QNAME,
-            EStructuralFeature.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EAnnotation }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EAnnotation")
-    public JAXBElement<EAnnotation> createEAnnotation(final EAnnotation value) {
-        return new JAXBElement<EAnnotation>(_EAnnotation_QNAME,
-            EAnnotation.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ENamedElement }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "ENamedElement")
-    public JAXBElement<ENamedElement> createENamedElement(final ENamedElement value) {
-        return new JAXBElement<ENamedElement>(_ENamedElement_QNAME,
-            ENamedElement.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EParameter }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EParameter")
-    public JAXBElement<EParameter> createEParameter(final EParameter value) {
-        return new JAXBElement<EParameter>(_EParameter_QNAME, EParameter.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EDataType }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EDataType")
-    public JAXBElement<EDataType> createEDataType(final EDataType value) {
-        return new JAXBElement<EDataType>(_EDataType_QNAME, EDataType.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EClass }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EClass")
-    public JAXBElement<EClass> createEClass(final EClass value) {
-        return new JAXBElement<EClass>(_EClass_QNAME, EClass.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EPackage }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EPackage")
-    public JAXBElement<EPackage> createEPackage(final EPackage value) {
-        return new JAXBElement<EPackage>(_EPackage_QNAME, EPackage.class, null,
-            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.was.v6.ecore;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the org.apache.openejb.jee.was.v6.ecore
+ * package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _ETypedElement_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "ETypedElement");
+    private final static QName _EFactory_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EFactory");
+    private final static QName _EOperation_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EOperation");
+    private final static QName _EClassifier_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EClassifier");
+    private final static QName _EStringToStringMapEntry_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EStringToStringMapEntry");
+    private final static QName _EObject_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EObject");
+    private final static QName _EAttribute_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EAttribute");
+    private final static QName _EModelElement_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EModelElement");
+    private final static QName _EEnum_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EEnum");
+    private final static QName _EEnumLiteral_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EEnumLiteral");
+    private final static QName _EReference_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EReference");
+    private final static QName _EStructuralFeature_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EStructuralFeature");
+    private final static QName _EAnnotation_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EAnnotation");
+    private final static QName _ENamedElement_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "ENamedElement");
+    private final static QName _EParameter_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EParameter");
+    private final static QName _EDataType_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EDataType");
+    private final static QName _EClass_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EClass");
+    private final static QName _EPackage_QNAME = new QName(
+        "http://www.eclipse.org/emf/2002/Ecore", "EPackage");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package: org.apache.openejb.jee.was.v6.ecore
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link EFactory }
+     */
+    public EFactory createEFactory() {
+        return new EFactory();
+    }
+
+    /**
+     * Create an instance of {@link EStringToStringMapEntry }
+     */
+    public EStringToStringMapEntry createEStringToStringMapEntry() {
+        return new EStringToStringMapEntry();
+    }
+
+    /**
+     * Create an instance of {@link EOperation }
+     */
+    public EOperation createEOperation() {
+        return new EOperation();
+    }
+
+    /**
+     * Create an instance of {@link EAnnotation }
+     */
+    public EAnnotation createEAnnotation() {
+        return new EAnnotation();
+    }
+
+    /**
+     * Create an instance of {@link EClassifier }
+     */
+    public EClassifier createEClassifier() {
+        return new EClassifier();
+    }
+
+    /**
+     * Create an instance of {@link EClass }
+     */
+    public EClass createEClass() {
+        return new EClass();
+    }
+
+    /**
+     * Create an instance of {@link ETypedElement }
+     */
+    public ETypedElement createETypedElement() {
+        return new ETypedElement();
+    }
+
+    /**
+     * Create an instance of {@link EParameter }
+     */
+    public EParameter createEParameter() {
+        return new EParameter();
+    }
+
+    /**
+     * Create an instance of {@link EStructuralFeature }
+     */
+    public EStructuralFeature createEStructuralFeature() {
+        return new EStructuralFeature();
+    }
+
+    /**
+     * Create an instance of {@link EEnumLiteral }
+     */
+    public EEnumLiteral createEEnumLiteral() {
+        return new EEnumLiteral();
+    }
+
+    /**
+     * Create an instance of {@link EReference }
+     */
+    public EReference createEReference() {
+        return new EReference();
+    }
+
+    /**
+     * Create an instance of {@link EEnum }
+     */
+    public EEnum createEEnum() {
+        return new EEnum();
+    }
+
+    /**
+     * Create an instance of {@link ENamedElement }
+     */
+    public ENamedElement createENamedElement() {
+        return new ENamedElement();
+    }
+
+    /**
+     * Create an instance of {@link EModelElement }
+     */
+    public EModelElement createEModelElement() {
+        return new EModelElement();
+    }
+
+    /**
+     * Create an instance of {@link EPackage }
+     */
+    public EPackage createEPackage() {
+        return new EPackage();
+    }
+
+    /**
+     * Create an instance of {@link EDataType }
+     */
+    public EDataType createEDataType() {
+        return new EDataType();
+    }
+
+    /**
+     * Create an instance of {@link EObject }
+     */
+    public EObject createEObject() {
+        return new EObject();
+    }
+
+    /**
+     * Create an instance of {@link EAttribute }
+     */
+    public EAttribute createEAttribute() {
+        return new EAttribute();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ETypedElement }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "ETypedElement")
+    public JAXBElement<ETypedElement> createETypedElement(final ETypedElement value) {
+        return new JAXBElement<ETypedElement>(_ETypedElement_QNAME,
+            ETypedElement.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EFactory }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EFactory")
+    public JAXBElement<EFactory> createEFactory(final EFactory value) {
+        return new JAXBElement<EFactory>(_EFactory_QNAME, EFactory.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EOperation }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EOperation")
+    public JAXBElement<EOperation> createEOperation(final EOperation value) {
+        return new JAXBElement<EOperation>(_EOperation_QNAME, EOperation.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EClassifier }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EClassifier")
+    public JAXBElement<EClassifier> createEClassifier(final EClassifier value) {
+        return new JAXBElement<EClassifier>(_EClassifier_QNAME,
+            EClassifier.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link EStringToStringMapEntry }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EStringToStringMapEntry")
+    public JAXBElement<EStringToStringMapEntry> createEStringToStringMapEntry(
+        final EStringToStringMapEntry value) {
+        return new JAXBElement<EStringToStringMapEntry>(
+            _EStringToStringMapEntry_QNAME, EStringToStringMapEntry.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EObject }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EObject")
+    public JAXBElement<EObject> createEObject(final EObject value) {
+        return new JAXBElement<EObject>(_EObject_QNAME, EObject.class, null,
+            value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EAttribute }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EAttribute")
+    public JAXBElement<EAttribute> createEAttribute(final EAttribute value) {
+        return new JAXBElement<EAttribute>(_EAttribute_QNAME, EAttribute.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EModelElement }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EModelElement")
+    public JAXBElement<EModelElement> createEModelElement(final EModelElement value) {
+        return new JAXBElement<EModelElement>(_EModelElement_QNAME,
+            EModelElement.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EEnum }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EEnum")
+    public JAXBElement<EEnum> createEEnum(final EEnum value) {
+        return new JAXBElement<EEnum>(_EEnum_QNAME, EEnum.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EEnumLiteral }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EEnumLiteral")
+    public JAXBElement<EEnumLiteral> createEEnumLiteral(final EEnumLiteral value) {
+        return new JAXBElement<EEnumLiteral>(_EEnumLiteral_QNAME,
+            EEnumLiteral.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EReference }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EReference")
+    public JAXBElement<EReference> createEReference(final EReference value) {
+        return new JAXBElement<EReference>(_EReference_QNAME, EReference.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link EStructuralFeature }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EStructuralFeature")
+    public JAXBElement<EStructuralFeature> createEStructuralFeature(
+        final EStructuralFeature value) {
+        return new JAXBElement<EStructuralFeature>(_EStructuralFeature_QNAME,
+            EStructuralFeature.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EAnnotation }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EAnnotation")
+    public JAXBElement<EAnnotation> createEAnnotation(final EAnnotation value) {
+        return new JAXBElement<EAnnotation>(_EAnnotation_QNAME,
+            EAnnotation.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ENamedElement }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "ENamedElement")
+    public JAXBElement<ENamedElement> createENamedElement(final ENamedElement value) {
+        return new JAXBElement<ENamedElement>(_ENamedElement_QNAME,
+            ENamedElement.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EParameter }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EParameter")
+    public JAXBElement<EParameter> createEParameter(final EParameter value) {
+        return new JAXBElement<EParameter>(_EParameter_QNAME, EParameter.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EDataType }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EDataType")
+    public JAXBElement<EDataType> createEDataType(final EDataType value) {
+        return new JAXBElement<EDataType>(_EDataType_QNAME, EDataType.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EClass }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EClass")
+    public JAXBElement<EClass> createEClass(final EClass value) {
+        return new JAXBElement<EClass>(_EClass_QNAME, EClass.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EPackage }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "http://www.eclipse.org/emf/2002/Ecore", name = "EPackage")
+    public JAXBElement<EPackage> createEPackage(final EPackage value) {
+        return new JAXBElement<EPackage>(_EPackage_QNAME, EPackage.class, null,
+            value);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/package-info.java
index b37418e..cebe61c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.eclipse.org/emf/2002/Ecore") package org.apache.openejb.jee.was.v6.ecore;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.eclipse.org/emf/2002/Ecore") package org.apache.openejb.jee.was.v6.ecore;
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AcknowledgeModeEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AcknowledgeModeEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AcknowledgeModeEnum.java
index fc1b8e4..bd3e385 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AcknowledgeModeEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AcknowledgeModeEnum.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.was.v6.ejb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-/**
- * <p/>
- * Java class for AcknowledgeMode.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <p/>
- * <pre>
- * &lt;simpleType name="AcknowledgeMode">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
- *     &lt;enumeration value="AutoAcknowledge"/>
- *     &lt;enumeration value="DupsOkAcknowledge"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlEnum
-public enum AcknowledgeModeEnum {
-
-    @XmlEnumValue("AutoAcknowledge")
-    AUTO_ACKNOWLEDGE("AutoAcknowledge"), @XmlEnumValue("DupsOkAcknowledge")
-    DUPS_OK_ACKNOWLEDGE("DupsOkAcknowledge");
-    private final String value;
-
-    AcknowledgeModeEnum(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AcknowledgeModeEnum fromValue(final String v) {
-        for (final AcknowledgeModeEnum c : AcknowledgeModeEnum.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}
+/**
+ * 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.was.v6.ejb;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/**
+ * <p/>
+ * Java class for AcknowledgeMode.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="AcknowledgeMode">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NCName">
+ *     &lt;enumeration value="AutoAcknowledge"/>
+ *     &lt;enumeration value="DupsOkAcknowledge"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlEnum
+public enum AcknowledgeModeEnum {
+
+    @XmlEnumValue("AutoAcknowledge")
+    AUTO_ACKNOWLEDGE("AutoAcknowledge"), @XmlEnumValue("DupsOkAcknowledge")
+    DUPS_OK_ACKNOWLEDGE("DupsOkAcknowledge");
+    private final String value;
+
+    AcknowledgeModeEnum(final String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static AcknowledgeModeEnum fromValue(final String v) {
+        for (final AcknowledgeModeEnum c : AcknowledgeModeEnum.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v.toString());
+    }
+
+}


[19/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java
index a791fe3..18c114f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java
@@ -1,259 +1,259 @@
-/**
- * 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.was.v6.xmi;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the org.apache.openejb.jee.was.v6.xmi package.
- * <p/>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _Model_QNAME = new QName(
-        "http://www.omg.org/XMI", "Model");
-    private final static QName _PackageReference_QNAME = new QName(
-        "http://www.omg.org/XMI", "PackageReference");
-    private final static QName _Difference_QNAME = new QName(
-        "http://www.omg.org/XMI", "Difference");
-    private final static QName _XMI_QNAME = new QName("http://www.omg.org/XMI",
-        "XMI");
-    private final static QName _MetaModel_QNAME = new QName(
-        "http://www.omg.org/XMI", "MetaModel");
-    private final static QName _Extension_QNAME = new QName(
-        "http://www.omg.org/XMI", "Extension");
-    private final static QName _Delete_QNAME = new QName(
-        "http://www.omg.org/XMI", "Delete");
-    private final static QName _Add_QNAME = new QName("http://www.omg.org/XMI",
-        "Add");
-    private final static QName _Import_QNAME = new QName(
-        "http://www.omg.org/XMI", "Import");
-    private final static QName _Documentation_QNAME = new QName(
-        "http://www.omg.org/XMI", "Documentation");
-    private final static QName _Replace_QNAME = new QName(
-        "http://www.omg.org/XMI", "Replace");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of
-     * schema derived classes for package: org.apache.openejb.jee.was.v6.xmi
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link Difference.Target }
-     */
-    public Difference.Target createDifferenceTarget() {
-        return new Difference.Target();
-    }
-
-    /**
-     * Create an instance of {@link Delete }
-     */
-    public Delete createDelete() {
-        return new Delete();
-    }
-
-    /**
-     * Create an instance of {@link Add }
-     */
-    public Add createAdd() {
-        return new Add();
-    }
-
-    /**
-     * Create an instance of {@link Model }
-     */
-    public Model createModel() {
-        return new Model();
-    }
-
-    /**
-     * Create an instance of {@link MetaModel }
-     */
-    public MetaModel createMetaModel() {
-        return new MetaModel();
-    }
-
-    /**
-     * Create an instance of {@link XMI }
-     */
-    public XMI createXMI() {
-        return new XMI();
-    }
-
-    /**
-     * Create an instance of {@link PackageReference }
-     */
-    public PackageReference createPackageReference() {
-        return new PackageReference();
-    }
-
-    /**
-     * Create an instance of {@link Replace }
-     */
-    public Replace createReplace() {
-        return new Replace();
-    }
-
-    /**
-     * Create an instance of {@link Extension }
-     */
-    public Extension createExtension() {
-        return new Extension();
-    }
-
-    /**
-     * Create an instance of {@link Documentation }
-     */
-    public Documentation createDocumentation() {
-        return new Documentation();
-    }
-
-    /**
-     * Create an instance of {@link Import }
-     */
-    public Import createImport() {
-        return new Import();
-    }
-
-    /**
-     * Create an instance of {@link Difference }
-     */
-    public Difference createDifference() {
-        return new Difference();
-    }
-
-    /**
-     * Create an instance of {@link Any }
-     */
-    public Any createAny() {
-        return new Any();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Model }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Model")
-    public JAXBElement<Model> createModel(final Model value) {
-        return new JAXBElement<Model>(_Model_QNAME, Model.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}
-     * {@link PackageReference }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "PackageReference")
-    public JAXBElement<PackageReference> createPackageReference(
-        final PackageReference value) {
-        return new JAXBElement<PackageReference>(_PackageReference_QNAME,
-            PackageReference.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Difference }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Difference")
-    public JAXBElement<Difference> createDifference(final Difference value) {
-        return new JAXBElement<Difference>(_Difference_QNAME, Difference.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XMI }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "XMI")
-    public JAXBElement<XMI> createXMI(final XMI value) {
-        return new JAXBElement<XMI>(_XMI_QNAME, XMI.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MetaModel }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "MetaModel")
-    public JAXBElement<MetaModel> createMetaModel(final MetaModel value) {
-        return new JAXBElement<MetaModel>(_MetaModel_QNAME, MetaModel.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Extension }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Extension")
-    public JAXBElement<Extension> createExtension(final Extension value) {
-        return new JAXBElement<Extension>(_Extension_QNAME, Extension.class,
-            null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Delete }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Delete")
-    public JAXBElement<Delete> createDelete(final Delete value) {
-        return new JAXBElement<Delete>(_Delete_QNAME, Delete.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Add }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Add")
-    public JAXBElement<Add> createAdd(final Add value) {
-        return new JAXBElement<Add>(_Add_QNAME, Add.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Import }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Import")
-    public JAXBElement<Import> createImport(final Import value) {
-        return new JAXBElement<Import>(_Import_QNAME, Import.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Documentation }
-     * {@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Documentation")
-    public JAXBElement<Documentation> createDocumentation(final Documentation value) {
-        return new JAXBElement<Documentation>(_Documentation_QNAME,
-            Documentation.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Replace }{@code
-     * >}
-     */
-    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Replace")
-    public JAXBElement<Replace> createReplace(final Replace value) {
-        return new JAXBElement<Replace>(_Replace_QNAME, Replace.class, null,
-            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.was.v6.xmi;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the org.apache.openejb.jee.was.v6.xmi package.
+ * <p/>
+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _Model_QNAME = new QName(
+        "http://www.omg.org/XMI", "Model");
+    private final static QName _PackageReference_QNAME = new QName(
+        "http://www.omg.org/XMI", "PackageReference");
+    private final static QName _Difference_QNAME = new QName(
+        "http://www.omg.org/XMI", "Difference");
+    private final static QName _XMI_QNAME = new QName("http://www.omg.org/XMI",
+        "XMI");
+    private final static QName _MetaModel_QNAME = new QName(
+        "http://www.omg.org/XMI", "MetaModel");
+    private final static QName _Extension_QNAME = new QName(
+        "http://www.omg.org/XMI", "Extension");
+    private final static QName _Delete_QNAME = new QName(
+        "http://www.omg.org/XMI", "Delete");
+    private final static QName _Add_QNAME = new QName("http://www.omg.org/XMI",
+        "Add");
+    private final static QName _Import_QNAME = new QName(
+        "http://www.omg.org/XMI", "Import");
+    private final static QName _Documentation_QNAME = new QName(
+        "http://www.omg.org/XMI", "Documentation");
+    private final static QName _Replace_QNAME = new QName(
+        "http://www.omg.org/XMI", "Replace");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package: org.apache.openejb.jee.was.v6.xmi
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link Difference.Target }
+     */
+    public Difference.Target createDifferenceTarget() {
+        return new Difference.Target();
+    }
+
+    /**
+     * Create an instance of {@link Delete }
+     */
+    public Delete createDelete() {
+        return new Delete();
+    }
+
+    /**
+     * Create an instance of {@link Add }
+     */
+    public Add createAdd() {
+        return new Add();
+    }
+
+    /**
+     * Create an instance of {@link Model }
+     */
+    public Model createModel() {
+        return new Model();
+    }
+
+    /**
+     * Create an instance of {@link MetaModel }
+     */
+    public MetaModel createMetaModel() {
+        return new MetaModel();
+    }
+
+    /**
+     * Create an instance of {@link XMI }
+     */
+    public XMI createXMI() {
+        return new XMI();
+    }
+
+    /**
+     * Create an instance of {@link PackageReference }
+     */
+    public PackageReference createPackageReference() {
+        return new PackageReference();
+    }
+
+    /**
+     * Create an instance of {@link Replace }
+     */
+    public Replace createReplace() {
+        return new Replace();
+    }
+
+    /**
+     * Create an instance of {@link Extension }
+     */
+    public Extension createExtension() {
+        return new Extension();
+    }
+
+    /**
+     * Create an instance of {@link Documentation }
+     */
+    public Documentation createDocumentation() {
+        return new Documentation();
+    }
+
+    /**
+     * Create an instance of {@link Import }
+     */
+    public Import createImport() {
+        return new Import();
+    }
+
+    /**
+     * Create an instance of {@link Difference }
+     */
+    public Difference createDifference() {
+        return new Difference();
+    }
+
+    /**
+     * Create an instance of {@link Any }
+     */
+    public Any createAny() {
+        return new Any();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Model }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Model")
+    public JAXBElement<Model> createModel(final Model value) {
+        return new JAXBElement<Model>(_Model_QNAME, Model.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}
+     * {@link PackageReference }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "PackageReference")
+    public JAXBElement<PackageReference> createPackageReference(
+        final PackageReference value) {
+        return new JAXBElement<PackageReference>(_PackageReference_QNAME,
+            PackageReference.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Difference }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Difference")
+    public JAXBElement<Difference> createDifference(final Difference value) {
+        return new JAXBElement<Difference>(_Difference_QNAME, Difference.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMI }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "XMI")
+    public JAXBElement<XMI> createXMI(final XMI value) {
+        return new JAXBElement<XMI>(_XMI_QNAME, XMI.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link MetaModel }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "MetaModel")
+    public JAXBElement<MetaModel> createMetaModel(final MetaModel value) {
+        return new JAXBElement<MetaModel>(_MetaModel_QNAME, MetaModel.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Extension }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Extension")
+    public JAXBElement<Extension> createExtension(final Extension value) {
+        return new JAXBElement<Extension>(_Extension_QNAME, Extension.class,
+            null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Delete }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Delete")
+    public JAXBElement<Delete> createDelete(final Delete value) {
+        return new JAXBElement<Delete>(_Delete_QNAME, Delete.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Add }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Add")
+    public JAXBElement<Add> createAdd(final Add value) {
+        return new JAXBElement<Add>(_Add_QNAME, Add.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Import }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Import")
+    public JAXBElement<Import> createImport(final Import value) {
+        return new JAXBElement<Import>(_Import_QNAME, Import.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Documentation }
+     * {@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Documentation")
+    public JAXBElement<Documentation> createDocumentation(final Documentation value) {
+        return new JAXBElement<Documentation>(_Documentation_QNAME,
+            Documentation.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Replace }{@code
+     * >}
+     */
+    @XmlElementDecl(namespace = "http://www.omg.org/XMI", name = "Replace")
+    public JAXBElement<Replace> createReplace(final Replace value) {
+        return new JAXBElement<Replace>(_Replace_QNAME, Replace.class, null,
+            value);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java
index fb72e15..14eec2c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java
@@ -1,264 +1,264 @@
-/**
- * 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.was.v6.xmi;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-/**
- * <p/>
- * Java class for PackageReference complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="PackageReference">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PackageReference", propOrder = {"names", "versions"})
-public class PackageReference {
-
-    @XmlElement(name = "name")
-    protected List<String> names;
-    @XmlElement(name = "version")
-    protected List<String> versions;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the names 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 names property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getNames().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getNames() {
-        if (names == null) {
-            names = new ArrayList<String>();
-        }
-        return this.names;
-    }
-
-    /**
-     * Gets the value of the versions 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 versions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getVersions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link String }
-     */
-    public List<String> getVersions() {
-        if (versions == null) {
-            versions = new ArrayList<String>();
-        }
-        return this.versions;
-    }
-
-    /**
-     * 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 type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.xmi;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+/**
+ * <p/>
+ * Java class for PackageReference complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="PackageReference">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PackageReference", propOrder = {"names", "versions"})
+public class PackageReference {
+
+    @XmlElement(name = "name")
+    protected List<String> names;
+    @XmlElement(name = "version")
+    protected List<String> versions;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the names 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 names property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getNames().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getNames() {
+        if (names == null) {
+            names = new ArrayList<String>();
+        }
+        return this.names;
+    }
+
+    /**
+     * Gets the value of the versions 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 versions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getVersions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link String }
+     */
+    public List<String> getVersions() {
+        if (versions == null) {
+            versions = new ArrayList<String>();
+        }
+        return this.versions;
+    }
+
+    /**
+     * 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 type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Replace.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Replace.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Replace.java
index c2fac97..0a1e7e4 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Replace.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Replace.java
@@ -1,101 +1,101 @@
-/**
- * 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.was.v6.xmi;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for Replace complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Replace">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.omg.org/XMI}Difference">
- *       &lt;attribute name="position" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="replacement" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Replace")
-public class Replace extends Difference {
-
-    @XmlAttribute
-    protected String position;
-    @XmlAttribute(name = "replacement")
-    @XmlIDREF
-    protected List<Object> replacements;
-
-    /**
-     * Gets the value of the position property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getPosition() {
-        return position;
-    }
-
-    /**
-     * Sets the value of the position property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setPosition(final String value) {
-        this.position = value;
-    }
-
-    /**
-     * Gets the value of the replacements 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 replacements property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getReplacements().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Object }
-     */
-    public List<Object> getReplacements() {
-        if (replacements == null) {
-            replacements = new ArrayList<Object>();
-        }
-        return this.replacements;
-    }
-
-}
+/**
+ * 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.was.v6.xmi;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for Replace complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Replace">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.omg.org/XMI}Difference">
+ *       &lt;attribute name="position" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="replacement" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Replace")
+public class Replace extends Difference {
+
+    @XmlAttribute
+    protected String position;
+    @XmlAttribute(name = "replacement")
+    @XmlIDREF
+    protected List<Object> replacements;
+
+    /**
+     * Gets the value of the position property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getPosition() {
+        return position;
+    }
+
+    /**
+     * Sets the value of the position property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setPosition(final String value) {
+        this.position = value;
+    }
+
+    /**
+     * Gets the value of the replacements 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 replacements property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getReplacements().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Object }
+     */
+    public List<Object> getReplacements() {
+        if (replacements == null) {
+            replacements = new ArrayList<Object>();
+        }
+        return this.replacements;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java
index 344fcff..0978f6c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java
@@ -1,212 +1,212 @@
-/**
- * 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.was.v6.xmi;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-/**
- * <p/>
- * Java class for XMI complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="XMI">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;any/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}LinkAttribs"/>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}IdentityAttribs"/>
- *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       &lt;attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="2.0" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "XMI", propOrder = {"elements"})
-public class XMI {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> elements;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI", required = true)
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the elements 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 elements property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getElements().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link Object }
-     */
-    public List<Object> getElements() {
-        if (elements == null) {
-            elements = new ArrayList<Object>();
-        }
-        return this.elements;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.xmi;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+/**
+ * <p/>
+ * Java class for XMI complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="XMI">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;any/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}LinkAttribs"/>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}IdentityAttribs"/>
+ *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       &lt;attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="2.0" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "XMI", propOrder = {"elements"})
+public class XMI {
+
+    @XmlAnyElement(lax = true)
+    protected List<Object> elements;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI", required = true)
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the elements 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 elements property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getElements().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link Object }
+     */
+    public List<Object> getElements() {
+        if (elements == null) {
+            elements = new ArrayList<Object>();
+        }
+        return this.elements;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/package-info.java
index 1f4ddd2..42086a7 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.omg.org/XMI") package org.apache.openejb.jee.was.v6.xmi;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.omg.org/XMI") package org.apache.openejb.jee.was.v6.xmi;
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/application-client-example.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/application-client-example.xml b/container/openejb-jee/src/test/resources/application-client-example.xml
index 8acd909..6260774 100644
--- a/container/openejb-jee/src/test/resources/application-client-example.xml
+++ b/container/openejb-jee/src/test/resources/application-client-example.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <application-client xmlns="http://java.sun.com/xml/ns/javaee" version="3.0" metadata-complete="true">
     <description>String</description>
     <display-name>token</display-name>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/connector-1.5-example.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/connector-1.5-example.xml b/container/openejb-jee/src/test/resources/connector-1.5-example.xml
index 4e2ad66..51bb709 100644
--- a/container/openejb-jee/src/test/resources/connector-1.5-example.xml
+++ b/container/openejb-jee/src/test/resources/connector-1.5-example.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <connector xmlns="http://java.sun.com/xml/ns/javaee" version="1.5" id="ID001">
     <description xml:lang="">description0</description>
     <display-name xml:lang="en-US">display-name0</display-name>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/daytrader-corrected.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/daytrader-corrected.xml b/container/openejb-jee/src/test/resources/daytrader-corrected.xml
index abe9c40..5163b26 100644
--- a/container/openejb-jee/src/test/resources/daytrader-corrected.xml
+++ b/container/openejb-jee/src/test/resources/daytrader-corrected.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://tomee.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://tomee.apache.org/xml/ns/pkgen-2.1" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
     <ns2:cmp-connection-factory>
         <ns2:resource-link>jdbc/TradeDataSource</ns2:resource-link>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/daytrader-original.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/daytrader-original.xml b/container/openejb-jee/src/test/resources/daytrader-original.xml
index cf2c386..51f3657 100644
--- a/container/openejb-jee/src/test/resources/daytrader-original.xml
+++ b/container/openejb-jee/src/test/resources/daytrader-original.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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://www.openejb.org/xml/ns/openejb-jar-2.1">
   <cmp-connection-factory>
     <resource-link>jdbc/TradeDataSource</resource-link>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/ejb-jar-cmp-example1.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/ejb-jar-cmp-example1.xml b/container/openejb-jee/src/test/resources/ejb-jar-cmp-example1.xml
index f3544a4..da7d90f 100644
--- a/container/openejb-jee/src/test/resources/ejb-jar-cmp-example1.xml
+++ b/container/openejb-jee/src/test/resources/ejb-jar-cmp-example1.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0" metadata-complete="true">
     <description>This ejb-jar file contains assembled enterprise beans that are part of employee self-service application.</description>
     <enterprise-beans>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/ejb-jar-example2.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/ejb-jar-example2.xml b/container/openejb-jee/src/test/resources/ejb-jar-example2.xml
index 0d1879d..8759592 100644
--- a/container/openejb-jee/src/test/resources/ejb-jar-example2.xml
+++ b/container/openejb-jee/src/test/resources/ejb-jar-example2.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0" metadata-complete="true">
     <description>String</description>
     <description>String</description>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml b/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
index dd7654d..ebefdd1 100644
--- a/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
+++ b/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <ns4:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://tomee.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://tomee.apache.org/xml/ns/pkgen-2.1">
     <environment>
         <moduleId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/openejb-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/openejb-jar.xml b/container/openejb-jee/src/test/resources/openejb-jar.xml
index 4ae17d7..94a22e4 100644
--- a/container/openejb-jee/src/test/resources/openejb-jar.xml
+++ b/container/openejb-jee/src/test/resources/openejb-jar.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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://www.openejb.org/openejb-jar/1.1">
     <ejb-deployment ejb-name="BasicCmpBean" deployment-id="client/tests/entity/cmp/BasicCmpHome" container-id="Default CMP Container">
         <resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/tld-example.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/tld-example.xml b/container/openejb-jee/src/test/resources/tld-example.xml
index d739628..6beee72 100644
--- a/container/openejb-jee/src/test/resources/tld-example.xml
+++ b/container/openejb-jee/src/test/resources/tld-example.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <taglib xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" id="ID001">
     <description xml:lang="">description0</description>
     <display-name xml:lang="en-US">display-name0</display-name>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/web-example.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/web-example.xml b/container/openejb-jee/src/test/resources/web-example.xml
index b955b8f..aaf08f6 100644
--- a/container/openejb-jee/src/test/resources/web-example.xml
+++ b/container/openejb-jee/src/test/resources/web-example.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" metadata-complete="false" id="ID001">
     <description xml:lang="en-US">description117</description>
     <description xml:lang="">description121</description>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/wls-ejb-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/wls-ejb-jar.xml b/container/openejb-jee/src/test/resources/wls-ejb-jar.xml
index 38d888b..1920808 100644
--- a/container/openejb-jee/src/test/resources/wls-ejb-jar.xml
+++ b/container/openejb-jee/src/test/resources/wls-ejb-jar.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <weblogic-ejb-jar xmlns="http://www.bea.com/ns/weblogic/90">
     <description>description0</description>
     <weblogic-enterprise-bean>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/test/resources/wls-v81-ejb-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/test/resources/wls-v81-ejb-jar.xml b/container/openejb-jee/src/test/resources/wls-v81-ejb-jar.xml
index 2fbdf5d..e2796f5 100644
--- a/container/openejb-jee/src/test/resources/wls-v81-ejb-jar.xml
+++ b/container/openejb-jee/src/test/resources/wls-v81-ejb-jar.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    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$ -->
-
+<!--
+
+    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$ -->
+
 <weblogic-ejb-jar xmlns="http://www.bea.com/ns/weblogic/90">
     <description>description0</description>
     <weblogic-enterprise-bean>


[33/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java
index d69250b..5b56ea0 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java
@@ -1,318 +1,318 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 The activation-configType defines information about the
- * expected configuration properties of the message-driven bean in its
- * operational environment. This may include information about message
- * acknowledgement, message selector, expected destination type, etc.
- * <p/>
- * The configuration information is expressed in terms of name/value
- * configuration properties.
- * <p/>
- * The properties that are recognized for a particular message-driven
- * bean are determined by the messaging type.
- * <p/>
- * <p/>
- * <p/>
- * Java class for ActivationConfig complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ActivationConfig">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="configProperties" type="{ejb.xmi}ActivationConfigProperty"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ActivationConfig", propOrder = {"configProperties",
-    "descriptions", "extensions"})
-public class ActivationConfig {
-
-    protected List<ActivationConfigProperty> configProperties;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the configProperties 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 configProperties property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getConfigProperties().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ActivationConfigProperty }
-     */
-    public List<ActivationConfigProperty> getConfigProperties() {
-        if (configProperties == null) {
-            configProperties = new ArrayList<ActivationConfigProperty>();
-        }
-        return this.configProperties;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 The activation-configType defines information about the
+ * expected configuration properties of the message-driven bean in its
+ * operational environment. This may include information about message
+ * acknowledgement, message selector, expected destination type, etc.
+ * <p/>
+ * The configuration information is expressed in terms of name/value
+ * configuration properties.
+ * <p/>
+ * The properties that are recognized for a particular message-driven
+ * bean are determined by the messaging type.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for ActivationConfig complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ActivationConfig">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="configProperties" type="{ejb.xmi}ActivationConfigProperty"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ActivationConfig", propOrder = {"configProperties",
+    "descriptions", "extensions"})
+public class ActivationConfig {
+
+    protected List<ActivationConfigProperty> configProperties;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the configProperties 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 configProperties property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getConfigProperties().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ActivationConfigProperty }
+     */
+    public List<ActivationConfigProperty> getConfigProperties() {
+        if (configProperties == null) {
+            configProperties = new ArrayList<ActivationConfigProperty>();
+        }
+        return this.configProperties;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java
index 7adf612..a18c89a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java
@@ -1,287 +1,287 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @since J2EE1.4 The activation-config-propertyType contains a name/value
- * configuration property pair for a message-driven bean.
- * <p/>
- * The properties that are recognized for a particular message-driven
- * bean are determined by the messaging type.
- * <p/>
- * <p/>
- * <p/>
- * Java class for ActivationConfigProperty complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ActivationConfigProperty">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ActivationConfigProperty", propOrder = {"extensions"})
-public class ActivationConfigProperty {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected String value;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * 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 value property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setValue(final String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @since J2EE1.4 The activation-config-propertyType contains a name/value
+ * configuration property pair for a message-driven bean.
+ * <p/>
+ * The properties that are recognized for a particular message-driven
+ * bean are determined by the messaging type.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for ActivationConfigProperty complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ActivationConfigProperty">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ActivationConfigProperty", propOrder = {"extensions"})
+public class ActivationConfigProperty {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String value;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * 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 value property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java
index b9109d8..280d114 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java
@@ -1,414 +1,414 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.MessageDestination;
-import org.apache.openejb.jee.was.v6.common.SecurityRole;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The assembly-descriptor element contains application-assembly information.
- * The application-assembly information consists of the following parts: the
- * definition of security roles, the definition of method permissions, and the
- * definition of transaction attributes for enterprise beans with
- * container-managed transaction demarcation. All the parts are optional in the
- * sense that they are omitted if the lists represented by them are empty.
- * Providing an assembly-descriptor in the deployment descriptor is optional for
- * the ejb-jar file producer.
- * <p/>
- * <p/>
- * <p/>
- * Java class for AssemblyDescriptor complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="AssemblyDescriptor">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="methodPermissions" type="{ejb.xmi}MethodPermission"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="methodTransactions" type="{ejb.xmi}MethodTransaction"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="securityRoles" type="{common.xmi}SecurityRole"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="excludeList" type="{ejb.xmi}ExcludeList"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="messageDestinations" type="{common.xmi}MessageDestination"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AssemblyDescriptor", propOrder = {"methodPermissions",
-    "methodTransactions", "securityRoles", "excludeList",
-    "messageDestinations", "extensions"})
-public class AssemblyDescriptor {
-
-    protected List<MethodPermission> methodPermissions;
-    protected List<MethodTransaction> methodTransactions;
-    protected List<SecurityRole> securityRoles;
-    protected List<ExcludeList> excludeList;
-    protected List<MessageDestination> messageDestinations;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the methodPermissions 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 methodPermissions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMethodPermissions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MethodPermission }
-     */
-    public List<MethodPermission> getMethodPermissions() {
-        if (methodPermissions == null) {
-            methodPermissions = new ArrayList<MethodPermission>();
-        }
-        return this.methodPermissions;
-    }
-
-    /**
-     * Gets the value of the methodTransactions 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 methodTransactions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMethodTransactions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MethodTransaction }
-     */
-    public List<MethodTransaction> getMethodTransactions() {
-        if (methodTransactions == null) {
-            methodTransactions = new ArrayList<MethodTransaction>();
-        }
-        return this.methodTransactions;
-    }
-
-    /**
-     * Gets the value of the securityRoles 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 securityRoles property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getSecurityRoles().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SecurityRole }
-     */
-    public List<SecurityRole> getSecurityRoles() {
-        if (securityRoles == null) {
-            securityRoles = new ArrayList<SecurityRole>();
-        }
-        return this.securityRoles;
-    }
-
-    /**
-     * Gets the value of the excludeList 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 excludeList property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExcludeList().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExcludeList }
-     */
-    public List<ExcludeList> getExcludeList() {
-        if (excludeList == null) {
-            excludeList = new ArrayList<ExcludeList>();
-        }
-        return this.excludeList;
-    }
-
-    /**
-     * Gets the value of the messageDestinations 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 messageDestinations property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getMessageDestinations().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MessageDestination }
-     */
-    public List<MessageDestination> getMessageDestinations() {
-        if (messageDestinations == null) {
-            messageDestinations = new ArrayList<MessageDestination>();
-        }
-        return this.messageDestinations;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.MessageDestination;
+import org.apache.openejb.jee.was.v6.common.SecurityRole;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The assembly-descriptor element contains application-assembly information.
+ * The application-assembly information consists of the following parts: the
+ * definition of security roles, the definition of method permissions, and the
+ * definition of transaction attributes for enterprise beans with
+ * container-managed transaction demarcation. All the parts are optional in the
+ * sense that they are omitted if the lists represented by them are empty.
+ * Providing an assembly-descriptor in the deployment descriptor is optional for
+ * the ejb-jar file producer.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for AssemblyDescriptor complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="AssemblyDescriptor">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="methodPermissions" type="{ejb.xmi}MethodPermission"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="methodTransactions" type="{ejb.xmi}MethodTransaction"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="securityRoles" type="{common.xmi}SecurityRole"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="excludeList" type="{ejb.xmi}ExcludeList"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="messageDestinations" type="{common.xmi}MessageDestination"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AssemblyDescriptor", propOrder = {"methodPermissions",
+    "methodTransactions", "securityRoles", "excludeList",
+    "messageDestinations", "extensions"})
+public class AssemblyDescriptor {
+
+    protected List<MethodPermission> methodPermissions;
+    protected List<MethodTransaction> methodTransactions;
+    protected List<SecurityRole> securityRoles;
+    protected List<ExcludeList> excludeList;
+    protected List<MessageDestination> messageDestinations;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the methodPermissions 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 methodPermissions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMethodPermissions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MethodPermission }
+     */
+    public List<MethodPermission> getMethodPermissions() {
+        if (methodPermissions == null) {
+            methodPermissions = new ArrayList<MethodPermission>();
+        }
+        return this.methodPermissions;
+    }
+
+    /**
+     * Gets the value of the methodTransactions 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 methodTransactions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMethodTransactions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MethodTransaction }
+     */
+    public List<MethodTransaction> getMethodTransactions() {
+        if (methodTransactions == null) {
+            methodTransactions = new ArrayList<MethodTransaction>();
+        }
+        return this.methodTransactions;
+    }
+
+    /**
+     * Gets the value of the securityRoles 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 securityRoles property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getSecurityRoles().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SecurityRole }
+     */
+    public List<SecurityRole> getSecurityRoles() {
+        if (securityRoles == null) {
+            securityRoles = new ArrayList<SecurityRole>();
+        }
+        return this.securityRoles;
+    }
+
+    /**
+     * Gets the value of the excludeList 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 excludeList property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExcludeList().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ExcludeList }
+     */
+    public List<ExcludeList> getExcludeList() {
+        if (excludeList == null) {
+            excludeList = new ArrayList<ExcludeList>();
+        }
+        return this.excludeList;
+    }
+
+    /**
+     * Gets the value of the messageDestinations 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 messageDestinations property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getMessageDestinations().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MessageDestination }
+     */
+    public List<MessageDestination> getMessageDestinations() {
+        if (messageDestinations == null) {
+            messageDestinations = new ArrayList<MessageDestination>();
+        }
+        return this.messageDestinations;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMPAttribute.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMPAttribute.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMPAttribute.java
index 5638990..3a57f58 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMPAttribute.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMPAttribute.java
@@ -1,108 +1,108 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.ecore.EAttribute;
-
-/**
- * Describes a container-managed field. The field element includes an optional
- * description of the field, and the name of the field.
- * <p/>
- * <p/>
- * <p/>
- * Java class for CMPAttribute complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="CMPAttribute">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EAttribute">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="descriptions" type="{common.xmi}Description"/>
- *       &lt;/choice>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CMPAttribute", propOrder = {"descriptions"})
-public class CMPAttribute extends EAttribute {
-
-    protected List<Description> descriptions;
-    @XmlAttribute
-    protected String description;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.ecore.EAttribute;
+
+/**
+ * Describes a container-managed field. The field element includes an optional
+ * description of the field, and the name of the field.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for CMPAttribute complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="CMPAttribute">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EAttribute">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CMPAttribute", propOrder = {"descriptions"})
+public class CMPAttribute extends EAttribute {
+
+    protected List<Description> descriptions;
+    @XmlAttribute
+    protected String description;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMRField.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMRField.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMRField.java
index b26bc51..de8a1b3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMRField.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/CMRField.java
@@ -1,115 +1,115 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.java.JavaClass;
-
-/**
- * @since J2EE1.3 Describes the bean provider's view of a relationship. It
- * consists of an optional description, and the name and the class type
- * of a field in the source of a role of a relationship. The
- * CMRField::name element corresponds to the name used for the get and
- * set accessor methods for the relationship. The CMRField::type element
- * is used only for collection-valued CMRFields. It specifies the type of
- * the collection that is used (a java class name).
- * <p/>
- * <p/>
- * <p/>
- * <p/>
- * Java class for CMRField complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained
- * within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="CMRField">
- *   &lt;complexContent>
- *     &lt;extension base="{ejb.xmi}CMPAttribute">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="collectionType" type="{java.xmi}JavaClass"/>
- *       &lt;/choice>
- *       &lt;attribute name="collectionType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CMRField", propOrder = {"collectionTypes"})
-public class CMRField extends CMPAttribute {
-
-    @XmlElement(name = "collectionType")
-    protected List<JavaClass> collectionTypes;
-    @XmlAttribute
-    protected String collectionType;
-
-    /**
-     * Gets the value of the collectionTypes 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 collectionTypes property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getCollectionTypes().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getCollectionTypes() {
-        if (collectionTypes == null) {
-            collectionTypes = new ArrayList<JavaClass>();
-        }
-        return this.collectionTypes;
-    }
-
-    /**
-     * Gets the value of the collectionType property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getCollectionType() {
-        return collectionType;
-    }
-
-    /**
-     * Sets the value of the collectionType property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setCollectionType(final String value) {
-        this.collectionType = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.java.JavaClass;
+
+/**
+ * @since J2EE1.3 Describes the bean provider's view of a relationship. It
+ * consists of an optional description, and the name and the class type
+ * of a field in the source of a role of a relationship. The
+ * CMRField::name element corresponds to the name used for the get and
+ * set accessor methods for the relationship. The CMRField::type element
+ * is used only for collection-valued CMRFields. It specifies the type of
+ * the collection that is used (a java class name).
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for CMRField complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained
+ * within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="CMRField">
+ *   &lt;complexContent>
+ *     &lt;extension base="{ejb.xmi}CMPAttribute">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="collectionType" type="{java.xmi}JavaClass"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="collectionType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CMRField", propOrder = {"collectionTypes"})
+public class CMRField extends CMPAttribute {
+
+    @XmlElement(name = "collectionType")
+    protected List<JavaClass> collectionTypes;
+    @XmlAttribute
+    protected String collectionType;
+
+    /**
+     * Gets the value of the collectionTypes 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 collectionTypes property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getCollectionTypes().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getCollectionTypes() {
+        if (collectionTypes == null) {
+            collectionTypes = new ArrayList<JavaClass>();
+        }
+        return this.collectionTypes;
+    }
+
+    /**
+     * Gets the value of the collectionType property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getCollectionType() {
+        return collectionType;
+    }
+
+    /**
+     * Sets the value of the collectionType property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setCollectionType(final String value) {
+        this.collectionType = value;
+    }
+
+}


[48/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/PersistenceUnitLinkResolverTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/PersistenceUnitLinkResolverTest.java b/container/openejb-core/src/test/java/org/apache/openejb/PersistenceUnitLinkResolverTest.java
index 57ecf5f..4f6b5a2 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/PersistenceUnitLinkResolverTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/PersistenceUnitLinkResolverTest.java
@@ -1,44 +1,44 @@
-/*
- * 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;
-
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.PersistenceUnitLinkResolver;
-import org.apache.openejb.jee.Application;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.apache.openejb.loader.Files;
-import org.junit.Test;
-
-import java.io.File;
-import java.net.URI;
-
-import static org.junit.Assert.assertNull;
-
-public class PersistenceUnitLinkResolverTest {
-    @Test
-    public void resolve() {
-        final AppModule appModule = new AppModule(Thread.currentThread().getContextClassLoader(), "target/classes/foo", new Application(), false);
-
-        Files.mkdir(new File("target/classes/foo/bar"));
-
-        final PersistenceUnitLinkResolver resolver = new PersistenceUnitLinkResolver(appModule);
-        resolver.add(URI.create("file:/fake/1"), "foo", new PersistenceUnit());
-        resolver.add(URI.create("file:/fake/2"), "foo", new PersistenceUnit());
-
-        assertNull(resolver.resolveLink("foo", URI.create("bar"))); // can't resolve but doesn't fail
-    }
-}
+/*
+ * 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;
+
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.PersistenceUnitLinkResolver;
+import org.apache.openejb.jee.Application;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.loader.Files;
+import org.junit.Test;
+
+import java.io.File;
+import java.net.URI;
+
+import static org.junit.Assert.assertNull;
+
+public class PersistenceUnitLinkResolverTest {
+    @Test
+    public void resolve() {
+        final AppModule appModule = new AppModule(Thread.currentThread().getContextClassLoader(), "target/classes/foo", new Application(), false);
+
+        Files.mkdir(new File("target/classes/foo/bar"));
+
+        final PersistenceUnitLinkResolver resolver = new PersistenceUnitLinkResolver(appModule);
+        resolver.add(URI.create("file:/fake/1"), "foo", new PersistenceUnit());
+        resolver.add(URI.create("file:/fake/2"), "foo", new PersistenceUnit());
+
+        assertNull(resolver.resolveLink("foo", URI.create("bar"))); // can't resolve but doesn't fail
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/activemq/KahaDBSupportTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/activemq/KahaDBSupportTest.java b/container/openejb-core/src/test/java/org/apache/openejb/activemq/KahaDBSupportTest.java
index 5bc6b58..5664afb 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/activemq/KahaDBSupportTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/activemq/KahaDBSupportTest.java
@@ -1,44 +1,44 @@
-/**
- * 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.activemq;
-
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
-import org.apache.openejb.util.NetworkUtil;
-import org.junit.Test;
-
-import java.io.File;
-import java.net.URI;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-
-public class KahaDBSupportTest {
-    @Test
-    public void create() throws Exception {
-        final BrokerService broker = BrokerFactory.createBroker(new URI("openejb:broker:(tcp://localhost:" + NetworkUtil.getNextAvailablePort() + ")?usekahadb=true&kahadb.directory=target/kahatest"));
-        try {
-            assertThat(broker.getPersistenceAdapter(), instanceOf(KahaDBPersistenceAdapter.class));
-            final KahaDBPersistenceAdapter adapter = KahaDBPersistenceAdapter.class.cast(broker.getPersistenceAdapter());
-            assertEquals(new File("target/kahatest"), adapter.getDirectory());
-        } finally {
-            broker.stop();
-        }
-    }
-}
+/**
+ * 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.activemq;
+
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.Test;
+
+import java.io.File;
+import java.net.URI;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+public class KahaDBSupportTest {
+    @Test
+    public void create() throws Exception {
+        final BrokerService broker = BrokerFactory.createBroker(new URI("openejb:broker:(tcp://localhost:" + NetworkUtil.getNextAvailablePort() + ")?usekahadb=true&kahadb.directory=target/kahatest"));
+        try {
+            assertThat(broker.getPersistenceAdapter(), instanceOf(KahaDBPersistenceAdapter.class));
+            final KahaDBPersistenceAdapter adapter = KahaDBPersistenceAdapter.class.cast(broker.getPersistenceAdapter());
+            assertEquals(new File("target/kahatest"), adapter.getDirectory());
+        } finally {
+            broker.stop();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java
index 9626ad9..3b0a075 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java
@@ -1,550 +1,550 @@
-/**
- * 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.config;
-
-import org.apache.openejb.OpenEJB;
-import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.ClientInfo;
-import org.apache.openejb.jee.AssemblyDescriptor;
-import org.apache.openejb.jee.ConfigProperty;
-import org.apache.openejb.jee.Connector;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.EnterpriseBean;
-import org.apache.openejb.jee.SessionBean;
-import org.apache.openejb.jee.TransactionSupportType;
-import org.apache.openejb.jee.WebApp;
-import org.apache.xbean.finder.Annotated;
-import org.apache.xbean.finder.AnnotationFinder;
-import org.apache.xbean.finder.ClassFinder;
-import org.apache.xbean.finder.archive.ClassesArchive;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Test;
-
-import javax.annotation.Resource;
-import javax.ejb.ApplicationException;
-import javax.ejb.Local;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.resource.Referenceable;
-import javax.resource.ResourceException;
-import javax.resource.cci.MessageListener;
-import javax.resource.cci.Record;
-import javax.resource.spi.Activation;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.AdministeredObject;
-import javax.resource.spi.AuthenticationMechanism;
-import javax.resource.spi.AuthenticationMechanism.CredentialInterface;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ConnectionDefinition;
-import javax.resource.spi.ConnectionManager;
-import javax.resource.spi.ConnectionRequestInfo;
-import javax.resource.spi.InvalidPropertyException;
-import javax.resource.spi.ManagedConnection;
-import javax.resource.spi.ManagedConnectionFactory;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.ResourceAdapterInternalException;
-import javax.resource.spi.SecurityPermission;
-import javax.resource.spi.TransactionSupport.TransactionSupportLevel;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.resource.spi.work.WorkContext;
-import javax.security.auth.Subject;
-import javax.transaction.xa.XAResource;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AnnotationDeployerTest {
-
-    @AfterClass
-    public static void afterClass() throws Exception {
-        OpenEJB.destroy();
-    }
-
-    @Test
-    /**
-     *  For http://issues.apache.org/jira/browse/OPENEJB-980
-     */
-    public void applicationExceptionInheritanceTest() throws Exception {
-        EjbModule ejbModule = testModule();
-        final AnnotationDeployer.DiscoverAnnotatedBeans discvrAnnBeans = new AnnotationDeployer.DiscoverAnnotatedBeans();
-        ejbModule = discvrAnnBeans.deploy(ejbModule);
-
-        final AssemblyDescriptor assemblyDescriptor = ejbModule.getEjbJar().getAssemblyDescriptor();
-        org.apache.openejb.jee.ApplicationException appEx =
-            assemblyDescriptor.getApplicationException(BusinessException.class);
-        assertThat(appEx, notNullValue());
-        assertThat(appEx.getExceptionClass(), is(BusinessException.class.getName()));
-        assertThat(appEx.isRollback(), is(true));
-
-        //inheritance is now handled at runtime, only explicitly mentioned exceptions are in the assembly descriptor
-        appEx = assemblyDescriptor.getApplicationException(ValueRequiredException.class);
-        assertThat(appEx, nullValue());
-    }
-
-    private EjbModule testModule() {
-        final EjbJar ejbJar = new EjbJar("test-classes");
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        ejbModule.setFinder(new ClassFinder(AnnotationDeployerTest.class,
-            BusinessException.class,
-            Exception.class,
-            GenericInterface.class,
-            InterceptedSLSBean.class,
-            MyMainClass.class,
-            TestLocalBean.class,
-            ValueRequiredException.class
-        ));
-        return ejbModule;
-    }
-
-
-    @Test
-    public void testSortClasses() throws Exception {
-        final AnnotationFinder finder = new AnnotationFinder(new ClassesArchive(Emerald.class)).link();
-
-        final List<Annotated<Class<?>>> classes = finder.findMetaAnnotatedClasses(Resource.class);
-        assertTrue(classes.size() >= 3);
-
-        final List<Annotated<Class<?>>> sorted = AnnotationDeployer.sortClasses(classes);
-
-        assertTrue(sorted.size() >= 3);
-
-        assertEquals(Emerald.class, sorted.get(0).get());
-        assertEquals(Green.class, sorted.get(1).get());
-        assertEquals(Color.class, sorted.get(2).get());
-    }
-
-    @Test
-    public void testSortMethods() throws Exception {
-        final AnnotationFinder finder = new AnnotationFinder(new ClassesArchive(Emerald.class)).link();
-
-        final List<Annotated<Method>> classes = finder.findMetaAnnotatedMethods(Resource.class);
-        assertTrue(classes.size() >= 3);
-
-        final List<Annotated<Method>> sorted = AnnotationDeployer.sortMethods(classes);
-
-        assertTrue(sorted.size() >= 3);
-
-        assertEquals(Emerald.class, sorted.get(0).get().getDeclaringClass());
-        assertEquals(Green.class, sorted.get(1).get().getDeclaringClass());
-        assertEquals(Color.class, sorted.get(2).get().getDeclaringClass());
-    }
-
-    @Test
-    /**
-     *  For https://issues.apache.org/jira/browse/OPENEJB-1063
-     */
-    public void badMainClassFormatTest() throws Exception {
-        final ConfigurationFactory config = new ConfigurationFactory();
-        final Assembler assembler = new Assembler();
-
-        final AppModule app = new AppModule(this.getClass().getClassLoader(), "test-app");
-
-        final ClientModule clientModule = new ClientModule(null, app.getClassLoader(), app.getJarLocation(), null, null);
-
-        // change "." --> "/" to check that main class is changed by the AnnotationDeployer
-        final String mainClass = MyMainClass.class.getName().replaceAll("\\.", "/");
-        clientModule.setMainClass(mainClass);
-
-        app.getClientModules().add(clientModule);
-
-        final AppInfo appInfo = config.configureApplication(app);
-
-        assembler.createApplication(appInfo);
-
-        final ClientInfo clientInfo = appInfo.clients.get(0);
-        Assert.assertNotNull(clientInfo);
-        Assert.assertEquals(MyMainClass.class.getName(), clientInfo.mainClass);
-    }
-
-    /**
-     * For https://issues.apache.org/jira/browse/OPENEJB-1128
-     */
-    @Test
-    public void interceptingGenericBusinessMethodCalls() throws Exception {
-        EjbModule ejbModule = testModule();
-        final EjbJar ejbJar = ejbModule.getEjbJar();
-
-        final AnnotationDeployer.DiscoverAnnotatedBeans discvrAnnBeans = new AnnotationDeployer.DiscoverAnnotatedBeans();
-        ejbModule = discvrAnnBeans.deploy(ejbModule);
-
-        final EnterpriseBean bean = ejbJar.getEnterpriseBean("InterceptedSLSBean");
-        assert bean != null;
-    }
-
-    /**
-     * For https://issues.apache.org/jira/browse/OPENEJB-1188
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testLocalBean() throws Exception {
-        final EjbModule ejbModule = testModule();
-        final EjbJar ejbJar = ejbModule.getEjbJar();
-
-        AppModule appModule = new AppModule(Thread.currentThread().getContextClassLoader(), "myapp");
-        appModule.getEjbModules().add(ejbModule);
-
-        final AnnotationDeployer annotationDeployer = new AnnotationDeployer();
-        appModule = annotationDeployer.deploy(appModule);
-
-        EnterpriseBean bean = ejbJar.getEnterpriseBean("TestLocalBean");
-        assert bean != null;
-        assert (((SessionBean) bean).getLocalBean() != null);
-
-        bean = ejbJar.getEnterpriseBean("InterceptedSLSBean");
-        assert bean != null;
-        assert (((SessionBean) bean).getLocalBean() == null);
-    }
-
-    @Test
-    public void testResourceAdapter() throws Exception {
-        final ConnectorModule connectorModule = testConnectorModule();
-        final AnnotationDeployer.DiscoverAnnotatedBeans discvrAnnBeans = new AnnotationDeployer.DiscoverAnnotatedBeans();
-        discvrAnnBeans.deploy(connectorModule);
-
-        final Connector connector = connectorModule.getConnector();
-        Assert.assertEquals("displayName", connector.getDisplayName());
-        Assert.assertEquals("description", connector.getDescription());
-        Assert.assertEquals("eisType", connector.getEisType());
-        Assert.assertEquals("vendorName", connector.getVendorName());
-        Assert.assertEquals("version", connector.getResourceAdapterVersion());
-        Assert.assertEquals("smallIcon", connector.getIcon().getSmallIcon());
-        Assert.assertEquals("largeIcon", connector.getIcon().getLargeIcon());
-        Assert.assertEquals("licenseDescription", connector.getLicense().getDescription());
-        Assert.assertEquals(true, connector.getLicense().isLicenseRequired());
-
-        final List<org.apache.openejb.jee.SecurityPermission> securityPermission = connector.getResourceAdapter().getSecurityPermission();
-        Assert.assertEquals("description", securityPermission.get(0).getDescription());
-        Assert.assertEquals("permissionSpec", securityPermission.get(0).getSecurityPermissionSpec());
-
-        final List<String> requiredWorkContext = connector.getRequiredWorkContext();
-        Assert.assertEquals(TestWorkContext.class.getName(), requiredWorkContext.get(0));
-
-        final List<org.apache.openejb.jee.AuthenticationMechanism> authenticationMechanism = connector.getResourceAdapter().getOutboundResourceAdapter().getAuthenticationMechanism();
-        Assert.assertEquals("authMechanism", authenticationMechanism.get(0).getAuthenticationMechanismType());
-        Assert.assertEquals(CredentialInterface.GenericCredential.toString(), authenticationMechanism.get(0).getCredentialInterface());
-        Assert.assertEquals("description", authenticationMechanism.get(0).getDescription());
-
-        Assert.assertEquals(TransactionSupportType.NO_TRANSACTION, connector.getResourceAdapter().getOutboundResourceAdapter().getTransactionSupport());
-        Assert.assertEquals(true, connector.getResourceAdapter().getOutboundResourceAdapter().isReauthenticationSupport());
-
-        Assert.assertEquals(Connection.class.getName(), connector.getResourceAdapter().getOutboundResourceAdapter().getConnectionDefinition().get(0).getConnectionInterface());
-        Assert.assertEquals(ConnectionImpl.class.getName(), connector.getResourceAdapter().getOutboundResourceAdapter().getConnectionDefinition().get(0).getConnectionImplClass());
-        Assert.assertEquals(ConnectionFactory.class.getName(), connector.getResourceAdapter().getOutboundResourceAdapter().getConnectionDefinition().get(0).getConnectionFactoryInterface());
-        Assert.assertEquals(ConnectionFactoryImpl.class.getName(), connector.getResourceAdapter().getOutboundResourceAdapter().getConnectionDefinition().get(0).getConnectionFactoryImplClass());
-
-        Assert.assertEquals(TestActivation.class.getName(), connector.getResourceAdapter().getInboundResourceAdapter().getMessageAdapter().getMessageListener().get(0).getActivationSpec().getActivationSpecClass());
-        Assert.assertEquals(TestMessageListener.class.getName(), connector.getResourceAdapter().getInboundResourceAdapter().getMessageAdapter().getMessageListener().get(0).getMessageListenerType());
-
-        Assert.assertEquals(TestAdminObject.class.getName(), connector.getResourceAdapter().getAdminObject().get(0).getAdminObjectClass());
-        Assert.assertEquals(TestAdminObjectInterface.class.getName(), connector.getResourceAdapter().getAdminObject().get(0).getAdminObjectInterface());
-    }
-
-    private ConnectorModule testConnectorModule() {
-        final Connector connector = new Connector();
-        final ConnectorModule connectorModule = new ConnectorModule(connector);
-        connectorModule.setFinder(new ClassFinder(TestConnector.class, TestManagedConnectionFactory.class, TestActivation.class, TestAdminObject.class));
-        return connectorModule;
-    }
-
-    @Test
-    public void testConfigProperties() throws Exception {
-        final ClassFinder finder = new ClassFinder(TestAdminObject.class);
-
-        final List<ConfigProperty> configProperty = new ArrayList<ConfigProperty>();
-
-        final Object object = new Object() {
-            public List<ConfigProperty> getConfigProperty() {
-                return configProperty;
-            }
-        };
-
-        new AnnotationDeployer.DiscoverAnnotatedBeans().process(null, TestAdminObject.class.getName(), object);
-        Assert.assertEquals(2, configProperty.size());
-        Assert.assertEquals("myNumber", configProperty.get(0).getConfigPropertyName());
-        Assert.assertEquals("java.lang.Integer", configProperty.get(0).getConfigPropertyType());
-        Assert.assertEquals("myProperty", configProperty.get(1).getConfigPropertyName());
-        Assert.assertEquals("java.lang.String", configProperty.get(1).getConfigPropertyType());
-        Assert.assertEquals("This is a test", configProperty.get(1).getConfigPropertyValue());
-    }
-
-    @ApplicationException(rollback = true)
-    public abstract class BusinessException extends Exception {
-    }
-
-    public class ValueRequiredException extends BusinessException {
-    }
-
-    public static final class MyMainClass {
-        public static void main(final String[] args) {
-        }
-    }
-
-    public static interface GenericInterface<T> {
-        T genericMethod(T t);
-    }
-
-    @Stateless
-    @Local(GenericInterface.class)
-    public static class InterceptedSLSBean implements GenericInterface<String> {
-        public String genericMethod(final String s) {
-            return s;
-        }
-    }
-
-    @Stateless
-    @LocalBean
-    public static class TestLocalBean {
-        public String echo(final String input) {
-            return input;
-        }
-    }
-
-    @Resource
-    public static class Color {
-        @Resource
-        public void color() {
-        }
-    }
-
-    @Resource
-    public static class Green extends Color {
-        @Resource
-        public void green() {
-        }
-    }
-
-    @Resource
-    public static class Emerald extends Green {
-        @Resource
-        public void emerald() {
-        }
-    }
-
-    @javax.resource.spi.Connector(description = "description",
-        displayName = "displayName", smallIcon = "smallIcon",
-        largeIcon = "largeIcon", vendorName = "vendorName",
-        eisType = "eisType",
-        version = "version",
-        licenseDescription = {"licenseDescription"},
-        licenseRequired = true,
-        authMechanisms = {@AuthenticationMechanism(authMechanism = "authMechanism",
-            credentialInterface = CredentialInterface.GenericCredential, description = {"description"})},
-        reauthenticationSupport = true,
-        securityPermissions = {@SecurityPermission(permissionSpec = "permissionSpec", description = "description")},
-        transactionSupport = TransactionSupportLevel.NoTransaction,
-        requiredWorkContexts = {TestWorkContext.class}
-    )
-    public static class TestConnector implements ResourceAdapter {
-
-        public void endpointActivation(final MessageEndpointFactory mef, final ActivationSpec spec) throws ResourceException {
-        }
-
-        public void endpointDeactivation(final MessageEndpointFactory mef, final ActivationSpec spec) {
-        }
-
-        public XAResource[] getXAResources(final ActivationSpec[] specs) throws ResourceException {
-            return null;
-        }
-
-        public void start(final BootstrapContext ctx) throws ResourceAdapterInternalException {
-        }
-
-        public void stop() {
-        }
-    }
-
-    @ConnectionDefinition(connection = Connection.class, connectionFactory = ConnectionFactory.class, connectionImpl = ConnectionImpl.class, connectionFactoryImpl = ConnectionFactoryImpl.class)
-    public static class TestManagedConnectionFactory implements ManagedConnectionFactory {
-
-        public Object createConnectionFactory() throws ResourceException {
-            return null;
-        }
-
-        public Object createConnectionFactory(final ConnectionManager connectionManager) throws ResourceException {
-            return null;
-        }
-
-        public ManagedConnection createManagedConnection(final Subject subject, final ConnectionRequestInfo connectionRequestInfo) throws ResourceException {
-            return null;
-        }
-
-        public PrintWriter getLogWriter() throws ResourceException {
-            return null;
-        }
-
-        public ManagedConnection matchManagedConnections(final Set managedConnections, final Subject subject, final ConnectionRequestInfo connectionRequestInfo) throws ResourceException {
-            return null;
-        }
-
-        public void setLogWriter(final PrintWriter writer) throws ResourceException {
-        }
-
-    }
-
-    public static class TestWorkContext implements WorkContext {
-        public String getDescription() {
-            return "Description";
-        }
-
-        public String getName() {
-            return "Name";
-        }
-    }
-
-    public static interface Connection {
-    }
-
-    public static class ConnectionImpl implements Connection {
-    }
-
-    public static interface ConnectionFactory extends Serializable, Referenceable {
-    }
-
-    public static class ConnectionFactoryImpl implements ConnectionFactory {
-
-        public void setReference(final Reference reference) {
-        }
-
-        public Reference getReference() throws NamingException {
-            return null;
-        }
-    }
-
-    @Activation(messageListeners = {TestMessageListener.class})
-    public static class TestActivation implements ActivationSpec, Serializable {
-
-        public ResourceAdapter getResourceAdapter() {
-            return null;
-        }
-
-        public void setResourceAdapter(final ResourceAdapter arg0) throws ResourceException {
-        }
-
-        public void validate() throws InvalidPropertyException {
-        }
-    }
-
-    public static class TestMessageListener implements MessageListener {
-        public Record onMessage(final Record arg0) throws ResourceException {
-            return null;
-        }
-    }
-
-    public static interface TestAdminObjectInterface {
-    }
-
-    public static interface SomeOtherInterface {
-    }
-
-    @AdministeredObject(adminObjectInterfaces = {TestAdminObjectInterface.class})
-    public static class TestAdminObject implements TestAdminObjectInterface, SomeOtherInterface {
-        private String myProperty = "This is a test";
-
-        @javax.resource.spi.ConfigProperty(ignore = true)
-        private int myNumber;
-
-        public String getMyProperty() {
-            return myProperty;
-        }
-
-        public void setMyProperty(final String myProperty) {
-            this.myProperty = myProperty;
-        }
-
-        public int getMyNumber() {
-            return myNumber;
-        }
-
-        public void setMyNumber(final int myNumber) {
-            this.myNumber = myNumber;
-        }
-    }
-
-    @Test
-    public void findRestClasses() throws Exception {
-        final WebApp webApp = new WebApp();
-        webApp.setContextRoot("/");
-        webApp.setId("web");
-        webApp.setVersion("2.5");
-        WebModule webModule = new WebModule(webApp, webApp.getContextRoot(), Thread.currentThread().getContextClassLoader(), "myapp", webApp.getId());
-        webModule.setFinder(new AnnotationFinder(new ClassesArchive(RESTClass.class, RESTMethod.class, RESTApp.class)).link());
-
-        final AnnotationDeployer annotationDeployer = new AnnotationDeployer();
-        webModule = annotationDeployer.deploy(webModule);
-
-        final Set<String> classes = webModule.getRestClasses();
-        final Set<String> applications = webModule.getRestApplications();
-
-        assertEquals(1, classes.size());
-        assertTrue(classes.contains(RESTClass.class.getName()));
-        // assertTrue(classes.contains(RESTMethod.class.getName()));
-
-        assertEquals(1, applications.size());
-        assertEquals(RESTApp.class.getName(), applications.iterator().next());
-    }
-
-    @Path("/")
-    public static class RESTClass {
-
-    }
-
-    public static class RESTMethod extends RESTClass {
-        @Path("/method")
-        public void noop() {
-            // no-op
-        }
-    }
-
-    @ApplicationPath("/")
-    public static class RESTApp extends Application {
-        public java.util.Set<java.lang.Class<?>> getClasses() {
-            return new HashSet<Class<?>>() {{
-                add(RESTClass.class);
-                add(RESTMethod.class);
-            }};
-        }
-
-        public java.util.Set<java.lang.Object> getSingletons() {
-            return new HashSet<Object>() {{
-                add(new RESTMethod());
-                add(new RESTMethod());
-            }};
-        }
-    }
-}
+/**
+ * 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.config;
+
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ClientInfo;
+import org.apache.openejb.jee.AssemblyDescriptor;
+import org.apache.openejb.jee.ConfigProperty;
+import org.apache.openejb.jee.Connector;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.SessionBean;
+import org.apache.openejb.jee.TransactionSupportType;
+import org.apache.openejb.jee.WebApp;
+import org.apache.xbean.finder.Annotated;
+import org.apache.xbean.finder.AnnotationFinder;
+import org.apache.xbean.finder.ClassFinder;
+import org.apache.xbean.finder.archive.ClassesArchive;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.annotation.Resource;
+import javax.ejb.ApplicationException;
+import javax.ejb.Local;
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.resource.Referenceable;
+import javax.resource.ResourceException;
+import javax.resource.cci.MessageListener;
+import javax.resource.cci.Record;
+import javax.resource.spi.Activation;
+import javax.resource.spi.ActivationSpec;
+import javax.resource.spi.AdministeredObject;
+import javax.resource.spi.AuthenticationMechanism;
+import javax.resource.spi.AuthenticationMechanism.CredentialInterface;
+import javax.resource.spi.BootstrapContext;
+import javax.resource.spi.ConnectionDefinition;
+import javax.resource.spi.ConnectionManager;
+import javax.resource.spi.ConnectionRequestInfo;
+import javax.resource.spi.InvalidPropertyException;
+import javax.resource.spi.ManagedConnection;
+import javax.resource.spi.ManagedConnectionFactory;
+import javax.resource.spi.ResourceAdapter;
+import javax.resource.spi.ResourceAdapterInternalException;
+import javax.resource.spi.SecurityPermission;
+import javax.resource.spi.TransactionSupport.TransactionSupportLevel;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.resource.spi.work.WorkContext;
+import javax.security.auth.Subject;
+import javax.transaction.xa.XAResource;
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class AnnotationDeployerTest {
+
+    @AfterClass
+    public static void afterClass() throws Exception {
+        OpenEJB.destroy();
+    }
+
+    @Test
+    /**
+     *  For http://issues.apache.org/jira/browse/OPENEJB-980
+     */
+    public void applicationExceptionInheritanceTest() throws Exception {
+        EjbModule ejbModule = testModule();
+        final AnnotationDeployer.DiscoverAnnotatedBeans discvrAnnBeans = new AnnotationDeployer.DiscoverAnnotatedBeans();
+        ejbModule = discvrAnnBeans.deploy(ejbModule);
+
+        final AssemblyDescriptor assemblyDescriptor = ejbModule.getEjbJar().getAssemblyDescriptor();
+        org.apache.openejb.jee.ApplicationException appEx =
+            assemblyDescriptor.getApplicationException(BusinessException.class);
+        assertThat(appEx, notNullValue());
+        assertThat(appEx.getExceptionClass(), is(BusinessException.class.getName()));
+        assertThat(appEx.isRollback(), is(true));
+
+        //inheritance is now handled at runtime, only explicitly mentioned exceptions are in the assembly descriptor
+        appEx = assemblyDescriptor.getApplicationException(ValueRequiredException.class);
+        assertThat(appEx, nullValue());
+    }
+
+    private EjbModule testModule() {
+        final EjbJar ejbJar = new EjbJar("test-classes");
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        ejbModule.setFinder(new ClassFinder(AnnotationDeployerTest.class,
+            BusinessException.class,
+            Exception.class,
+            GenericInterface.class,
+            InterceptedSLSBean.class,
+            MyMainClass.class,
+            TestLocalBean.class,
+            ValueRequiredException.class
+        ));
+        return ejbModule;
+    }
+
+
+    @Test
+    public void testSortClasses() throws Exception {
+        final AnnotationFinder finder = new AnnotationFinder(new ClassesArchive(Emerald.class)).link();
+
+        final List<Annotated<Class<?>>> classes = finder.findMetaAnnotatedClasses(Resource.class);
+        assertTrue(classes.size() >= 3);
+
+        final List<Annotated<Class<?>>> sorted = AnnotationDeployer.sortClasses(classes);
+
+        assertTrue(sorted.size() >= 3);
+
+        assertEquals(Emerald.class, sorted.get(0).get());
+        assertEquals(Green.class, sorted.get(1).get());
+        assertEquals(Color.class, sorted.get(2).get());
+    }
+
+    @Test
+    public void testSortMethods() throws Exception {
+        final AnnotationFinder finder = new AnnotationFinder(new ClassesArchive(Emerald.class)).link();
+
+        final List<Annotated<Method>> classes = finder.findMetaAnnotatedMethods(Resource.class);
+        assertTrue(classes.size() >= 3);
+
+        final List<Annotated<Method>> sorted = AnnotationDeployer.sortMethods(classes);
+
+        assertTrue(sorted.size() >= 3);
+
+        assertEquals(Emerald.class, sorted.get(0).get().getDeclaringClass());
+        assertEquals(Green.class, sorted.get(1).get().getDeclaringClass());
+        assertEquals(Color.class, sorted.get(2).get().getDeclaringClass());
+    }
+
+    @Test
+    /**
+     *  For https://issues.apache.org/jira/browse/OPENEJB-1063
+     */
+    public void badMainClassFormatTest() throws Exception {
+        final ConfigurationFactory config = new ConfigurationFactory();
+        final Assembler assembler = new Assembler();
+
+        final AppModule app = new AppModule(this.getClass().getClassLoader(), "test-app");
+
+        final ClientModule clientModule = new ClientModule(null, app.getClassLoader(), app.getJarLocation(), null, null);
+
+        // change "." --> "/" to check that main class is changed by the AnnotationDeployer
+        final String mainClass = MyMainClass.class.getName().replaceAll("\\.", "/");
+        clientModule.setMainClass(mainClass);
+
+        app.getClientModules().add(clientModule);
+
+        final AppInfo appInfo = config.configureApplication(app);
+
+        assembler.createApplication(appInfo);
+
+        final ClientInfo clientInfo = appInfo.clients.get(0);
+        Assert.assertNotNull(clientInfo);
+        Assert.assertEquals(MyMainClass.class.getName(), clientInfo.mainClass);
+    }
+
+    /**
+     * For https://issues.apache.org/jira/browse/OPENEJB-1128
+     */
+    @Test
+    public void interceptingGenericBusinessMethodCalls() throws Exception {
+        EjbModule ejbModule = testModule();
+        final EjbJar ejbJar = ejbModule.getEjbJar();
+
+        final AnnotationDeployer.DiscoverAnnotatedBeans discvrAnnBeans = new AnnotationDeployer.DiscoverAnnotatedBeans();
+        ejbModule = discvrAnnBeans.deploy(ejbModule);
+
+        final EnterpriseBean bean = ejbJar.getEnterpriseBean("InterceptedSLSBean");
+        assert bean != null;
+    }
+
+    /**
+     * For https://issues.apache.org/jira/browse/OPENEJB-1188
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testLocalBean() throws Exception {
+        final EjbModule ejbModule = testModule();
+        final EjbJar ejbJar = ejbModule.getEjbJar();
+
+        AppModule appModule = new AppModule(Thread.currentThread().getContextClassLoader(), "myapp");
+        appModule.getEjbModules().add(ejbModule);
+
+        final AnnotationDeployer annotationDeployer = new AnnotationDeployer();
+        appModule = annotationDeployer.deploy(appModule);
+
+        EnterpriseBean bean = ejbJar.getEnterpriseBean("TestLocalBean");
+        assert bean != null;
+        assert (((SessionBean) bean).getLocalBean() != null);
+
+        bean = ejbJar.getEnterpriseBean("InterceptedSLSBean");
+        assert bean != null;
+        assert (((SessionBean) bean).getLocalBean() == null);
+    }
+
+    @Test
+    public void testResourceAdapter() throws Exception {
+        final ConnectorModule connectorModule = testConnectorModule();
+        final AnnotationDeployer.DiscoverAnnotatedBeans discvrAnnBeans = new AnnotationDeployer.DiscoverAnnotatedBeans();
+        discvrAnnBeans.deploy(connectorModule);
+
+        final Connector connector = connectorModule.getConnector();
+        Assert.assertEquals("displayName", connector.getDisplayName());
+        Assert.assertEquals("description", connector.getDescription());
+        Assert.assertEquals("eisType", connector.getEisType());
+        Assert.assertEquals("vendorName", connector.getVendorName());
+        Assert.assertEquals("version", connector.getResourceAdapterVersion());
+        Assert.assertEquals("smallIcon", connector.getIcon().getSmallIcon());
+        Assert.assertEquals("largeIcon", connector.getIcon().getLargeIcon());
+        Assert.assertEquals("licenseDescription", connector.getLicense().getDescription());
+        Assert.assertEquals(true, connector.getLicense().isLicenseRequired());
+
+        final List<org.apache.openejb.jee.SecurityPermission> securityPermission = connector.getResourceAdapter().getSecurityPermission();
+        Assert.assertEquals("description", securityPermission.get(0).getDescription());
+        Assert.assertEquals("permissionSpec", securityPermission.get(0).getSecurityPermissionSpec());
+
+        final List<String> requiredWorkContext = connector.getRequiredWorkContext();
+        Assert.assertEquals(TestWorkContext.class.getName(), requiredWorkContext.get(0));
+
+        final List<org.apache.openejb.jee.AuthenticationMechanism> authenticationMechanism = connector.getResourceAdapter().getOutboundResourceAdapter().getAuthenticationMechanism();
+        Assert.assertEquals("authMechanism", authenticationMechanism.get(0).getAuthenticationMechanismType());
+        Assert.assertEquals(CredentialInterface.GenericCredential.toString(), authenticationMechanism.get(0).getCredentialInterface());
+        Assert.assertEquals("description", authenticationMechanism.get(0).getDescription());
+
+        Assert.assertEquals(TransactionSupportType.NO_TRANSACTION, connector.getResourceAdapter().getOutboundResourceAdapter().getTransactionSupport());
+        Assert.assertEquals(true, connector.getResourceAdapter().getOutboundResourceAdapter().isReauthenticationSupport());
+
+        Assert.assertEquals(Connection.class.getName(), connector.getResourceAdapter().getOutboundResourceAdapter().getConnectionDefinition().get(0).getConnectionInterface());
+        Assert.assertEquals(ConnectionImpl.class.getName(), connector.getResourceAdapter().getOutboundResourceAdapter().getConnectionDefinition().get(0).getConnectionImplClass());
+        Assert.assertEquals(ConnectionFactory.class.getName(), connector.getResourceAdapter().getOutboundResourceAdapter().getConnectionDefinition().get(0).getConnectionFactoryInterface());
+        Assert.assertEquals(ConnectionFactoryImpl.class.getName(), connector.getResourceAdapter().getOutboundResourceAdapter().getConnectionDefinition().get(0).getConnectionFactoryImplClass());
+
+        Assert.assertEquals(TestActivation.class.getName(), connector.getResourceAdapter().getInboundResourceAdapter().getMessageAdapter().getMessageListener().get(0).getActivationSpec().getActivationSpecClass());
+        Assert.assertEquals(TestMessageListener.class.getName(), connector.getResourceAdapter().getInboundResourceAdapter().getMessageAdapter().getMessageListener().get(0).getMessageListenerType());
+
+        Assert.assertEquals(TestAdminObject.class.getName(), connector.getResourceAdapter().getAdminObject().get(0).getAdminObjectClass());
+        Assert.assertEquals(TestAdminObjectInterface.class.getName(), connector.getResourceAdapter().getAdminObject().get(0).getAdminObjectInterface());
+    }
+
+    private ConnectorModule testConnectorModule() {
+        final Connector connector = new Connector();
+        final ConnectorModule connectorModule = new ConnectorModule(connector);
+        connectorModule.setFinder(new ClassFinder(TestConnector.class, TestManagedConnectionFactory.class, TestActivation.class, TestAdminObject.class));
+        return connectorModule;
+    }
+
+    @Test
+    public void testConfigProperties() throws Exception {
+        final ClassFinder finder = new ClassFinder(TestAdminObject.class);
+
+        final List<ConfigProperty> configProperty = new ArrayList<ConfigProperty>();
+
+        final Object object = new Object() {
+            public List<ConfigProperty> getConfigProperty() {
+                return configProperty;
+            }
+        };
+
+        new AnnotationDeployer.DiscoverAnnotatedBeans().process(null, TestAdminObject.class.getName(), object);
+        Assert.assertEquals(2, configProperty.size());
+        Assert.assertEquals("myNumber", configProperty.get(0).getConfigPropertyName());
+        Assert.assertEquals("java.lang.Integer", configProperty.get(0).getConfigPropertyType());
+        Assert.assertEquals("myProperty", configProperty.get(1).getConfigPropertyName());
+        Assert.assertEquals("java.lang.String", configProperty.get(1).getConfigPropertyType());
+        Assert.assertEquals("This is a test", configProperty.get(1).getConfigPropertyValue());
+    }
+
+    @ApplicationException(rollback = true)
+    public abstract class BusinessException extends Exception {
+    }
+
+    public class ValueRequiredException extends BusinessException {
+    }
+
+    public static final class MyMainClass {
+        public static void main(final String[] args) {
+        }
+    }
+
+    public static interface GenericInterface<T> {
+        T genericMethod(T t);
+    }
+
+    @Stateless
+    @Local(GenericInterface.class)
+    public static class InterceptedSLSBean implements GenericInterface<String> {
+        public String genericMethod(final String s) {
+            return s;
+        }
+    }
+
+    @Stateless
+    @LocalBean
+    public static class TestLocalBean {
+        public String echo(final String input) {
+            return input;
+        }
+    }
+
+    @Resource
+    public static class Color {
+        @Resource
+        public void color() {
+        }
+    }
+
+    @Resource
+    public static class Green extends Color {
+        @Resource
+        public void green() {
+        }
+    }
+
+    @Resource
+    public static class Emerald extends Green {
+        @Resource
+        public void emerald() {
+        }
+    }
+
+    @javax.resource.spi.Connector(description = "description",
+        displayName = "displayName", smallIcon = "smallIcon",
+        largeIcon = "largeIcon", vendorName = "vendorName",
+        eisType = "eisType",
+        version = "version",
+        licenseDescription = {"licenseDescription"},
+        licenseRequired = true,
+        authMechanisms = {@AuthenticationMechanism(authMechanism = "authMechanism",
+            credentialInterface = CredentialInterface.GenericCredential, description = {"description"})},
+        reauthenticationSupport = true,
+        securityPermissions = {@SecurityPermission(permissionSpec = "permissionSpec", description = "description")},
+        transactionSupport = TransactionSupportLevel.NoTransaction,
+        requiredWorkContexts = {TestWorkContext.class}
+    )
+    public static class TestConnector implements ResourceAdapter {
+
+        public void endpointActivation(final MessageEndpointFactory mef, final ActivationSpec spec) throws ResourceException {
+        }
+
+        public void endpointDeactivation(final MessageEndpointFactory mef, final ActivationSpec spec) {
+        }
+
+        public XAResource[] getXAResources(final ActivationSpec[] specs) throws ResourceException {
+            return null;
+        }
+
+        public void start(final BootstrapContext ctx) throws ResourceAdapterInternalException {
+        }
+
+        public void stop() {
+        }
+    }
+
+    @ConnectionDefinition(connection = Connection.class, connectionFactory = ConnectionFactory.class, connectionImpl = ConnectionImpl.class, connectionFactoryImpl = ConnectionFactoryImpl.class)
+    public static class TestManagedConnectionFactory implements ManagedConnectionFactory {
+
+        public Object createConnectionFactory() throws ResourceException {
+            return null;
+        }
+
+        public Object createConnectionFactory(final ConnectionManager connectionManager) throws ResourceException {
+            return null;
+        }
+
+        public ManagedConnection createManagedConnection(final Subject subject, final ConnectionRequestInfo connectionRequestInfo) throws ResourceException {
+            return null;
+        }
+
+        public PrintWriter getLogWriter() throws ResourceException {
+            return null;
+        }
+
+        public ManagedConnection matchManagedConnections(final Set managedConnections, final Subject subject, final ConnectionRequestInfo connectionRequestInfo) throws ResourceException {
+            return null;
+        }
+
+        public void setLogWriter(final PrintWriter writer) throws ResourceException {
+        }
+
+    }
+
+    public static class TestWorkContext implements WorkContext {
+        public String getDescription() {
+            return "Description";
+        }
+
+        public String getName() {
+            return "Name";
+        }
+    }
+
+    public static interface Connection {
+    }
+
+    public static class ConnectionImpl implements Connection {
+    }
+
+    public static interface ConnectionFactory extends Serializable, Referenceable {
+    }
+
+    public static class ConnectionFactoryImpl implements ConnectionFactory {
+
+        public void setReference(final Reference reference) {
+        }
+
+        public Reference getReference() throws NamingException {
+            return null;
+        }
+    }
+
+    @Activation(messageListeners = {TestMessageListener.class})
+    public static class TestActivation implements ActivationSpec, Serializable {
+
+        public ResourceAdapter getResourceAdapter() {
+            return null;
+        }
+
+        public void setResourceAdapter(final ResourceAdapter arg0) throws ResourceException {
+        }
+
+        public void validate() throws InvalidPropertyException {
+        }
+    }
+
+    public static class TestMessageListener implements MessageListener {
+        public Record onMessage(final Record arg0) throws ResourceException {
+            return null;
+        }
+    }
+
+    public static interface TestAdminObjectInterface {
+    }
+
+    public static interface SomeOtherInterface {
+    }
+
+    @AdministeredObject(adminObjectInterfaces = {TestAdminObjectInterface.class})
+    public static class TestAdminObject implements TestAdminObjectInterface, SomeOtherInterface {
+        private String myProperty = "This is a test";
+
+        @javax.resource.spi.ConfigProperty(ignore = true)
+        private int myNumber;
+
+        public String getMyProperty() {
+            return myProperty;
+        }
+
+        public void setMyProperty(final String myProperty) {
+            this.myProperty = myProperty;
+        }
+
+        public int getMyNumber() {
+            return myNumber;
+        }
+
+        public void setMyNumber(final int myNumber) {
+            this.myNumber = myNumber;
+        }
+    }
+
+    @Test
+    public void findRestClasses() throws Exception {
+        final WebApp webApp = new WebApp();
+        webApp.setContextRoot("/");
+        webApp.setId("web");
+        webApp.setVersion("2.5");
+        WebModule webModule = new WebModule(webApp, webApp.getContextRoot(), Thread.currentThread().getContextClassLoader(), "myapp", webApp.getId());
+        webModule.setFinder(new AnnotationFinder(new ClassesArchive(RESTClass.class, RESTMethod.class, RESTApp.class)).link());
+
+        final AnnotationDeployer annotationDeployer = new AnnotationDeployer();
+        webModule = annotationDeployer.deploy(webModule);
+
+        final Set<String> classes = webModule.getRestClasses();
+        final Set<String> applications = webModule.getRestApplications();
+
+        assertEquals(1, classes.size());
+        assertTrue(classes.contains(RESTClass.class.getName()));
+        // assertTrue(classes.contains(RESTMethod.class.getName()));
+
+        assertEquals(1, applications.size());
+        assertEquals(RESTApp.class.getName(), applications.iterator().next());
+    }
+
+    @Path("/")
+    public static class RESTClass {
+
+    }
+
+    public static class RESTMethod extends RESTClass {
+        @Path("/method")
+        public void noop() {
+            // no-op
+        }
+    }
+
+    @ApplicationPath("/")
+    public static class RESTApp extends Application {
+        public java.util.Set<java.lang.Class<?>> getClasses() {
+            return new HashSet<Class<?>>() {{
+                add(RESTClass.class);
+                add(RESTMethod.class);
+            }};
+        }
+
+        public java.util.Set<java.lang.Object> getSingletons() {
+            return new HashSet<Object>() {{
+                add(new RESTMethod());
+                add(new RESTMethod());
+            }};
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java
index 221885c..39b9642 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java
@@ -1,87 +1,87 @@
-/*
- * 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.config.rules;
-
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.ManagedBean;
-import org.apache.openejb.jee.MessageDrivenBean;
-import org.apache.openejb.jee.StatefulBean;
-import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.test.annotated.Green;
-import org.apache.openejb.test.annotated.Red;
-import org.apache.openejb.test.annotated.Yellow;
-import org.apache.xbean.finder.AnnotationFinder;
-import org.apache.xbean.finder.archive.ClassesArchive;
-import org.junit.runner.RunWith;
-
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-
-@RunWith(ValidationRunner.class)
-public class CheckAnnotationTest {
-
-    @Keys({@Key(value = "annotation.invalid.stateful.webservice", type = KeyType.WARNING)})
-    public AppModule testWebServiceWithStateful() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatefulBean(Green.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(Green.class)).link());
-
-        final AppModule appModule = new AppModule(ejbModule);
-        return appModule;
-    }
-
-    @Keys({@Key(value = "annotation.invalid.messagedriven.webservice", type = KeyType.WARNING)})
-    public AppModule testWebServiceWithMessageDriven() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new MessageDrivenBean(Yellow.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(Yellow.class)).link());
-
-        final AppModule appModule = new AppModule(ejbModule);
-        return appModule;
-    }
-
-
-    @Keys({@Key(value = "annotation.invalid.managedbean.webservice", type = KeyType.WARNING)})
-    public AppModule testWebServiceWithManagedBean() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new ManagedBean(Red.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(Red.class)).link());
-
-        final AppModule appModule = new AppModule(ejbModule);
-        return appModule;
-    }
-
-    @Keys({@Key(value = "ann.local.forLocalBean", type = KeyType.WARNING)})
-    public EjbModule shouldWarnForLocalAnnotationOnBeanWithNoInterface() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatelessBean(EjbWithoutInterface.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(EjbWithoutInterface.class)).link());
-        return ejbModule;
-    }
-
-    @Local
-    @Stateless
-    public static class EjbWithoutInterface {
-    }
-
-}
+/*
+ * 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.config.rules;
+
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.ManagedBean;
+import org.apache.openejb.jee.MessageDrivenBean;
+import org.apache.openejb.jee.StatefulBean;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.test.annotated.Green;
+import org.apache.openejb.test.annotated.Red;
+import org.apache.openejb.test.annotated.Yellow;
+import org.apache.xbean.finder.AnnotationFinder;
+import org.apache.xbean.finder.archive.ClassesArchive;
+import org.junit.runner.RunWith;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+
+@RunWith(ValidationRunner.class)
+public class CheckAnnotationTest {
+
+    @Keys({@Key(value = "annotation.invalid.stateful.webservice", type = KeyType.WARNING)})
+    public AppModule testWebServiceWithStateful() {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatefulBean(Green.class));
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(Green.class)).link());
+
+        final AppModule appModule = new AppModule(ejbModule);
+        return appModule;
+    }
+
+    @Keys({@Key(value = "annotation.invalid.messagedriven.webservice", type = KeyType.WARNING)})
+    public AppModule testWebServiceWithMessageDriven() {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new MessageDrivenBean(Yellow.class));
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(Yellow.class)).link());
+
+        final AppModule appModule = new AppModule(ejbModule);
+        return appModule;
+    }
+
+
+    @Keys({@Key(value = "annotation.invalid.managedbean.webservice", type = KeyType.WARNING)})
+    public AppModule testWebServiceWithManagedBean() {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new ManagedBean(Red.class));
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(Red.class)).link());
+
+        final AppModule appModule = new AppModule(ejbModule);
+        return appModule;
+    }
+
+    @Keys({@Key(value = "ann.local.forLocalBean", type = KeyType.WARNING)})
+    public EjbModule shouldWarnForLocalAnnotationOnBeanWithNoInterface() {
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatelessBean(EjbWithoutInterface.class));
+        final EjbModule ejbModule = new EjbModule(ejbJar);
+        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(EjbWithoutInterface.class)).link());
+        return ejbModule;
+    }
+
+    @Local
+    @Stateless
+    public static class EjbWithoutInterface {
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckCdiEnabledTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckCdiEnabledTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckCdiEnabledTest.java
index f064a33..945eec6 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckCdiEnabledTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckCdiEnabledTest.java
@@ -1,43 +1,43 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.xbean.finder.AnnotationFinder;
-import org.apache.xbean.finder.archive.ClassesArchive;
-import org.junit.runner.RunWith;
-
-import javax.inject.Inject;
-
-@RunWith(ValidationRunner.class)
-public class CheckCdiEnabledTest {
-    @Keys(@Key(value = "cdi.notEnabled", type = KeyType.WARNING))
-    public EjbModule cdiShouldBeOn() throws OpenEJBException {
-        return new EjbModule(new EjbJar())
-            .finder(new AnnotationFinder(new ClassesArchive(Bean1.class, Bean2.class)));
-    }
-
-    public static class Bean1 {
-    }
-
-    public static class Bean2 {
-        @Inject
-        private Bean1 bean1;
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.xbean.finder.AnnotationFinder;
+import org.apache.xbean.finder.archive.ClassesArchive;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+@RunWith(ValidationRunner.class)
+public class CheckCdiEnabledTest {
+    @Keys(@Key(value = "cdi.notEnabled", type = KeyType.WARNING))
+    public EjbModule cdiShouldBeOn() throws OpenEJBException {
+        return new EjbModule(new EjbJar())
+            .finder(new AnnotationFinder(new ClassesArchive(Bean1.class, Bean2.class)));
+    }
+
+    public static class Bean1 {
+    }
+
+    public static class Bean2 {
+        @Inject
+        private Bean1 bean1;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java
index 9c76064..c159207 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java
@@ -1,76 +1,76 @@
-/**
- * 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.config.rules;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.SingletonBean;
-import org.junit.runner.RunWith;
-
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-
-@RunWith(ValidationRunner.class)
-public class CheckDependsOnTest {
-    @Keys({@Key(value = "dependsOn.circuit", count = 2), @Key(value = "dependsOn.noSuchEjb", count = 2)})
-    public EjbJar dependsOn() throws OpenEJBException {
-        final EjbJar ejbJar = new EjbJar();
-        final SingletonBean one = new SingletonBean(One.class);
-        final SingletonBean two = new SingletonBean(Two.class);
-        final SingletonBean three = new SingletonBean(Three.class);
-        final SingletonBean four = new SingletonBean(Four.class);
-        final SingletonBean five = new SingletonBean(Five.class);
-        final SingletonBean six = new SingletonBean(Six.class);
-        ejbJar.addEnterpriseBean(one);
-        ejbJar.addEnterpriseBean(two);
-        ejbJar.addEnterpriseBean(three);
-        ejbJar.addEnterpriseBean(four);
-        ejbJar.addEnterpriseBean(five);
-        ejbJar.addEnterpriseBean(six);
-        return ejbJar;
-    }
-
-    @Singleton
-    @DependsOn("Two")
-    private static class One {
-    }
-
-    @Singleton
-    @DependsOn("One")
-    private static class Two {
-    }
-
-    @Singleton
-    @DependsOn("Four")
-    private static class Three {
-    }
-
-    @Singleton
-    @DependsOn("Three")
-    private static class Four {
-    }
-
-    @Singleton
-    @DependsOn("WrongOne")
-    private static class Five {
-    }
-
-    @Singleton
-    @DependsOn("WrongOne")
-    private static class Six {
-    }
-}
+/**
+ * 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.config.rules;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.SingletonBean;
+import org.junit.runner.RunWith;
+
+import javax.ejb.DependsOn;
+import javax.ejb.Singleton;
+
+@RunWith(ValidationRunner.class)
+public class CheckDependsOnTest {
+    @Keys({@Key(value = "dependsOn.circuit", count = 2), @Key(value = "dependsOn.noSuchEjb", count = 2)})
+    public EjbJar dependsOn() throws OpenEJBException {
+        final EjbJar ejbJar = new EjbJar();
+        final SingletonBean one = new SingletonBean(One.class);
+        final SingletonBean two = new SingletonBean(Two.class);
+        final SingletonBean three = new SingletonBean(Three.class);
+        final SingletonBean four = new SingletonBean(Four.class);
+        final SingletonBean five = new SingletonBean(Five.class);
+        final SingletonBean six = new SingletonBean(Six.class);
+        ejbJar.addEnterpriseBean(one);
+        ejbJar.addEnterpriseBean(two);
+        ejbJar.addEnterpriseBean(three);
+        ejbJar.addEnterpriseBean(four);
+        ejbJar.addEnterpriseBean(five);
+        ejbJar.addEnterpriseBean(six);
+        return ejbJar;
+    }
+
+    @Singleton
+    @DependsOn("Two")
+    private static class One {
+    }
+
+    @Singleton
+    @DependsOn("One")
+    private static class Two {
+    }
+
+    @Singleton
+    @DependsOn("Four")
+    private static class Three {
+    }
+
+    @Singleton
+    @DependsOn("Three")
+    private static class Four {
+    }
+
+    @Singleton
+    @DependsOn("WrongOne")
+    private static class Five {
+    }
+
+    @Singleton
+    @DependsOn("WrongOne")
+    private static class Six {
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java
index 2d5c63e..8e37feb 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java
@@ -1,50 +1,50 @@
-/*
- * 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.config.rules;
-
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatefulBean;
-import org.apache.openejb.loader.SystemInstance;
-import org.junit.runner.RunWith;
-
-import javax.interceptor.AroundInvoke;
-
-@RunWith(ValidationRunner.class)
-public class CheckIncorrectPropertyNameTest {
-
-
-    @Keys({@Key(value = "incorrect.property.name", type = KeyType.WARNING)})
-    public AppModule testSystemPropertyNames() {
-        //SystemInstance.get().setProperty("java.persistence.provider", "test");
-        SystemInstance.get().setProperty("javax.naming.referral", "test");
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new StatefulBean(Green.class));
-        return new AppModule(new EjbModule(ejbJar));
-    }
-}
-
-
-class Green {
-
-    // need to add this @AroundInvoke to cause validation to fail. Validation does not
-    // fail on warnings, which causes this framework to not work properly
-    @AroundInvoke
-    public void sayCheese() {
-    }
+/*
+ * 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.config.rules;
+
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatefulBean;
+import org.apache.openejb.loader.SystemInstance;
+import org.junit.runner.RunWith;
+
+import javax.interceptor.AroundInvoke;
+
+@RunWith(ValidationRunner.class)
+public class CheckIncorrectPropertyNameTest {
+
+
+    @Keys({@Key(value = "incorrect.property.name", type = KeyType.WARNING)})
+    public AppModule testSystemPropertyNames() {
+        //SystemInstance.get().setProperty("java.persistence.provider", "test");
+        SystemInstance.get().setProperty("javax.naming.referral", "test");
+        final EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatefulBean(Green.class));
+        return new AppModule(new EjbModule(ejbJar));
+    }
+}
+
+
+class Green {
+
+    // need to add this @AroundInvoke to cause validation to fail. Validation does not
+    // fail on warnings, which causes this framework to not work properly
+    @AroundInvoke
+    public void sayCheese() {
+    }
 }
\ No newline at end of file


[38/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java
index 81132e5..ff12bc2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java
@@ -1,299 +1,299 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The security-identity element specifies whether the caller's security
- * identity is to be used for the execution of the methods of the enterprise
- * bean or whether a specific run-as identity is to be used. It contains an
- * optional description and a specification of the security identity to be used.
- * <p/>
- * <p/>
- * <p/>
- * Java class for SecurityIdentity complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="SecurityIdentity">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SecurityIdentity", propOrder = {"descriptions", "extensions"})
-public class SecurityIdentity {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The security-identity element specifies whether the caller's security
+ * identity is to be used for the execution of the methods of the enterprise
+ * bean or whether a specific run-as identity is to be used. It contains an
+ * optional description and a specification of the security identity to be used.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for SecurityIdentity complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="SecurityIdentity">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SecurityIdentity", propOrder = {"descriptions", "extensions"})
+public class SecurityIdentity {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java
index e5dddc4..1ad9141 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java
@@ -1,339 +1,339 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The security-roleType contains the definition of a security role. The
- * definition consists of an optional description of the security role, and the
- * security role name.
- * <p/>
- * Example:
- * <p/>
- * <p/>
- * <pre>
- * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;security-role xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;description&gt;
- *
- * 						This role includes all employees who are
- *
- * 						authorized to
- *
- * 						access the employee service
- *
- * 						application.
- *
- * 					&lt;/description&gt;&lt;role-name&gt;employee&lt;/role-name&gt;
- *
- * 				&lt;/security-role&gt;
- * </pre>
- * <p/>
- * <p/>
- * <p/>
- * <p/>
- * Java class for SecurityRole complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="SecurityRole">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="roleName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SecurityRole", propOrder = {"descriptions", "extensions"})
-public class SecurityRole {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String roleName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the roleName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getRoleName() {
-        return roleName;
-    }
-
-    /**
-     * Sets the value of the roleName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setRoleName(final String value) {
-        this.roleName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The security-roleType contains the definition of a security role. The
+ * definition consists of an optional description of the security role, and the
+ * security role name.
+ * <p/>
+ * Example:
+ * <p/>
+ * <p/>
+ * <pre>
+ * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;security-role xmlns:com.ibm.etools.j2ee.common="common.xmi" xmlns:com.ibm.etools.webservice.wsclient="webservice_client.xmi" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:org.eclipse.jem.java="java.xmi" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;description&gt;
+ *
+ * 						This role includes all employees who are
+ *
+ * 						authorized to
+ *
+ * 						access the employee service
+ *
+ * 						application.
+ *
+ * 					&lt;/description&gt;&lt;role-name&gt;employee&lt;/role-name&gt;
+ *
+ * 				&lt;/security-role&gt;
+ * </pre>
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for SecurityRole complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="SecurityRole">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="roleName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SecurityRole", propOrder = {"descriptions", "extensions"})
+public class SecurityRole {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String roleName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the roleName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getRoleName() {
+        return roleName;
+    }
+
+    /**
+     * Sets the value of the roleName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setRoleName(final String value) {
+        this.roleName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java
index df99a32..1e98d2a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java
@@ -1,342 +1,342 @@
-/**
- * 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.was.v6.common;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * The security-role-refType contains the declaration of a security role
- * reference in a component's or a Deployment Component's code. The declaration
- * consists of an optional description, the security role name used in the code,
- * and an optional link to a security role. If the security role is not
- * specified, the Deployer must choose an appropriate security role.
- * <p/>
- * <p/>
- * <p/>
- * Java class for SecurityRoleRef complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="SecurityRoleRef">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SecurityRoleRef", propOrder = {"descriptions", "extensions"})
-public class SecurityRoleRef {
-
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected String link;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the link property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLink() {
-        return link;
-    }
-
-    /**
-     * Sets the value of the link property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLink(final String value) {
-        this.link = 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 id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.common;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * The security-role-refType contains the declaration of a security role
+ * reference in a component's or a Deployment Component's code. The declaration
+ * consists of an optional description, the security role name used in the code,
+ * and an optional link to a security role. If the security role is not
+ * specified, the Deployer must choose an appropriate security role.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for SecurityRoleRef complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="SecurityRoleRef">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="link" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SecurityRoleRef", propOrder = {"descriptions", "extensions"})
+public class SecurityRoleRef {
+
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String link;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the link property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLink() {
+        return link;
+    }
+
+    /**
+     * Sets the value of the link property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLink(final String value) {
+        this.link = 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 id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/UseCallerIdentity.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/UseCallerIdentity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/UseCallerIdentity.java
index 94d8695..f77d7e9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/UseCallerIdentity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/UseCallerIdentity.java
@@ -1,49 +1,49 @@
-/**
- * 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.was.v6.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The use-caller-identity element specifies that the caller's security identity
- * be used as the security identity for the execution of the enterprise bean's
- * methods.
- * <p/>
- * <p/>
- * <p/>
- * Java class for UseCallerIdentity complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="UseCallerIdentity">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}SecurityIdentity">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UseCallerIdentity")
-public class UseCallerIdentity extends SecurityIdentity {
-
-}
+/**
+ * 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.was.v6.common;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * The use-caller-identity element specifies that the caller's security identity
+ * be used as the security identity for the execution of the enterprise bean's
+ * methods.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for UseCallerIdentity complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="UseCallerIdentity">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}SecurityIdentity">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "UseCallerIdentity")
+public class UseCallerIdentity extends SecurityIdentity {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/package-info.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/package-info.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/package-info.java
index 76f4bd4..1bd0270 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/package-info.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/package-info.java
@@ -1,18 +1,18 @@
-/**
- * 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "common.xmi") package org.apache.openejb.jee.was.v6.common;
-
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "common.xmi") package org.apache.openejb.jee.was.v6.common;
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java
index 0026f6b..1318dc8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java
@@ -1,244 +1,244 @@
-/**
- * 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.was.v6.commonbnd;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * Represents authentication data used for providing authentication data for
- * resources. The default authentication mechanism provided in the standard
- * model is Basic Authentication; however, other authentication types such as
- * certificates and tokens are expected to be extended off this type in the
- * advanced and enterprise layers.
- * <p/>
- * <p/>
- * Java class for AbstractAuthData complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="AbstractAuthData">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AbstractAuthData", propOrder = {"extensions"})
-public class AbstractAuthData {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.commonbnd;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * Represents authentication data used for providing authentication data for
+ * resources. The default authentication mechanism provided in the standard
+ * model is Basic Authentication; however, other authentication types such as
+ * certificates and tokens are expected to be extended off this type in the
+ * advanced and enterprise layers.
+ * <p/>
+ * <p/>
+ * Java class for AbstractAuthData complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="AbstractAuthData">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AbstractAuthData", propOrder = {"extensions"})
+public class AbstractAuthData {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/BasicAuthData.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/BasicAuthData.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/BasicAuthData.java
index 37b5d61..71a42d4 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/BasicAuthData.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/BasicAuthData.java
@@ -1,92 +1,92 @@
-/**
- * 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.was.v6.commonbnd;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * A basic type of Authentication which provides a userId and password for
- * connecting to a resource.
- * <p/>
- * <p/>
- * <p/>
- * Java class for BasicAuthData complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="BasicAuthData">
- *   &lt;complexContent>
- *     &lt;extension base="{commonbnd.xmi}AbstractAuthData">
- *       &lt;attribute name="password" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="userId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BasicAuthData")
-public class BasicAuthData extends AbstractAuthData {
-
-    @XmlAttribute
-    protected String password;
-    @XmlAttribute
-    protected String userId;
-
-    /**
-     * Gets the value of the password property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getPassword() {
-        return password;
-    }
-
-    /**
-     * Sets the value of the password property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setPassword(final String value) {
-        this.password = value;
-    }
-
-    /**
-     * Gets the value of the userId property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUserId() {
-        return userId;
-    }
-
-    /**
-     * Sets the value of the userId property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUserId(final String value) {
-        this.userId = 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.was.v6.commonbnd;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * A basic type of Authentication which provides a userId and password for
+ * connecting to a resource.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for BasicAuthData complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="BasicAuthData">
+ *   &lt;complexContent>
+ *     &lt;extension base="{commonbnd.xmi}AbstractAuthData">
+ *       &lt;attribute name="password" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="userId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "BasicAuthData")
+public class BasicAuthData extends AbstractAuthData {
+
+    @XmlAttribute
+    protected String password;
+    @XmlAttribute
+    protected String userId;
+
+    /**
+     * Gets the value of the password property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Sets the value of the password property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setPassword(final String value) {
+        this.password = value;
+    }
+
+    /**
+     * Gets the value of the userId property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * Sets the value of the userId property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUserId(final String value) {
+        this.userId = value;
+    }
+
+}


[31/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java
index e0198d9..ecf29b9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java
@@ -1,473 +1,473 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.common.Description;
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * @invariant multiplicity != null
- * @invariant roleSource != null
- * @invariant Cascade delete can only be specified in an EJBRelationshipRole
- * element in which the roleSource element specifies a dependent
- * object class.
- * @invariant Cascade delete can only be specified for an EJBRelationshipRole
- * contained in an EJBrelation in which the other EJBRelationshipRole
- * element specifies a multiplicity of One.
- * <p/>
- * <p/>
- * Example:
- * <p/>
- * <ejb-relation>
- * <p/>
- * <ejb-relation-name>Product-LineItem</ejb-relation-name>
- * <p/>
- * <ejb-relationship-role>
- * <p/>
- * <p/>
- * <ejb-relationship-role-name>product-has-lineitems</ejb-relationship
- * -role-name>
- * <p/>
- * <multiplicity>One</multiplicity>
- * <p/>
- * <relationship-role-source>
- * <p/>
- * <ejb-name>ProductEJB</ejb-name>
- * <p/>
- * </relationship-role-source>
- * <p/>
- * </ejb-relationship-role> ...
- * <p/>
- * <p/>
- * <p/>
- * Java class for EJBRelationshipRole complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content
- * contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EJBRelationshipRole">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="source" type="{ejb.xmi}RoleSource"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="cmrField" type="{ejb.xmi}CMRField"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="descriptions" type="{common.xmi}Description"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute name="cascadeDelete" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="multiplicity" type="{ejb.xmi}MultiplicityKind" />
- *       &lt;attribute name="roleName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * @since J2EE1.3 The ejb-relationship-role element describes a role within a
- * relationship. There are two roles in each relationship. The
- * ejb-relationship-role element contains an optional description; an
- * optional name for the relationship role; a specification of the
- * multiplicity of the role; an optional specification of cascade-delete
- * functionality for the role; the role source; and a declaration of the
- * cmr-field, if any, by means of which the other side of the
- * relationship is accessed from the perspective of the role source. The
- * multiplicity and relationship-role-source element are mandatory. The
- * relationship-role-source element designates an entity-bean by means of
- * an ejb-name element. For bidirectional relationships, both roles of a
- * relationship must declare a relationship-role-source element that
- * specifies a cmr-field in terms of which the relationship is accessed.
- * The lack of a cmr-field element in an ejb-relationship-role specifies
- * that the relationship is unidirectional in navigability and that
- * entity bean that participates in the relationship is "not aware" of
- * the relationship.
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EJBRelationshipRole", propOrder = {"sources", "cmrFields",
-    "descriptions", "extensions"})
-public class EJBRelationshipRole {
-
-    @XmlElement(name = "source")
-    protected List<RoleSource> sources;
-    @XmlElement(name = "cmrField")
-    protected List<CMRField> cmrFields;
-    protected List<Description> descriptions;
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute
-    protected Boolean cascadeDelete;
-    @XmlAttribute
-    protected String description;
-    @XmlAttribute
-    protected MultiplicityEnum multiplicity;
-    @XmlAttribute
-    protected String roleName;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the sources 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 sources property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getSources().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link RoleSource }
-     */
-    public List<RoleSource> getSources() {
-        if (sources == null) {
-            sources = new ArrayList<RoleSource>();
-        }
-        return this.sources;
-    }
-
-    /**
-     * Gets the value of the cmrFields 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 cmrFields property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getCmrFields().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link CMRField }
-     */
-    public List<CMRField> getCmrFields() {
-        if (cmrFields == null) {
-            cmrFields = new ArrayList<CMRField>();
-        }
-        return this.cmrFields;
-    }
-
-    /**
-     * Gets the value of the descriptions 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 descriptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getDescriptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Description }
-     */
-    public List<Description> getDescriptions() {
-        if (descriptions == null) {
-            descriptions = new ArrayList<Description>();
-        }
-        return this.descriptions;
-    }
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the cascadeDelete property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isCascadeDelete() {
-        return cascadeDelete;
-    }
-
-    /**
-     * Sets the value of the cascadeDelete property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setCascadeDelete(final Boolean value) {
-        this.cascadeDelete = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setDescription(final String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the multiplicity property.
-     *
-     * @return possible object is {@link MultiplicityEnum }
-     */
-    public MultiplicityEnum getMultiplicity() {
-        return multiplicity;
-    }
-
-    /**
-     * Sets the value of the multiplicity property.
-     *
-     * @param value allowed object is {@link MultiplicityEnum }
-     */
-    public void setMultiplicity(final MultiplicityEnum value) {
-        this.multiplicity = value;
-    }
-
-    /**
-     * Gets the value of the roleName property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getRoleName() {
-        return roleName;
-    }
-
-    /**
-     * Sets the value of the roleName property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setRoleName(final String value) {
-        this.roleName = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.common.Description;
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * @invariant multiplicity != null
+ * @invariant roleSource != null
+ * @invariant Cascade delete can only be specified in an EJBRelationshipRole
+ * element in which the roleSource element specifies a dependent
+ * object class.
+ * @invariant Cascade delete can only be specified for an EJBRelationshipRole
+ * contained in an EJBrelation in which the other EJBRelationshipRole
+ * element specifies a multiplicity of One.
+ * <p/>
+ * <p/>
+ * Example:
+ * <p/>
+ * <ejb-relation>
+ * <p/>
+ * <ejb-relation-name>Product-LineItem</ejb-relation-name>
+ * <p/>
+ * <ejb-relationship-role>
+ * <p/>
+ * <p/>
+ * <ejb-relationship-role-name>product-has-lineitems</ejb-relationship
+ * -role-name>
+ * <p/>
+ * <multiplicity>One</multiplicity>
+ * <p/>
+ * <relationship-role-source>
+ * <p/>
+ * <ejb-name>ProductEJB</ejb-name>
+ * <p/>
+ * </relationship-role-source>
+ * <p/>
+ * </ejb-relationship-role> ...
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for EJBRelationshipRole complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content
+ * contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EJBRelationshipRole">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="source" type="{ejb.xmi}RoleSource"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="cmrField" type="{ejb.xmi}CMRField"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="descriptions" type="{common.xmi}Description"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute name="cascadeDelete" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="multiplicity" type="{ejb.xmi}MultiplicityKind" />
+ *       &lt;attribute name="roleName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * @since J2EE1.3 The ejb-relationship-role element describes a role within a
+ * relationship. There are two roles in each relationship. The
+ * ejb-relationship-role element contains an optional description; an
+ * optional name for the relationship role; a specification of the
+ * multiplicity of the role; an optional specification of cascade-delete
+ * functionality for the role; the role source; and a declaration of the
+ * cmr-field, if any, by means of which the other side of the
+ * relationship is accessed from the perspective of the role source. The
+ * multiplicity and relationship-role-source element are mandatory. The
+ * relationship-role-source element designates an entity-bean by means of
+ * an ejb-name element. For bidirectional relationships, both roles of a
+ * relationship must declare a relationship-role-source element that
+ * specifies a cmr-field in terms of which the relationship is accessed.
+ * The lack of a cmr-field element in an ejb-relationship-role specifies
+ * that the relationship is unidirectional in navigability and that
+ * entity bean that participates in the relationship is "not aware" of
+ * the relationship.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EJBRelationshipRole", propOrder = {"sources", "cmrFields",
+    "descriptions", "extensions"})
+public class EJBRelationshipRole {
+
+    @XmlElement(name = "source")
+    protected List<RoleSource> sources;
+    @XmlElement(name = "cmrField")
+    protected List<CMRField> cmrFields;
+    protected List<Description> descriptions;
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute
+    protected Boolean cascadeDelete;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected MultiplicityEnum multiplicity;
+    @XmlAttribute
+    protected String roleName;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the sources 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 sources property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getSources().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link RoleSource }
+     */
+    public List<RoleSource> getSources() {
+        if (sources == null) {
+            sources = new ArrayList<RoleSource>();
+        }
+        return this.sources;
+    }
+
+    /**
+     * Gets the value of the cmrFields 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 cmrFields property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getCmrFields().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link CMRField }
+     */
+    public List<CMRField> getCmrFields() {
+        if (cmrFields == null) {
+            cmrFields = new ArrayList<CMRField>();
+        }
+        return this.cmrFields;
+    }
+
+    /**
+     * Gets the value of the descriptions 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 descriptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getDescriptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     */
+    public List<Description> getDescriptions() {
+        if (descriptions == null) {
+            descriptions = new ArrayList<Description>();
+        }
+        return this.descriptions;
+    }
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the cascadeDelete property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isCascadeDelete() {
+        return cascadeDelete;
+    }
+
+    /**
+     * Sets the value of the cascadeDelete property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setCascadeDelete(final Boolean value) {
+        this.cascadeDelete = value;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setDescription(final String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the multiplicity property.
+     *
+     * @return possible object is {@link MultiplicityEnum }
+     */
+    public MultiplicityEnum getMultiplicity() {
+        return multiplicity;
+    }
+
+    /**
+     * Sets the value of the multiplicity property.
+     *
+     * @param value allowed object is {@link MultiplicityEnum }
+     */
+    public void setMultiplicity(final MultiplicityEnum value) {
+        this.multiplicity = value;
+    }
+
+    /**
+     * Gets the value of the roleName property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getRoleName() {
+        return roleName;
+    }
+
+    /**
+     * Sets the value of the roleName property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setRoleName(final String value) {
+        this.roleName = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EnterpriseBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EnterpriseBean.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EnterpriseBean.java
index d03dbde..8ff1b05 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EnterpriseBean.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EnterpriseBean.java
@@ -1,426 +1,426 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.common.JNDIEnvRefsGroup;
-import org.apache.openejb.jee.was.v6.common.SecurityIdentity;
-import org.apache.openejb.jee.was.v6.common.SecurityRoleRef;
-import org.apache.openejb.jee.was.v6.java.JavaClass;
-
-/**
- * EnterpriseJavaBean is a class. It can have instances, someone could write an
- * instance document containing Departments and Employees. It also has
- * attributes, operations, and associations. These are actually derived/filtered
- * from its implementation classes and interfaces. For mapping and browsing
- * purposes, though, you would like the EJB to appear as a class.
- * <p/>
- * In this light, even Session Beans can have associations and properties
- * implemented by their bean. For example, it would be meaningful to describe
- * associations from a Session to the Entities which it uses to perform its
- * work.
- * <p/>
- * <p/>
- * <p/>
- * Java class for EnterpriseBean complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EnterpriseBean">
- *   &lt;complexContent>
- *     &lt;extension base="{common.xmi}JNDIEnvRefsGroup">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="securityRoleRefs" type="{common.xmi}SecurityRoleRef"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="ejbClass" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="homeInterface" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="remoteInterface" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="securityIdentity" type="{common.xmi}SecurityIdentity"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="localHomeInterface" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="localInterface" type="{java.xmi}JavaClass"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="ejbClass" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="homeInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="localHomeInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="localInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="remoteInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EnterpriseBean", propOrder = {"securityRoleRefs",
-    "ejbClasses", "homeInterfaces", "remoteInterfaces",
-    "securityIdentities", "localHomeInterfaces", "localInterfaces"})
-public class EnterpriseBean extends JNDIEnvRefsGroup {
-
-    protected List<SecurityRoleRef> securityRoleRefs;
-    @XmlElement(name = "ejbClass")
-    protected List<JavaClass> ejbClasses;
-    @XmlElement(name = "homeInterface")
-    protected List<JavaClass> homeInterfaces;
-    @XmlElement(name = "remoteInterface")
-    protected List<JavaClass> remoteInterfaces;
-    @XmlElement(name = "securityIdentity")
-    protected List<SecurityIdentity> securityIdentities;
-    @XmlElement(name = "localHomeInterface")
-    protected List<JavaClass> localHomeInterfaces;
-    @XmlElement(name = "localInterface")
-    protected List<JavaClass> localInterfaces;
-    @XmlAttribute
-    protected String ejbClass;
-    @XmlAttribute
-    protected String homeInterface;
-    @XmlAttribute
-    protected String localHomeInterface;
-    @XmlAttribute
-    protected String localInterface;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected String remoteInterface;
-
-    /**
-     * Gets the value of the securityRoleRefs 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 securityRoleRefs property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getSecurityRoleRefs().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SecurityRoleRef }
-     */
-    public List<SecurityRoleRef> getSecurityRoleRefs() {
-        if (securityRoleRefs == null) {
-            securityRoleRefs = new ArrayList<SecurityRoleRef>();
-        }
-        return this.securityRoleRefs;
-    }
-
-    /**
-     * Gets the value of the ejbClasses 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 ejbClasses property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEjbClasses().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getEjbClasses() {
-        if (ejbClasses == null) {
-            ejbClasses = new ArrayList<JavaClass>();
-        }
-        return this.ejbClasses;
-    }
-
-    /**
-     * Gets the value of the homeInterfaces 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 homeInterfaces property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getHomeInterfaces().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getHomeInterfaces() {
-        if (homeInterfaces == null) {
-            homeInterfaces = new ArrayList<JavaClass>();
-        }
-        return this.homeInterfaces;
-    }
-
-    /**
-     * Gets the value of the remoteInterfaces 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 remoteInterfaces property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getRemoteInterfaces().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getRemoteInterfaces() {
-        if (remoteInterfaces == null) {
-            remoteInterfaces = new ArrayList<JavaClass>();
-        }
-        return this.remoteInterfaces;
-    }
-
-    /**
-     * Gets the value of the securityIdentities 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 securityIdentities property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getSecurityIdentities().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SecurityIdentity }
-     */
-    public List<SecurityIdentity> getSecurityIdentities() {
-        if (securityIdentities == null) {
-            securityIdentities = new ArrayList<SecurityIdentity>();
-        }
-        return this.securityIdentities;
-    }
-
-    /**
-     * Gets the value of the localHomeInterfaces 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 localHomeInterfaces property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getLocalHomeInterfaces().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getLocalHomeInterfaces() {
-        if (localHomeInterfaces == null) {
-            localHomeInterfaces = new ArrayList<JavaClass>();
-        }
-        return this.localHomeInterfaces;
-    }
-
-    /**
-     * Gets the value of the localInterfaces 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 localInterfaces property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getLocalInterfaces().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getLocalInterfaces() {
-        if (localInterfaces == null) {
-            localInterfaces = new ArrayList<JavaClass>();
-        }
-        return this.localInterfaces;
-    }
-
-    /**
-     * Gets the value of the ejbClass property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEjbClass() {
-        return ejbClass;
-    }
-
-    /**
-     * Sets the value of the ejbClass property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEjbClass(final String value) {
-        this.ejbClass = value;
-    }
-
-    /**
-     * Gets the value of the homeInterface property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHomeInterface() {
-        return homeInterface;
-    }
-
-    /**
-     * Sets the value of the homeInterface property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHomeInterface(final String value) {
-        this.homeInterface = value;
-    }
-
-    /**
-     * Gets the value of the localHomeInterface property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLocalHomeInterface() {
-        return localHomeInterface;
-    }
-
-    /**
-     * Sets the value of the localHomeInterface property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLocalHomeInterface(final String value) {
-        this.localHomeInterface = value;
-    }
-
-    /**
-     * Gets the value of the localInterface property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLocalInterface() {
-        return localInterface;
-    }
-
-    /**
-     * Sets the value of the localInterface property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLocalInterface(final String value) {
-        this.localInterface = 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 remoteInterface property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getRemoteInterface() {
-        return remoteInterface;
-    }
-
-    /**
-     * Sets the value of the remoteInterface property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setRemoteInterface(final String value) {
-        this.remoteInterface = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.common.JNDIEnvRefsGroup;
+import org.apache.openejb.jee.was.v6.common.SecurityIdentity;
+import org.apache.openejb.jee.was.v6.common.SecurityRoleRef;
+import org.apache.openejb.jee.was.v6.java.JavaClass;
+
+/**
+ * EnterpriseJavaBean is a class. It can have instances, someone could write an
+ * instance document containing Departments and Employees. It also has
+ * attributes, operations, and associations. These are actually derived/filtered
+ * from its implementation classes and interfaces. For mapping and browsing
+ * purposes, though, you would like the EJB to appear as a class.
+ * <p/>
+ * In this light, even Session Beans can have associations and properties
+ * implemented by their bean. For example, it would be meaningful to describe
+ * associations from a Session to the Entities which it uses to perform its
+ * work.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for EnterpriseBean complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EnterpriseBean">
+ *   &lt;complexContent>
+ *     &lt;extension base="{common.xmi}JNDIEnvRefsGroup">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="securityRoleRefs" type="{common.xmi}SecurityRoleRef"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="ejbClass" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="homeInterface" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="remoteInterface" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="securityIdentity" type="{common.xmi}SecurityIdentity"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="localHomeInterface" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="localInterface" type="{java.xmi}JavaClass"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="ejbClass" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="homeInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="localHomeInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="localInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="remoteInterface" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EnterpriseBean", propOrder = {"securityRoleRefs",
+    "ejbClasses", "homeInterfaces", "remoteInterfaces",
+    "securityIdentities", "localHomeInterfaces", "localInterfaces"})
+public class EnterpriseBean extends JNDIEnvRefsGroup {
+
+    protected List<SecurityRoleRef> securityRoleRefs;
+    @XmlElement(name = "ejbClass")
+    protected List<JavaClass> ejbClasses;
+    @XmlElement(name = "homeInterface")
+    protected List<JavaClass> homeInterfaces;
+    @XmlElement(name = "remoteInterface")
+    protected List<JavaClass> remoteInterfaces;
+    @XmlElement(name = "securityIdentity")
+    protected List<SecurityIdentity> securityIdentities;
+    @XmlElement(name = "localHomeInterface")
+    protected List<JavaClass> localHomeInterfaces;
+    @XmlElement(name = "localInterface")
+    protected List<JavaClass> localInterfaces;
+    @XmlAttribute
+    protected String ejbClass;
+    @XmlAttribute
+    protected String homeInterface;
+    @XmlAttribute
+    protected String localHomeInterface;
+    @XmlAttribute
+    protected String localInterface;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String remoteInterface;
+
+    /**
+     * Gets the value of the securityRoleRefs 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 securityRoleRefs property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getSecurityRoleRefs().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SecurityRoleRef }
+     */
+    public List<SecurityRoleRef> getSecurityRoleRefs() {
+        if (securityRoleRefs == null) {
+            securityRoleRefs = new ArrayList<SecurityRoleRef>();
+        }
+        return this.securityRoleRefs;
+    }
+
+    /**
+     * Gets the value of the ejbClasses 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 ejbClasses property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEjbClasses().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getEjbClasses() {
+        if (ejbClasses == null) {
+            ejbClasses = new ArrayList<JavaClass>();
+        }
+        return this.ejbClasses;
+    }
+
+    /**
+     * Gets the value of the homeInterfaces 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 homeInterfaces property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getHomeInterfaces().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getHomeInterfaces() {
+        if (homeInterfaces == null) {
+            homeInterfaces = new ArrayList<JavaClass>();
+        }
+        return this.homeInterfaces;
+    }
+
+    /**
+     * Gets the value of the remoteInterfaces 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 remoteInterfaces property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getRemoteInterfaces().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getRemoteInterfaces() {
+        if (remoteInterfaces == null) {
+            remoteInterfaces = new ArrayList<JavaClass>();
+        }
+        return this.remoteInterfaces;
+    }
+
+    /**
+     * Gets the value of the securityIdentities 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 securityIdentities property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getSecurityIdentities().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SecurityIdentity }
+     */
+    public List<SecurityIdentity> getSecurityIdentities() {
+        if (securityIdentities == null) {
+            securityIdentities = new ArrayList<SecurityIdentity>();
+        }
+        return this.securityIdentities;
+    }
+
+    /**
+     * Gets the value of the localHomeInterfaces 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 localHomeInterfaces property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getLocalHomeInterfaces().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getLocalHomeInterfaces() {
+        if (localHomeInterfaces == null) {
+            localHomeInterfaces = new ArrayList<JavaClass>();
+        }
+        return this.localHomeInterfaces;
+    }
+
+    /**
+     * Gets the value of the localInterfaces 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 localInterfaces property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getLocalInterfaces().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getLocalInterfaces() {
+        if (localInterfaces == null) {
+            localInterfaces = new ArrayList<JavaClass>();
+        }
+        return this.localInterfaces;
+    }
+
+    /**
+     * Gets the value of the ejbClass property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEjbClass() {
+        return ejbClass;
+    }
+
+    /**
+     * Sets the value of the ejbClass property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEjbClass(final String value) {
+        this.ejbClass = value;
+    }
+
+    /**
+     * Gets the value of the homeInterface property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHomeInterface() {
+        return homeInterface;
+    }
+
+    /**
+     * Sets the value of the homeInterface property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHomeInterface(final String value) {
+        this.homeInterface = value;
+    }
+
+    /**
+     * Gets the value of the localHomeInterface property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLocalHomeInterface() {
+        return localHomeInterface;
+    }
+
+    /**
+     * Sets the value of the localHomeInterface property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLocalHomeInterface(final String value) {
+        this.localHomeInterface = value;
+    }
+
+    /**
+     * Gets the value of the localInterface property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLocalInterface() {
+        return localInterface;
+    }
+
+    /**
+     * Sets the value of the localInterface property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLocalInterface(final String value) {
+        this.localInterface = 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 remoteInterface property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getRemoteInterface() {
+        return remoteInterface;
+    }
+
+    /**
+     * Sets the value of the remoteInterface property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setRemoteInterface(final String value) {
+        this.remoteInterface = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java
index 46d3154..c563474 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java
@@ -1,164 +1,164 @@
-/**
- * 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.was.v6.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-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 org.apache.openejb.jee.was.v6.java.JavaClass;
-
-/**
- * The entity element declares an entity bean. The declaration consists of: an
- * optional description; optional display name; optional small icon file name;
- * optional large icon file name; a unique name assigned to the enterprise bean
- * in the deployment descriptor; the names of the entity bean's home and remote
- * interfaces, if any; the names of the entity bean's local home and local
- * interface, if any; the entity bean's implementation class; the entity bean's
- * persistence management type; the entity bean's primary key class name; an
- * indication of the entity bean's reentrancy; an optional specification of the
- * entity bean's cmp-version; an optional specification of the entity bean's
- * abstract schema name; an optional list of container-managed fields; an
- * optional specification of the primary key field; an optional declaration of
- * the bean's environment entries; an optional declaration of the bean's EJB
- * references; an optional declaration of the bean's local EJB references; an
- * optional declaration of the security role references; an optional declaration
- * of the security identity to be used for the execution of the bean's methods;
- * an optional declaration of the bean's resource manager connection factory
- * references; an optional declaration of the bean's resource environment
- * references; an optional set of query declarations for finder and select
- * methods for an entity bean with cmp-version 2.x. The optional
- * abstract-schema-name element must be specified for an entity bean with
- * container managed persistence and cmp-version 2.x. The optional primkey-field
- * may be present in the descriptor if the entity's persistence-type is
- * Container. The optional cmp-version element may be present in the descriptor
- * if the entity's persistence-type is Container. If the persistence-type is
- * Container and the cmp-version element is not specified, its value defaults to
- * 2.x. The optional home and remote elements must be specified if the entity
- * bean cmp-version is 1.x. The optional local-home and local elements must be
- * specified if the entity bean has a local home and local interface. The
- * optional query elements must be present if the persistence-type is Container
- * and the cmp-version is 2.x and query methods other than findByPrimaryKey have
- * been defined for the entity bean. The other elements that are optional are
- * "optional" in the sense that they are omitted if the lists represented by
- * them are empty. At least one cmp-field element must be present in the
- * descriptor if the entity's persistence-type is Container and the cmp-version
- * is 1.x, and none must not be present if the entity's persistence-type is
- * Bean.
- * <p/>
- * <p/>
- * <p/>
- * Java class for Entity complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="Entity">
- *   &lt;complexContent>
- *     &lt;extension base="{ejb.xmi}EnterpriseBean">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="primaryKey" type="{java.xmi}JavaClass"/>
- *       &lt;/choice>
- *       &lt;attribute name="primaryKey" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="reentrant" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Entity", propOrder = {"primaryKeys"})
-public class Entity extends EnterpriseBean {
-
-    @XmlElement(name = "primaryKey")
-    protected List<JavaClass> primaryKeys;
-    @XmlAttribute
-    protected String primaryKey;
-    @XmlAttribute
-    protected Boolean reentrant;
-
-    /**
-     * Gets the value of the primaryKeys 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 primaryKeys property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getPrimaryKeys().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JavaClass }
-     */
-    public List<JavaClass> getPrimaryKeys() {
-        if (primaryKeys == null) {
-            primaryKeys = new ArrayList<JavaClass>();
-        }
-        return this.primaryKeys;
-    }
-
-    /**
-     * Gets the value of the primaryKey property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getPrimaryKey() {
-        return primaryKey;
-    }
-
-    /**
-     * Sets the value of the primaryKey property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setPrimaryKey(final String value) {
-        this.primaryKey = value;
-    }
-
-    /**
-     * Gets the value of the reentrant property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isReentrant() {
-        return reentrant;
-    }
-
-    /**
-     * Sets the value of the reentrant property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setReentrant(final Boolean value) {
-        this.reentrant = 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.was.v6.ejb;
+
+import java.util.ArrayList;
+import java.util.List;
+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 org.apache.openejb.jee.was.v6.java.JavaClass;
+
+/**
+ * The entity element declares an entity bean. The declaration consists of: an
+ * optional description; optional display name; optional small icon file name;
+ * optional large icon file name; a unique name assigned to the enterprise bean
+ * in the deployment descriptor; the names of the entity bean's home and remote
+ * interfaces, if any; the names of the entity bean's local home and local
+ * interface, if any; the entity bean's implementation class; the entity bean's
+ * persistence management type; the entity bean's primary key class name; an
+ * indication of the entity bean's reentrancy; an optional specification of the
+ * entity bean's cmp-version; an optional specification of the entity bean's
+ * abstract schema name; an optional list of container-managed fields; an
+ * optional specification of the primary key field; an optional declaration of
+ * the bean's environment entries; an optional declaration of the bean's EJB
+ * references; an optional declaration of the bean's local EJB references; an
+ * optional declaration of the security role references; an optional declaration
+ * of the security identity to be used for the execution of the bean's methods;
+ * an optional declaration of the bean's resource manager connection factory
+ * references; an optional declaration of the bean's resource environment
+ * references; an optional set of query declarations for finder and select
+ * methods for an entity bean with cmp-version 2.x. The optional
+ * abstract-schema-name element must be specified for an entity bean with
+ * container managed persistence and cmp-version 2.x. The optional primkey-field
+ * may be present in the descriptor if the entity's persistence-type is
+ * Container. The optional cmp-version element may be present in the descriptor
+ * if the entity's persistence-type is Container. If the persistence-type is
+ * Container and the cmp-version element is not specified, its value defaults to
+ * 2.x. The optional home and remote elements must be specified if the entity
+ * bean cmp-version is 1.x. The optional local-home and local elements must be
+ * specified if the entity bean has a local home and local interface. The
+ * optional query elements must be present if the persistence-type is Container
+ * and the cmp-version is 2.x and query methods other than findByPrimaryKey have
+ * been defined for the entity bean. The other elements that are optional are
+ * "optional" in the sense that they are omitted if the lists represented by
+ * them are empty. At least one cmp-field element must be present in the
+ * descriptor if the entity's persistence-type is Container and the cmp-version
+ * is 1.x, and none must not be present if the entity's persistence-type is
+ * Bean.
+ * <p/>
+ * <p/>
+ * <p/>
+ * Java class for Entity complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="Entity">
+ *   &lt;complexContent>
+ *     &lt;extension base="{ejb.xmi}EnterpriseBean">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="primaryKey" type="{java.xmi}JavaClass"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="primaryKey" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="reentrant" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Entity", propOrder = {"primaryKeys"})
+public class Entity extends EnterpriseBean {
+
+    @XmlElement(name = "primaryKey")
+    protected List<JavaClass> primaryKeys;
+    @XmlAttribute
+    protected String primaryKey;
+    @XmlAttribute
+    protected Boolean reentrant;
+
+    /**
+     * Gets the value of the primaryKeys 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 primaryKeys property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getPrimaryKeys().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JavaClass }
+     */
+    public List<JavaClass> getPrimaryKeys() {
+        if (primaryKeys == null) {
+            primaryKeys = new ArrayList<JavaClass>();
+        }
+        return this.primaryKeys;
+    }
+
+    /**
+     * Gets the value of the primaryKey property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getPrimaryKey() {
+        return primaryKey;
+    }
+
+    /**
+     * Sets the value of the primaryKey property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setPrimaryKey(final String value) {
+        this.primaryKey = value;
+    }
+
+    /**
+     * Gets the value of the reentrant property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isReentrant() {
+        return reentrant;
+    }
+
+    /**
+     * Sets the value of the reentrant property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setReentrant(final Boolean value) {
+        this.reentrant = value;
+    }
+
+}


[09/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java b/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java
index cb97600..c151e32 100644
--- a/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java
+++ b/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java
@@ -1,37 +1,37 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.config;
-
-import org.apache.deltaspike.core.api.config.ConfigProperty;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-@ApplicationScoped
-public class Counter {
-
-    @Inject
-    @ConfigProperty(name = "loop.size")
-    private Integer iterations;
-
-    public int loop() {
-        for (int i = 0; i < iterations; i++) {
-            System.out.println("Iteration #" + i);
-        }
-        return iterations;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.config;
+
+import org.apache.deltaspike.core.api.config.ConfigProperty;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+@ApplicationScoped
+public class Counter {
+
+    @Inject
+    @ConfigProperty(name = "loop.size")
+    private Integer iterations;
+
+    public int loop() {
+        for (int i = 0; i < iterations; i++) {
+            System.out.println("Iteration #" + i);
+        }
+        return iterations;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java b/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java
index 5a5dd7c..9ff34b8 100644
--- a/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java
+++ b/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java
@@ -1,79 +1,79 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.config;
-
-import org.apache.deltaspike.core.impl.config.BaseConfigSource;
-import org.apache.deltaspike.core.util.PropertyFileUtils;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-public class MyConfigSource extends BaseConfigSource {
-
-    private static final Logger LOGGER = Logger.getLogger(MyConfigSource.class.getName());
-    private static final String MY_CONF_FILE_NAME = "my-app-config.properties";
-
-    private final Properties properties;
-
-    public MyConfigSource() {
-        final Enumeration<URL> in;
-        try {
-            in = Thread.currentThread().getContextClassLoader().getResources(MY_CONF_FILE_NAME);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("can't find " + MY_CONF_FILE_NAME, e);
-        }
-
-        properties = new Properties();
-
-        while (in.hasMoreElements()) {
-            final Properties currentProps = PropertyFileUtils.loadProperties(in.nextElement());
-            for (Map.Entry<Object, Object> key : currentProps.entrySet()) { // some check
-                if (properties.containsKey(key.getKey().toString())) {
-                    LOGGER.warning("found " + key.getKey() + " multiple times, only one value will be available.");
-                }
-            }
-            properties.putAll(currentProps);
-        }
-
-        initOrdinal(401); // before other sources
-    }
-
-    @Override
-    public Map<String, String> getProperties() {
-        return Collections.emptyMap(); // not scannable
-    }
-
-    @Override
-    public String getPropertyValue(String key) {
-        return properties.getProperty(key);
-    }
-
-    @Override
-    public String getConfigName() {
-        return MY_CONF_FILE_NAME;
-    }
-
-    @Override
-    public boolean isScannable() {
-        return false;
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.config;
+
+import org.apache.deltaspike.core.impl.config.BaseConfigSource;
+import org.apache.deltaspike.core.util.PropertyFileUtils;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+public class MyConfigSource extends BaseConfigSource {
+
+    private static final Logger LOGGER = Logger.getLogger(MyConfigSource.class.getName());
+    private static final String MY_CONF_FILE_NAME = "my-app-config.properties";
+
+    private final Properties properties;
+
+    public MyConfigSource() {
+        final Enumeration<URL> in;
+        try {
+            in = Thread.currentThread().getContextClassLoader().getResources(MY_CONF_FILE_NAME);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("can't find " + MY_CONF_FILE_NAME, e);
+        }
+
+        properties = new Properties();
+
+        while (in.hasMoreElements()) {
+            final Properties currentProps = PropertyFileUtils.loadProperties(in.nextElement());
+            for (Map.Entry<Object, Object> key : currentProps.entrySet()) { // some check
+                if (properties.containsKey(key.getKey().toString())) {
+                    LOGGER.warning("found " + key.getKey() + " multiple times, only one value will be available.");
+                }
+            }
+            properties.putAll(currentProps);
+        }
+
+        initOrdinal(401); // before other sources
+    }
+
+    @Override
+    public Map<String, String> getProperties() {
+        return Collections.emptyMap(); // not scannable
+    }
+
+    @Override
+    public String getPropertyValue(String key) {
+        return properties.getProperty(key);
+    }
+
+    @Override
+    public String getConfigName() {
+        return MY_CONF_FILE_NAME;
+    }
+
+    @Override
+    public boolean isScannable() {
+        return false;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java b/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java
index 4fd042c..e416a66 100644
--- a/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java
+++ b/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java
@@ -1,30 +1,30 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.config;
-
-import org.apache.deltaspike.core.spi.config.ConfigSource;
-import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class MyConfigSourceProvider implements ConfigSourceProvider {
-    @Override
-    public List<ConfigSource> getConfigSources() {
-        return Arrays.asList((ConfigSource) new MyConfigSource());
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.config;
+
+import org.apache.deltaspike.core.spi.config.ConfigSource;
+import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class MyConfigSourceProvider implements ConfigSourceProvider {
+    @Override
+    public List<ConfigSource> getConfigSources() {
+        return Arrays.asList((ConfigSource) new MyConfigSource());
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-configproperty/src/test/java/org/superbiz/deltaspike/config/ConfigTest.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-configproperty/src/test/java/org/superbiz/deltaspike/config/ConfigTest.java b/examples/deltaspike-configproperty/src/test/java/org/superbiz/deltaspike/config/ConfigTest.java
index 49aff53..8f0a467 100644
--- a/examples/deltaspike-configproperty/src/test/java/org/superbiz/deltaspike/config/ConfigTest.java
+++ b/examples/deltaspike-configproperty/src/test/java/org/superbiz/deltaspike/config/ConfigTest.java
@@ -1,59 +1,59 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.config;
-
-import org.apache.deltaspike.core.impl.config.DefaultConfigSourceProvider;
-import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
-import org.apache.openjpa.lib.conf.MapConfigurationProvider;
-import org.apache.ziplock.JarLocation;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.inject.Inject;
-
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(Arquillian.class)
-public class ConfigTest {
-
-    @Inject
-    private Counter counter;
-
-    @Deployment
-    public static WebArchive jar() {
-        return ShrinkWrap.create(WebArchive.class)
-                .addClasses(Counter.class, MyConfigSource.class, MapConfigurationProvider.class)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
-                .addAsResource(new ClassLoaderAsset("my-app-config.properties"), "my-app-config.properties")
-                .addAsLibraries(JarLocation.jarLocation(ConfigSourceProvider.class))
-                .addAsLibraries(JarLocation.jarLocation(DefaultConfigSourceProvider.class))
-                .addAsServiceProvider(ConfigSourceProvider.class, MyConfigSourceProvider.class);
-    }
-
-    @Test
-    public void check() {
-        assertNotNull(counter);
-        counter.loop();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.config;
+
+import org.apache.deltaspike.core.impl.config.DefaultConfigSourceProvider;
+import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
+import org.apache.openjpa.lib.conf.MapConfigurationProvider;
+import org.apache.ziplock.JarLocation;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(Arquillian.class)
+public class ConfigTest {
+
+    @Inject
+    private Counter counter;
+
+    @Deployment
+    public static WebArchive jar() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addClasses(Counter.class, MyConfigSource.class, MapConfigurationProvider.class)
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+                .addAsResource(new ClassLoaderAsset("my-app-config.properties"), "my-app-config.properties")
+                .addAsLibraries(JarLocation.jarLocation(ConfigSourceProvider.class))
+                .addAsLibraries(JarLocation.jarLocation(DefaultConfigSourceProvider.class))
+                .addAsServiceProvider(ConfigSourceProvider.class, MyConfigSourceProvider.class);
+    }
+
+    @Test
+    public void check() {
+        assertNotNull(counter);
+        counter.loop();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSExceptionHandler.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSExceptionHandler.java b/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSExceptionHandler.java
index 81be407..3316b50 100644
--- a/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSExceptionHandler.java
+++ b/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSExceptionHandler.java
@@ -1,34 +1,34 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.exceptionhandling;
-
-import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
-import org.apache.deltaspike.core.api.exception.control.Handles;
-import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-
-import java.util.logging.Logger;
-
-@ExceptionHandler
-public class OSExceptionHandler {
-
-    private static final Logger LOGGER = Logger.getLogger(OSExceptionHandler.class.getName());
-
-    public void printExceptions(@Handles final ExceptionEvent<OSRuntimeException> evt) {
-        LOGGER.severe("==> a bad OS was mentionned");
-        evt.handled();
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.exceptionhandling;
+
+import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
+import org.apache.deltaspike.core.api.exception.control.Handles;
+import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
+
+import java.util.logging.Logger;
+
+@ExceptionHandler
+public class OSExceptionHandler {
+
+    private static final Logger LOGGER = Logger.getLogger(OSExceptionHandler.class.getName());
+
+    public void printExceptions(@Handles final ExceptionEvent<OSRuntimeException> evt) {
+        LOGGER.severe("==> a bad OS was mentionned");
+        evt.handled();
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSRuntimeException.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSRuntimeException.java b/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSRuntimeException.java
index 8973c06..35ca632 100644
--- a/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSRuntimeException.java
+++ b/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSRuntimeException.java
@@ -1,21 +1,21 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.exceptionhandling;
-
-public class OSRuntimeException extends RuntimeException {
-
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.exceptionhandling;
+
+public class OSRuntimeException extends RuntimeException {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSValidator.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSValidator.java b/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSValidator.java
index d123e96..1a1dadc 100644
--- a/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSValidator.java
+++ b/examples/deltaspike-exception-handling/src/main/java/org/superbiz/deltaspike/exceptionhandling/OSValidator.java
@@ -1,35 +1,35 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.exceptionhandling;
-
-import org.apache.deltaspike.core.api.exception.control.event.ExceptionToCatchEvent;
-
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-
-public class OSValidator {
-
-    @Inject
-    private Event<ExceptionToCatchEvent> exceptionEvent;
-
-    public void validOS(final String os) {
-        if (os.toLowerCase().contains("win")) {
-            final Exception ex = new OSRuntimeException(); // can be a caugh exceptino
-            exceptionEvent.fire(new ExceptionToCatchEvent(ex));
-        }
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.exceptionhandling;
+
+import org.apache.deltaspike.core.api.exception.control.event.ExceptionToCatchEvent;
+
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
+
+public class OSValidator {
+
+    @Inject
+    private Event<ExceptionToCatchEvent> exceptionEvent;
+
+    public void validOS(final String os) {
+        if (os.toLowerCase().contains("win")) {
+            final Exception ex = new OSRuntimeException(); // can be a caugh exceptino
+            exceptionEvent.fire(new ExceptionToCatchEvent(ex));
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-exception-handling/src/test/java/org/superbiz/deltaspike/exceptionhandling/ExceptionHandlingDemoTest.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-exception-handling/src/test/java/org/superbiz/deltaspike/exceptionhandling/ExceptionHandlingDemoTest.java b/examples/deltaspike-exception-handling/src/test/java/org/superbiz/deltaspike/exceptionhandling/ExceptionHandlingDemoTest.java
index f585324..27ca60b 100644
--- a/examples/deltaspike-exception-handling/src/test/java/org/superbiz/deltaspike/exceptionhandling/ExceptionHandlingDemoTest.java
+++ b/examples/deltaspike-exception-handling/src/test/java/org/superbiz/deltaspike/exceptionhandling/ExceptionHandlingDemoTest.java
@@ -1,58 +1,58 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.superbiz.deltaspike.exceptionhandling;
-
-import org.apache.deltaspike.core.impl.config.DefaultConfigSourceProvider;
-import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
-import org.apache.ziplock.JarLocation;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.inject.Inject;
-
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(Arquillian.class)
-public class ExceptionHandlingDemoTest {
-
-    @Inject
-    private OSValidator validator;
-
-    @Deployment
-    public static WebArchive jar() {
-        return ShrinkWrap.create(WebArchive.class)
-                .addPackage(OSValidator.class.getPackage())
-                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
-                        // DeltaSpike libs (api and impl)
-                .addAsLibraries(JarLocation.jarLocation(ConfigSourceProvider.class))
-                .addAsLibraries(JarLocation.jarLocation(DefaultConfigSourceProvider.class));
-    }
-
-    @Test
-    public void check() {
-        assertNotNull(validator);
-        validator.validOS("Linux");
-        validator.validOS("windows"); // should throw a handled exception
-        validator.validOS("Mac OS");
-    }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.deltaspike.exceptionhandling;
+
+import org.apache.deltaspike.core.impl.config.DefaultConfigSourceProvider;
+import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
+import org.apache.ziplock.JarLocation;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(Arquillian.class)
+public class ExceptionHandlingDemoTest {
+
+    @Inject
+    private OSValidator validator;
+
+    @Deployment
+    public static WebArchive jar() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addPackage(OSValidator.class.getPackage())
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+                        // DeltaSpike libs (api and impl)
+                .addAsLibraries(JarLocation.jarLocation(ConfigSourceProvider.class))
+                .addAsLibraries(JarLocation.jarLocation(DefaultConfigSourceProvider.class));
+    }
+
+    @Test
+    public void check() {
+        assertNotNull(validator);
+        validator.validOS("Linux");
+        validator.validOS("windows"); // should throw a handled exception
+        validator.validOS("Mac OS");
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java
index 47a6b99..4bd451d 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java
@@ -1,30 +1,30 @@
-/*
- * 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.superbiz.deltaspike;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.api.projectstage.ProjectStageHolder;
-
-public class CustomProjectStage implements ProjectStageHolder {
-    public static final class Debugging extends ProjectStage {
-        private static final long serialVersionUID = -8626602281649294170L;
-    }
-
-    public static final Debugging Debugging = new Debugging();
-}
+/*
+ * 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.superbiz.deltaspike;
+
+import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.api.projectstage.ProjectStageHolder;
+
+public class CustomProjectStage implements ProjectStageHolder {
+    public static final class Debugging extends ProjectStage {
+        private static final long serialVersionUID = -8626602281649294170L;
+    }
+
+    public static final Debugging Debugging = new Debugging();
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java
index f17699e..da3db91 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java
@@ -1,49 +1,49 @@
-/*
- * 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.superbiz.deltaspike;
-
-import org.apache.deltaspike.core.api.exclude.Exclude;
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.jsf.api.listener.phase.JsfPhaseListener;
-
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import java.util.logging.Logger;
-
-@Exclude(exceptIfProjectStage = {ProjectStage.Development.class, CustomProjectStage.Debugging.class})
-
-@JsfPhaseListener
-public class DebugPhaseListener implements PhaseListener {
-    private static final long serialVersionUID = 5899542118538949019L;
-
-    private Logger logger = Logger.getLogger(Logger.class.getName());
-
-    public void beforePhase(PhaseEvent phaseEvent) {
-        this.logger.info("before " + phaseEvent.getPhaseId());
-    }
-
-    public void afterPhase(PhaseEvent phaseEvent) {
-        this.logger.info("after " + phaseEvent.getPhaseId());
-    }
-
-    public PhaseId getPhaseId() {
-        return PhaseId.ANY_PHASE;
-    }
-}
+/*
+ * 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.superbiz.deltaspike;
+
+import org.apache.deltaspike.core.api.exclude.Exclude;
+import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.jsf.api.listener.phase.JsfPhaseListener;
+
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import java.util.logging.Logger;
+
+@Exclude(exceptIfProjectStage = {ProjectStage.Development.class, CustomProjectStage.Debugging.class})
+
+@JsfPhaseListener
+public class DebugPhaseListener implements PhaseListener {
+    private static final long serialVersionUID = 5899542118538949019L;
+
+    private Logger logger = Logger.getLogger(Logger.class.getName());
+
+    public void beforePhase(PhaseEvent phaseEvent) {
+        this.logger.info("before " + phaseEvent.getPhaseId());
+    }
+
+    public void afterPhase(PhaseEvent phaseEvent) {
+        this.logger.info("after " + phaseEvent.getPhaseId());
+    }
+
+    public PhaseId getPhaseId() {
+        return PhaseId.ANY_PHASE;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java
index 6cff477..a3392fe 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java
@@ -1,38 +1,38 @@
-/*
- * 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.superbiz.deltaspike;
-
-import org.apache.deltaspike.core.api.message.MessageBundle;
-import org.apache.deltaspike.core.api.message.MessageContextConfig;
-
-@MessageBundle
-@MessageContextConfig(messageSource = "org.superbiz.deltaspike.i18n.messages")
-public interface WebappMessageBundle {
-    String msgAccessDenied();
-
-    String msgUserRegistered(String userName);
-
-    String msgLoginSuccessful();
-
-    String msgLoginFailed();
-
-    String msgError(String message);
-
-    String msgWelcome();
-}
+/*
+ * 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.superbiz.deltaspike;
+
+import org.apache.deltaspike.core.api.message.MessageBundle;
+import org.apache.deltaspike.core.api.message.MessageContextConfig;
+
+@MessageBundle
+@MessageContextConfig(messageSource = "org.superbiz.deltaspike.i18n.messages")
+public interface WebappMessageBundle {
+    String msgAccessDenied();
+
+    String msgUserRegistered(String userName);
+
+    String msgLoginSuccessful();
+
+    String msgLoginFailed();
+
+    String msgError(String message);
+
+    String msgWelcome();
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/AbstractDomainObject.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/AbstractDomainObject.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/AbstractDomainObject.java
index 7ab899f..5715a89 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/AbstractDomainObject.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/AbstractDomainObject.java
@@ -1,43 +1,43 @@
-/*
- * 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.superbiz.deltaspike.domain;
-
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Version;
-import java.io.Serializable;
-
-@MappedSuperclass
-public abstract class AbstractDomainObject implements Serializable {
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    @Version
-    private Long version;
-
-    public boolean isTransient() {
-        return this.version == null;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
+/*
+ * 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.superbiz.deltaspike.domain;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+import java.io.Serializable;
+
+@MappedSuperclass
+public abstract class AbstractDomainObject implements Serializable {
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Version
+    private Long version;
+
+    public boolean isTransient() {
+        return this.version == null;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Comment.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Comment.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Comment.java
index 798b374..26dbc76 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Comment.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Comment.java
@@ -1,53 +1,53 @@
-/*
- * 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.superbiz.deltaspike.domain;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-
-@Entity
-public class Comment extends AbstractDomainObject {
-    private static final long serialVersionUID = -5718296682587279635L;
-
-    @Column(length = 2048)
-    private String description;
-
-    @ManyToOne(optional = false)
-    private Feedback feedback;
-
-    void setFeedback(Feedback feedback) {
-        this.feedback = feedback;
-    }
-
-    /*
-     * generated
-     */
-
-    public Comment() {
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}
+/*
+ * 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.superbiz.deltaspike.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Comment extends AbstractDomainObject {
+    private static final long serialVersionUID = -5718296682587279635L;
+
+    @Column(length = 2048)
+    private String description;
+
+    @ManyToOne(optional = false)
+    private Feedback feedback;
+
+    void setFeedback(Feedback feedback) {
+        this.feedback = feedback;
+    }
+
+    /*
+     * generated
+     */
+
+    public Comment() {
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Feedback.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Feedback.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Feedback.java
index b837dfd..1247465 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Feedback.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/Feedback.java
@@ -1,69 +1,69 @@
-/*
- * 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.superbiz.deltaspike.domain;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity
-public class Feedback extends AbstractDomainObject {
-    private static final long serialVersionUID = -431924785266663236L;
-
-    @Column(nullable = false, length = 32)
-    private String topic;
-
-    @Column(length = 128)
-    private String description;
-
-    @OneToMany(mappedBy = "feedback", cascade = CascadeType.ALL)
-    private List<Comment> comments = new ArrayList<Comment>();
-
-    public void addComment(Comment comment) {
-        comment.setFeedback(this);
-        this.comments.add(comment);
-    }
-
-    /*
-     * generated
-     */
-
-    public List<Comment> getComments() {
-        return comments;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setTopic(String topic) {
-        this.topic = topic;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}
+/*
+ * 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.superbiz.deltaspike.domain;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class Feedback extends AbstractDomainObject {
+    private static final long serialVersionUID = -431924785266663236L;
+
+    @Column(nullable = false, length = 32)
+    private String topic;
+
+    @Column(length = 128)
+    private String description;
+
+    @OneToMany(mappedBy = "feedback", cascade = CascadeType.ALL)
+    private List<Comment> comments = new ArrayList<Comment>();
+
+    public void addComment(Comment comment) {
+        comment.setFeedback(this);
+        this.comments.add(comment);
+    }
+
+    /*
+     * generated
+     */
+
+    public List<Comment> getComments() {
+        return comments;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/User.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/User.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/User.java
index d050b53..e98a239 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/User.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/User.java
@@ -1,103 +1,103 @@
-/*
- * 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.superbiz.deltaspike.domain;
-
-import org.superbiz.deltaspike.domain.validation.DifferentName;
-import org.superbiz.deltaspike.domain.validation.Name;
-import org.superbiz.deltaspike.domain.validation.Partial;
-import org.superbiz.deltaspike.domain.validation.UniqueUserName;
-import org.superbiz.deltaspike.domain.validation.UserName;
-
-import javax.enterprise.inject.Typed;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-@Table(name = "T_User")
-@Entity
-@NamedQuery(name = "findUserByName", query = "select u from User u where u.userName = :currentUser")
-@DifferentName(groups = Partial.class)
-@Typed()
-public class User extends AbstractDomainObject {
-    private static final long serialVersionUID = 3810638653455000233L;
-
-    @UserName(groups = UniqueUserName.class)
-    @Column(nullable = false, length = 9, unique = true)
-    private String userName;
-
-    @Size(min = 2, max = 20, message = "invalid first name")
-    @NotNull
-    @Column
-    private String firstName;
-
-    @Column
-    @Name(message = "invalid last name")
-    private String lastName;
-
-    @Column
-    private String password;
-
-    /*
-     * generated
-     */
-
-    public User() {
-    }
-
-    public User(String userName, String firstName, String lastName) {
-        this.userName = userName;
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-}
+/*
+ * 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.superbiz.deltaspike.domain;
+
+import org.superbiz.deltaspike.domain.validation.DifferentName;
+import org.superbiz.deltaspike.domain.validation.Name;
+import org.superbiz.deltaspike.domain.validation.Partial;
+import org.superbiz.deltaspike.domain.validation.UniqueUserName;
+import org.superbiz.deltaspike.domain.validation.UserName;
+
+import javax.enterprise.inject.Typed;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+@Table(name = "T_User")
+@Entity
+@NamedQuery(name = "findUserByName", query = "select u from User u where u.userName = :currentUser")
+@DifferentName(groups = Partial.class)
+@Typed()
+public class User extends AbstractDomainObject {
+    private static final long serialVersionUID = 3810638653455000233L;
+
+    @UserName(groups = UniqueUserName.class)
+    @Column(nullable = false, length = 9, unique = true)
+    private String userName;
+
+    @Size(min = 2, max = 20, message = "invalid first name")
+    @NotNull
+    @Column
+    private String firstName;
+
+    @Column
+    @Name(message = "invalid last name")
+    private String lastName;
+
+    @Column
+    private String password;
+
+    /*
+     * generated
+     */
+
+    public User() {
+    }
+
+    public User(String userName, String firstName, String lastName) {
+        this.userName = userName;
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentName.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentName.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentName.java
index ff5d3d3..fa217e1 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentName.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentName.java
@@ -1,38 +1,38 @@
-/*
- * 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.superbiz.deltaspike.domain.validation;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Constraint(validatedBy = DifferentNameValidator.class)
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface DifferentName {
-    String message() default "invalid name";
-
-    Class<?>[] groups() default {};
-
-    Class<? extends Payload>[] payload() default {};
-}
+/*
+ * 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.superbiz.deltaspike.domain.validation;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Constraint(validatedBy = DifferentNameValidator.class)
+@Target(TYPE)
+@Retention(RUNTIME)
+public @interface DifferentName {
+    String message() default "invalid name";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentNameValidator.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentNameValidator.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentNameValidator.java
index 737186b..9337187 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentNameValidator.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/DifferentNameValidator.java
@@ -1,33 +1,33 @@
-/*
- * 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.superbiz.deltaspike.domain.validation;
-
-import org.superbiz.deltaspike.domain.User;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-public class DifferentNameValidator implements ConstraintValidator<DifferentName, User> {
-    public void initialize(DifferentName differentName) {
-    }
-
-    public boolean isValid(User person, ConstraintValidatorContext constraintValidatorContext) {
-        return person == null || !(person.getFirstName() != null && person.getFirstName().equals(person.getLastName()));
-    }
-}
+/*
+ * 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.superbiz.deltaspike.domain.validation;
+
+import org.superbiz.deltaspike.domain.User;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class DifferentNameValidator implements ConstraintValidator<DifferentName, User> {
+    public void initialize(DifferentName differentName) {
+    }
+
+    public boolean isValid(User person, ConstraintValidatorContext constraintValidatorContext) {
+        return person == null || !(person.getFirstName() != null && person.getFirstName().equals(person.getLastName()));
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Full.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Full.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Full.java
index cfa4b11..72f569f 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Full.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Full.java
@@ -1,26 +1,26 @@
-/*
- * 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.superbiz.deltaspike.domain.validation;
-
-import javax.validation.GroupSequence;
-import javax.validation.groups.Default;
-
-@GroupSequence({Default.class, UniqueUserName.class})
-public interface Full {
-}
+/*
+ * 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.superbiz.deltaspike.domain.validation;
+
+import javax.validation.GroupSequence;
+import javax.validation.groups.Default;
+
+@GroupSequence({Default.class, UniqueUserName.class})
+public interface Full {
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Name.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Name.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Name.java
index fb96554..708095f 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Name.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Name.java
@@ -1,48 +1,48 @@
-/*
- * 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.superbiz.deltaspike.domain.validation;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.ReportAsSingleViolation;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Size(min = 2, max = 20)
-@NotNull
-
-@Constraint(validatedBy = {})
-@ReportAsSingleViolation
-
-@Target({METHOD, FIELD, ANNOTATION_TYPE})
-@Retention(RUNTIME)
-public @interface Name {
-    public abstract String message() default "invalid name";
-
-    public abstract Class<?>[] groups() default {};
-
-    public abstract Class<? extends Payload>[] payload() default {};
+/*
+ * 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.superbiz.deltaspike.domain.validation;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.ReportAsSingleViolation;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Size(min = 2, max = 20)
+@NotNull
+
+@Constraint(validatedBy = {})
+@ReportAsSingleViolation
+
+@Target({METHOD, FIELD, ANNOTATION_TYPE})
+@Retention(RUNTIME)
+public @interface Name {
+    public abstract String message() default "invalid name";
+
+    public abstract Class<?>[] groups() default {};
+
+    public abstract Class<? extends Payload>[] payload() default {};
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Partial.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Partial.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Partial.java
index 8edfa5a..d179918 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Partial.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/Partial.java
@@ -1,22 +1,22 @@
-/*
- * 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.superbiz.deltaspike.domain.validation;
-
-public interface Partial {
+/*
+ * 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.superbiz.deltaspike.domain.validation;
+
+public interface Partial {
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UniqueUserName.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UniqueUserName.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UniqueUserName.java
index 6e2b4b0..183874c 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UniqueUserName.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UniqueUserName.java
@@ -1,22 +1,22 @@
-/*
- * 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.superbiz.deltaspike.domain.validation;
-
-public interface UniqueUserName {
+/*
+ * 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.superbiz.deltaspike.domain.validation;
+
+public interface UniqueUserName {
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UserName.java
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UserName.java b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UserName.java
index 80f4c85..e878625 100644
--- a/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UserName.java
+++ b/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/validation/UserName.java
@@ -1,44 +1,44 @@
-/*
- * 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.superbiz.deltaspike.domain.validation;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import javax.validation.groups.Default;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@NotNull(groups = Default.class)
-@Size(min = 2, max = 9, message = "invalid name", groups = Default.class)
-
-@Constraint(validatedBy = UniqueUserNameValidator.class)
-@Target(FIELD)
-@Retention(RUNTIME)
-public @interface UserName {
-    String message() default "user-name exists already";
-
-    Class<?>[] groups() default {};
-
-    Class<? extends Payload>[] payload() default {};
-}
+/*
+ * 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.superbiz.deltaspike.domain.validation;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import javax.validation.groups.Default;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@NotNull(groups = Default.class)
+@Size(min = 2, max = 9, message = "invalid name", groups = Default.class)
+
+@Constraint(validatedBy = UniqueUserNameValidator.class)
+@Target(FIELD)
+@Retention(RUNTIME)
+public @interface UserName {
+    String message() default "user-name exists already";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}


[35/51] [partial] tomee git commit: removing ^M (windows eol)

Posted by tv...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EDataType.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EDataType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EDataType.java
index a5af2f1..2cae410 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EDataType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EDataType.java
@@ -1,67 +1,67 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EDataType complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EDataType">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EClassifier">
- *       &lt;attribute name="serializable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EDataType")
-public class EDataType extends EClassifier {
-
-    @XmlAttribute
-    protected Boolean serializable;
-
-    /**
-     * Gets the value of the serializable property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isSerializable() {
-        return serializable;
-    }
-
-    /**
-     * Sets the value of the serializable property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setSerializable(final Boolean value) {
-        this.serializable = 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.was.v6.ecore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EDataType complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EDataType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EClassifier">
+ *       &lt;attribute name="serializable" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EDataType")
+public class EDataType extends EClassifier {
+
+    @XmlAttribute
+    protected Boolean serializable;
+
+    /**
+     * Gets the value of the serializable property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isSerializable() {
+        return serializable;
+    }
+
+    /**
+     * Sets the value of the serializable property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setSerializable(final Boolean value) {
+        this.serializable = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnum.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnum.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnum.java
index 6c68cfe..160d467 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnum.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnum.java
@@ -1,79 +1,79 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EEnum complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EEnum">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EDataType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="eLiterals" type="{http://www.eclipse.org/emf/2002/Ecore}EEnumLiteral"/>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EEnum", propOrder = {"eLiterals"})
-public class EEnum extends EDataType {
-
-    protected List<EEnumLiteral> eLiterals;
-
-    /**
-     * Gets the value of the eLiterals 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 eLiterals property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getELiterals().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EEnumLiteral }
-     */
-    public List<EEnumLiteral> getELiterals() {
-        if (eLiterals == null) {
-            eLiterals = new ArrayList<EEnumLiteral>();
-        }
-        return this.eLiterals;
-    }
-
-}
+/**
+ * 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EEnum complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EEnum">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EDataType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="eLiterals" type="{http://www.eclipse.org/emf/2002/Ecore}EEnumLiteral"/>
+ *       &lt;/choice>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EEnum", propOrder = {"eLiterals"})
+public class EEnum extends EDataType {
+
+    protected List<EEnumLiteral> eLiterals;
+
+    /**
+     * Gets the value of the eLiterals 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 eLiterals property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getELiterals().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EEnumLiteral }
+     */
+    public List<EEnumLiteral> getELiterals() {
+        if (eLiterals == null) {
+            eLiterals = new ArrayList<EEnumLiteral>();
+        }
+        return this.eLiterals;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnumLiteral.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnumLiteral.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnumLiteral.java
index 8e44e49..6a670e1 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnumLiteral.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EEnumLiteral.java
@@ -1,67 +1,67 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EEnumLiteral complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EEnumLiteral">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ENamedElement">
- *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}int" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EEnumLiteral")
-public class EEnumLiteral extends ENamedElement {
-
-    @XmlAttribute
-    protected Integer value;
-
-    /**
-     * Gets the value of the value property.
-     *
-     * @return possible object is {@link Integer }
-     */
-    public Integer getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is {@link Integer }
-     */
-    public void setValue(final Integer value) {
-        this.value = 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.was.v6.ecore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EEnumLiteral complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EEnumLiteral">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ENamedElement">
+ *       &lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EEnumLiteral")
+public class EEnumLiteral extends ENamedElement {
+
+    @XmlAttribute
+    protected Integer value;
+
+    /**
+     * Gets the value of the value property.
+     *
+     * @return possible object is {@link Integer }
+     */
+    public Integer getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value allowed object is {@link Integer }
+     */
+    public void setValue(final Integer value) {
+        this.value = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EFactory.java
index 0022da0..f1234d9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EFactory.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EFactory complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EFactory">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EModelElement">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EFactory")
-public class EFactory extends EModelElement {
-
-}
+/**
+ * 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.was.v6.ecore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EFactory complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EFactory">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EModelElement">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EFactory")
+public class EFactory extends EModelElement {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EModelElement.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EModelElement.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EModelElement.java
index ddca11e..0b074a6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EModelElement.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EModelElement.java
@@ -1,79 +1,79 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EModelElement complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EModelElement">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EObject">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="eAnnotations" type="{http://www.eclipse.org/emf/2002/Ecore}EAnnotation"/>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EModelElement", propOrder = {"eAnnotations"})
-public class EModelElement extends EObject {
-
-    protected List<EAnnotation> eAnnotations;
-
-    /**
-     * Gets the value of the eAnnotations 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 eAnnotations property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEAnnotations().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EAnnotation }
-     */
-    public List<EAnnotation> getEAnnotations() {
-        if (eAnnotations == null) {
-            eAnnotations = new ArrayList<EAnnotation>();
-        }
-        return this.eAnnotations;
-    }
-
-}
+/**
+ * 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EModelElement complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EModelElement">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EObject">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="eAnnotations" type="{http://www.eclipse.org/emf/2002/Ecore}EAnnotation"/>
+ *       &lt;/choice>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EModelElement", propOrder = {"eAnnotations"})
+public class EModelElement extends EObject {
+
+    protected List<EAnnotation> eAnnotations;
+
+    /**
+     * Gets the value of the eAnnotations 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 eAnnotations property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEAnnotations().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EAnnotation }
+     */
+    public List<EAnnotation> getEAnnotations() {
+        if (eAnnotations == null) {
+            eAnnotations = new ArrayList<EAnnotation>();
+        }
+        return this.eAnnotations;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ENamedElement.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ENamedElement.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ENamedElement.java
index 0b56151..d3d383d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ENamedElement.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ENamedElement.java
@@ -1,67 +1,67 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for ENamedElement complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="ENamedElement">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EModelElement">
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ENamedElement")
-public class ENamedElement extends EModelElement {
-
-    @XmlAttribute
-    protected String name;
-
-    /**
-     * 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;
-    }
-
-}
+/**
+ * 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.was.v6.ecore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for ENamedElement complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="ENamedElement">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EModelElement">
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ENamedElement")
+public class ENamedElement extends EModelElement {
+
+    @XmlAttribute
+    protected String name;
+
+    /**
+     * 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;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java
index 5365c9f..aa2465a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java
@@ -1,238 +1,238 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-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.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.openejb.jee.was.v6.xmi.Extension;
-
-/**
- * <p/>
- * Java class for EObject complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EObject">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
- *       &lt;/choice>
- *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
- *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EObject", propOrder = {"extensions"})
-public class EObject {
-
-    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
-    protected List<Extension> extensions;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected String id;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected QName type;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String version;
-    @XmlAttribute
-    protected String href;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    @XmlIDREF
-    protected Object idref;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String label;
-    @XmlAttribute(namespace = "http://www.omg.org/XMI")
-    protected String uuid;
-
-    /**
-     * Gets the value of the extensions 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 extensions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getExtensions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Extension }
-     */
-    public List<Extension> getExtensions() {
-        if (extensions == null) {
-            extensions = new ArrayList<Extension>();
-        }
-        return this.extensions;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setId(final String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is {@link QName }
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value allowed object is {@link QName }
-     */
-    public void setType(final QName value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "2.0";
-        } else {
-            return version;
-        }
-    }
-
-    /**
-     * Sets the value of the version property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setVersion(final String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the href property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * Sets the value of the href property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setHref(final String value) {
-        this.href = value;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     *
-     * @return possible object is {@link Object }
-     */
-    public Object getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     *
-     * @param value allowed object is {@link Object }
-     */
-    public void setIdref(final Object value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setLabel(final String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the uuid property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setUuid(final String value) {
-        this.uuid = 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+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.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import org.apache.openejb.jee.was.v6.xmi.Extension;
+
+/**
+ * <p/>
+ * Java class for EObject complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EObject">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{http://www.omg.org/XMI}Extension"/>
+ *       &lt;/choice>
+ *       &lt;attGroup ref="{http://www.omg.org/XMI}ObjectAttribs"/>
+ *       &lt;attribute ref="{http://www.omg.org/XMI}id"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EObject", propOrder = {"extensions"})
+public class EObject {
+
+    @XmlElement(name = "Extension", namespace = "http://www.omg.org/XMI")
+    protected List<Extension> extensions;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected QName type;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String version;
+    @XmlAttribute
+    protected String href;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    @XmlIDREF
+    protected Object idref;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String label;
+    @XmlAttribute(namespace = "http://www.omg.org/XMI")
+    protected String uuid;
+
+    /**
+     * Gets the value of the extensions 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 extensions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getExtensions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Extension }
+     */
+    public List<Extension> getExtensions() {
+        if (extensions == null) {
+            extensions = new ArrayList<Extension>();
+        }
+        return this.extensions;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setId(final String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     *
+     * @return possible object is {@link QName }
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     *
+     * @param value allowed object is {@link QName }
+     */
+    public void setType(final QName value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "2.0";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setVersion(final String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the href property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHref(final String value) {
+        this.href = value;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     *
+     * @return possible object is {@link Object }
+     */
+    public Object getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     *
+     * @param value allowed object is {@link Object }
+     */
+    public void setIdref(final Object value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the label property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the value of the label property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setLabel(final String value) {
+        this.label = value;
+    }
+
+    /**
+     * Gets the value of the uuid property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the value of the uuid property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setUuid(final String value) {
+        this.uuid = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EOperation.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EOperation.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EOperation.java
index 534fbeb..3973af4 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EOperation.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EOperation.java
@@ -1,138 +1,138 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-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;
-
-/**
- * <p/>
- * Java class for EOperation complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EOperation">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ETypedElement">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="eParameters" type="{http://www.eclipse.org/emf/2002/Ecore}EParameter"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="eExceptions" type="{http://www.eclipse.org/emf/2002/Ecore}EClassifier"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="eExceptions" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EOperation", propOrder = {"eParameters",
-    "eClassifierEExceptions"})
-public class EOperation extends ETypedElement {
-
-    protected List<EParameter> eParameters;
-    @XmlElement(name = "eExceptions")
-    protected List<EClassifier> eClassifierEExceptions;
-    @XmlAttribute
-    protected String eExceptions;
-
-    /**
-     * Gets the value of the eParameters 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 eParameters property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEParameters().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EParameter }
-     */
-    public List<EParameter> getEParameters() {
-        if (eParameters == null) {
-            eParameters = new ArrayList<EParameter>();
-        }
-        return this.eParameters;
-    }
-
-    /**
-     * Gets the value of the eClassifierEExceptions 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 eClassifierEExceptions property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEClassifierEExceptions().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EClassifier }
-     */
-    public List<EClassifier> getEClassifierEExceptions() {
-        if (eClassifierEExceptions == null) {
-            eClassifierEExceptions = new ArrayList<EClassifier>();
-        }
-        return this.eClassifierEExceptions;
-    }
-
-    /**
-     * Gets the value of the eExceptions property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEExceptions() {
-        return eExceptions;
-    }
-
-    /**
-     * Sets the value of the eExceptions property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEExceptions(final String value) {
-        this.eExceptions = 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+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;
+
+/**
+ * <p/>
+ * Java class for EOperation complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EOperation">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ETypedElement">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="eParameters" type="{http://www.eclipse.org/emf/2002/Ecore}EParameter"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="eExceptions" type="{http://www.eclipse.org/emf/2002/Ecore}EClassifier"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="eExceptions" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EOperation", propOrder = {"eParameters",
+    "eClassifierEExceptions"})
+public class EOperation extends ETypedElement {
+
+    protected List<EParameter> eParameters;
+    @XmlElement(name = "eExceptions")
+    protected List<EClassifier> eClassifierEExceptions;
+    @XmlAttribute
+    protected String eExceptions;
+
+    /**
+     * Gets the value of the eParameters 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 eParameters property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEParameters().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EParameter }
+     */
+    public List<EParameter> getEParameters() {
+        if (eParameters == null) {
+            eParameters = new ArrayList<EParameter>();
+        }
+        return this.eParameters;
+    }
+
+    /**
+     * Gets the value of the eClassifierEExceptions 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 eClassifierEExceptions property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEClassifierEExceptions().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EClassifier }
+     */
+    public List<EClassifier> getEClassifierEExceptions() {
+        if (eClassifierEExceptions == null) {
+            eClassifierEExceptions = new ArrayList<EClassifier>();
+        }
+        return this.eClassifierEExceptions;
+    }
+
+    /**
+     * Gets the value of the eExceptions property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEExceptions() {
+        return eExceptions;
+    }
+
+    /**
+     * Sets the value of the eExceptions property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEExceptions(final String value) {
+        this.eExceptions = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EPackage.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EPackage.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EPackage.java
index a6a5267..673a2f4 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EPackage.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EPackage.java
@@ -1,155 +1,155 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EPackage complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EPackage">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ENamedElement">
- *       &lt;choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="eClassifiers" type="{http://www.eclipse.org/emf/2002/Ecore}EClassifier"/>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;element name="eSubpackages" type="{http://www.eclipse.org/emf/2002/Ecore}EPackage"/>
- *         &lt;/choice>
- *       &lt;/choice>
- *       &lt;attribute name="nsPrefix" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="nsURI" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EPackage", propOrder = {"eClassifiers", "eSubpackages"})
-public class EPackage extends ENamedElement {
-
-    protected List<EClassifier> eClassifiers;
-    protected List<EPackage> eSubpackages;
-    @XmlAttribute
-    protected String nsPrefix;
-    @XmlAttribute
-    protected String nsURI;
-
-    /**
-     * Gets the value of the eClassifiers 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 eClassifiers property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEClassifiers().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EClassifier }
-     */
-    public List<EClassifier> getEClassifiers() {
-        if (eClassifiers == null) {
-            eClassifiers = new ArrayList<EClassifier>();
-        }
-        return this.eClassifiers;
-    }
-
-    /**
-     * Gets the value of the eSubpackages 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 eSubpackages property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getESubpackages().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list {@link EPackage }
-     */
-    public List<EPackage> getESubpackages() {
-        if (eSubpackages == null) {
-            eSubpackages = new ArrayList<EPackage>();
-        }
-        return this.eSubpackages;
-    }
-
-    /**
-     * Gets the value of the nsPrefix property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getNsPrefix() {
-        return nsPrefix;
-    }
-
-    /**
-     * Sets the value of the nsPrefix property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setNsPrefix(final String value) {
-        this.nsPrefix = value;
-    }
-
-    /**
-     * Gets the value of the nsURI property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getNsURI() {
-        return nsURI;
-    }
-
-    /**
-     * Sets the value of the nsURI property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setNsURI(final String value) {
-        this.nsURI = 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EPackage complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EPackage">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ENamedElement">
+ *       &lt;choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="eClassifiers" type="{http://www.eclipse.org/emf/2002/Ecore}EClassifier"/>
+ *         &lt;/choice>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="eSubpackages" type="{http://www.eclipse.org/emf/2002/Ecore}EPackage"/>
+ *         &lt;/choice>
+ *       &lt;/choice>
+ *       &lt;attribute name="nsPrefix" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="nsURI" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EPackage", propOrder = {"eClassifiers", "eSubpackages"})
+public class EPackage extends ENamedElement {
+
+    protected List<EClassifier> eClassifiers;
+    protected List<EPackage> eSubpackages;
+    @XmlAttribute
+    protected String nsPrefix;
+    @XmlAttribute
+    protected String nsURI;
+
+    /**
+     * Gets the value of the eClassifiers 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 eClassifiers property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEClassifiers().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EClassifier }
+     */
+    public List<EClassifier> getEClassifiers() {
+        if (eClassifiers == null) {
+            eClassifiers = new ArrayList<EClassifier>();
+        }
+        return this.eClassifiers;
+    }
+
+    /**
+     * Gets the value of the eSubpackages 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 eSubpackages property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getESubpackages().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list {@link EPackage }
+     */
+    public List<EPackage> getESubpackages() {
+        if (eSubpackages == null) {
+            eSubpackages = new ArrayList<EPackage>();
+        }
+        return this.eSubpackages;
+    }
+
+    /**
+     * Gets the value of the nsPrefix property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getNsPrefix() {
+        return nsPrefix;
+    }
+
+    /**
+     * Sets the value of the nsPrefix property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setNsPrefix(final String value) {
+        this.nsPrefix = value;
+    }
+
+    /**
+     * Gets the value of the nsURI property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getNsURI() {
+        return nsURI;
+    }
+
+    /**
+     * Sets the value of the nsURI property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setNsURI(final String value) {
+        this.nsURI = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EParameter.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EParameter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EParameter.java
index 10f41cd..0443daf 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EParameter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EParameter.java
@@ -1,44 +1,44 @@
-/**
- * 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.was.v6.ecore;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p/>
- * Java class for EParameter complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EParameter">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ETypedElement">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EParameter")
-public class EParameter extends ETypedElement {
-
-}
+/**
+ * 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.was.v6.ecore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p/>
+ * Java class for EParameter complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EParameter">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}ETypedElement">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EParameter")
+public class EParameter extends ETypedElement {
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e2a4f7c/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EReference.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EReference.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EReference.java
index a1574f8..1afb7c9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EReference.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EReference.java
@@ -1,145 +1,145 @@
-/**
- * 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.was.v6.ecore;
-
-import java.util.ArrayList;
-import java.util.List;
-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;
-
-/**
- * <p/>
- * Java class for EReference complex type.
- * <p/>
- * <p/>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * <p/>
- * <pre>
- * &lt;complexType name="EReference">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EStructuralFeature">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="eOpposite" type="{http://www.eclipse.org/emf/2002/Ecore}EReference"/>
- *       &lt;/choice>
- *       &lt;attribute name="containment" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="eOpposite" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="resolveProxies" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EReference", propOrder = {"eReferenceEOpposites"})
-public class EReference extends EStructuralFeature {
-
-    @XmlElement(name = "eOpposite")
-    protected List<EReference> eReferenceEOpposites;
-    @XmlAttribute
-    protected Boolean containment;
-    @XmlAttribute
-    protected String eOpposite;
-    @XmlAttribute
-    protected Boolean resolveProxies;
-
-    /**
-     * Gets the value of the eReferenceEOpposites 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 eReferenceEOpposites property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <p/>
-     * <pre>
-     * getEReferenceEOpposites().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EReference }
-     */
-    public List<EReference> getEReferenceEOpposites() {
-        if (eReferenceEOpposites == null) {
-            eReferenceEOpposites = new ArrayList<EReference>();
-        }
-        return this.eReferenceEOpposites;
-    }
-
-    /**
-     * Gets the value of the containment property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isContainment() {
-        return containment;
-    }
-
-    /**
-     * Sets the value of the containment property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setContainment(final Boolean value) {
-        this.containment = value;
-    }
-
-    /**
-     * Gets the value of the eOpposite property.
-     *
-     * @return possible object is {@link String }
-     */
-    public String getEOpposite() {
-        return eOpposite;
-    }
-
-    /**
-     * Sets the value of the eOpposite property.
-     *
-     * @param value allowed object is {@link String }
-     */
-    public void setEOpposite(final String value) {
-        this.eOpposite = value;
-    }
-
-    /**
-     * Gets the value of the resolveProxies property.
-     *
-     * @return possible object is {@link Boolean }
-     */
-    public Boolean isResolveProxies() {
-        return resolveProxies;
-    }
-
-    /**
-     * Sets the value of the resolveProxies property.
-     *
-     * @param value allowed object is {@link Boolean }
-     */
-    public void setResolveProxies(final Boolean value) {
-        this.resolveProxies = 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.was.v6.ecore;
+
+import java.util.ArrayList;
+import java.util.List;
+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;
+
+/**
+ * <p/>
+ * Java class for EReference complex type.
+ * <p/>
+ * <p/>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="EReference">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.eclipse.org/emf/2002/Ecore}EStructuralFeature">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="eOpposite" type="{http://www.eclipse.org/emf/2002/Ecore}EReference"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="containment" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="eOpposite" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="resolveProxies" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EReference", propOrder = {"eReferenceEOpposites"})
+public class EReference extends EStructuralFeature {
+
+    @XmlElement(name = "eOpposite")
+    protected List<EReference> eReferenceEOpposites;
+    @XmlAttribute
+    protected Boolean containment;
+    @XmlAttribute
+    protected String eOpposite;
+    @XmlAttribute
+    protected Boolean resolveProxies;
+
+    /**
+     * Gets the value of the eReferenceEOpposites 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 eReferenceEOpposites property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <p/>
+     * <pre>
+     * getEReferenceEOpposites().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EReference }
+     */
+    public List<EReference> getEReferenceEOpposites() {
+        if (eReferenceEOpposites == null) {
+            eReferenceEOpposites = new ArrayList<EReference>();
+        }
+        return this.eReferenceEOpposites;
+    }
+
+    /**
+     * Gets the value of the containment property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isContainment() {
+        return containment;
+    }
+
+    /**
+     * Sets the value of the containment property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setContainment(final Boolean value) {
+        this.containment = value;
+    }
+
+    /**
+     * Gets the value of the eOpposite property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getEOpposite() {
+        return eOpposite;
+    }
+
+    /**
+     * Sets the value of the eOpposite property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setEOpposite(final String value) {
+        this.eOpposite = value;
+    }
+
+    /**
+     * Gets the value of the resolveProxies property.
+     *
+     * @return possible object is {@link Boolean }
+     */
+    public Boolean isResolveProxies() {
+        return resolveProxies;
+    }
+
+    /**
+     * Sets the value of the resolveProxies property.
+     *
+     * @param value allowed object is {@link Boolean }
+     */
+    public void setResolveProxies(final Boolean value) {
+        this.resolveProxies = value;
+    }
+
+}