/**
 * JBoss, Home of Professional Open Source
 * Copyright Red Hat, Inc., and individual contributors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * 	http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.jboss.aerogear.unifiedpush.cdi;

import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;

import org.picketlink.annotations.PicketLink;

/**
 * CDI Utility class, which contains various producer / factory methods.
 */
public class Factory {

    @Produces
    @PicketLink
    @PersistenceContext(unitName = "picketlink-default")
    private EntityManager picketLinkEntityManager;

    @PersistenceContext(unitName = "unifiedpush-default", type = PersistenceContextType.EXTENDED)
    private EntityManager entityManager;

    /**
     * Creates the {@code EntityManager} object for the UnifiedPush server.
     * 
     * @return the {@code EntityManager} object for the UnifiedPush server.
     */
    @Produces
    public EntityManager createEntityManager() {
        return entityManager;
    }

    /**
     * A disposer method performs cleanup for the {@code EntityManager} object. 
     * 
     * @param entityManager the provided {@code EntityManager} for which we perform the cleanup.
     */
    public void dispose(@Disposes EntityManager entityManager) {
        if (entityManager != null) {
            entityManager.close();
        }
    }
}

@@ -705,49 +705,8 @@
 i;%0A%0A
-import javax.enterprise.inject.Disposes;%0A
 impo
@@ -742,16 +742,16 @@
 oduces;%0A
+
 import j
@@ -1012,16 +1012,22 @@
 %0Apublic 
+final 
 class Fa
@@ -1170,24 +1170,38 @@
 tyManager;%0A%0A
+    @Produces%0A
     @Persist
@@ -1332,637 +1332,6 @@
 r;%0A%0A
-    /**%0A     * Creates the %7B@code EntityManager%7D object for the UnifiedPush server.%0A     * %0A     * @return the %7B@code EntityManager%7D object for the UnifiedPush server.%0A     */%0A    @Produces%0A    public EntityManager createEntityManager() %7B%0A        return entityManager;%0A    %7D%0A%0A    /**%0A     * A disposer method performs cleanup for the %7B@code EntityManager%7D object. %0A     * %0A     * @param entityManager the provided %7B@code EntityManager%7D for which we perform the cleanup.%0A     */%0A    public void dispose(@Disposes EntityManager entityManager) %7B%0A        if (entityManager != null) %7B%0A            entityManager.close();%0A        %7D%0A    %7D%0A
 %7D%0A

Clean up on factory util