[jboss-cvs] JBossAS SVN: r84544 - in projects/jboss-seam-int/branches/Branch_5_0: jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Feb 20 10:26:16 EST 2009


Author: alesj
Date: 2009-02-20 10:26:16 -0500 (Fri, 20 Feb 2009)
New Revision: 84544

Added:
   projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryInitializerVDFConnector.java
   projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryVDFConnector.java
   projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanTypeVDFConnector.java
   projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanVDFConnector.java
   projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/SimpleBeanVDFConnector.java
   projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamTempModificationTypeMatcher.java
   projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUnjarModificationTypeMatcher.java
   projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/
   projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java
Removed:
   projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamModificationTypeMatcher.java
   projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java
Modified:
   projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractVDFConnector.java
   projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/FederatedAnnotationEnvironmentVDFConnector.java
   projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java
Log:
Merge with trunk.

Copied: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryInitializerVDFConnector.java (from rev 84542, projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryInitializerVDFConnector.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryInitializerVDFConnector.java	                        (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryInitializerVDFConnector.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.seam.integration.jbossas.vdf;
+
+import javax.servlet.ServletContext;
+
+import org.jboss.seam.integration.microcontainer.vdf.DeploymentUnitAware;
+
+/**
+ * AbstractBeanFactoryInitializerTypeVDFConnector.
+ *
+ * @param <T> exact bean type
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractBeanFactoryInitializerVDFConnector<T extends DeploymentUnitAware> extends AbstractBeanFactoryVDFConnector<T>
+{
+   protected AbstractBeanFactoryInitializerVDFConnector(ServletContext servletContext)
+   {
+      super(servletContext);
+   }
+
+   @Override
+   protected void initialize(T bean)
+   {
+      VFSDeploymentUnitVDFConnector connector = new VFSDeploymentUnitVDFConnector(getServletContext());
+      if (connector.isValid() == false)
+         throw new IllegalArgumentException("No deployment unit.");
+
+      bean.setDeploymentUnit(connector.getUtility());
+   }
+}
\ No newline at end of file

Copied: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryVDFConnector.java (from rev 84542, projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryVDFConnector.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryVDFConnector.java	                        (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanFactoryVDFConnector.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -0,0 +1,74 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.seam.integration.jbossas.vdf;
+
+import javax.servlet.ServletContext;
+
+import org.jboss.beans.metadata.spi.factory.BeanFactory;
+
+/**
+ * AbstractBeanFactoryTypeVDFConnector.
+ *
+ * @param <T> exact bean type
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractBeanFactoryVDFConnector<T> extends AbstractBeanVDFConnector<T, BeanFactory>
+{
+   protected AbstractBeanFactoryVDFConnector(ServletContext servletContext)
+   {
+      super(servletContext);
+   }
+
+   protected Class<BeanFactory> getBeanType()
+   {
+      return BeanFactory.class;
+   }
+
+   @Override
+   protected T unwrap(BeanFactory factory)
+   {
+      try
+      {
+         Object bean = factory.createBean();
+         Class<T> type = getUnwrappedType();
+         if (type.isInstance(bean) == false)
+            throw new IllegalArgumentException("Bean " + bean + " is not instance of " + type);
+
+         T result = type.cast(bean);
+         initialize(result);
+         return result;
+      }
+      catch (Throwable t)
+      {
+         throw new RuntimeException(t);
+      }
+   }
+
+   /**
+    * Initialize the bean.
+    *
+    * @param bean the bean to initalize
+    */
+   protected void initialize(T bean)
+   {
+   }
+}
\ No newline at end of file

Copied: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanTypeVDFConnector.java (from rev 84542, projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanTypeVDFConnector.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanTypeVDFConnector.java	                        (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanTypeVDFConnector.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.seam.integration.jbossas.vdf;
+
+import javax.servlet.ServletContext;
+
+/**
+ * AbstractBeanTypeVDFConnector.
+ *
+ * @param <T> exact bean type
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractBeanTypeVDFConnector<T> extends SimpleBeanVDFConnector<T>
+{
+   protected AbstractBeanTypeVDFConnector(ServletContext servletContext)
+   {
+      super(servletContext);
+   }
+
+   protected Object getBeanKey()
+   {
+      return getBeanType();
+   }
+}
\ No newline at end of file

Copied: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanVDFConnector.java (from rev 84542, projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanVDFConnector.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanVDFConnector.java	                        (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractBeanVDFConnector.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -0,0 +1,136 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.seam.integration.jbossas.vdf;
+
+import javax.servlet.ServletContext;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
+import org.jboss.kernel.spi.dependency.KernelController;
+
+/**
+ * AbstractBeanVDFConnector.
+ *
+ * @param <U> exact unwrapped type
+ * @param <T> exact bean type
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractBeanVDFConnector<U, T> extends AbstractVDFConnector<U, Kernel>
+{
+   /** The bean state */
+   private ControllerState state;
+
+   public AbstractBeanVDFConnector(ServletContext servletContext)
+   {
+      super(servletContext);
+   }
+
+   protected Class<Kernel> getAttributeType()
+   {
+      return Kernel.class;
+   }
+
+   protected String getAttributeKey()
+   {
+      return KernelConstants.KERNEL_NAME;
+   }
+
+   /**
+    * Get bean key.
+    *
+    * @return the bean key
+    */
+   protected abstract Object getBeanKey();
+
+   /**
+    * The bean type.
+    *
+    * @return the bean type
+    */
+   protected abstract Class<T> getBeanType();
+
+   /**
+    * Get unwrapped type.
+    * e.g. bean might be bean factory
+    *
+    * @return the unwrapped type
+    */
+   protected abstract Class<U> getUnwrappedType();
+
+   /**
+    * Unwrap bean.
+    * Default impl just re-casts.
+    *
+    * @param bean the bean
+    * @return unwrapped bean
+    */
+   protected U unwrap(T bean)
+   {
+      Class<U> unwrappedType = getUnwrappedType();
+      if (unwrappedType.isInstance(bean) == false)
+         throw new IllegalArgumentException("Bean " + bean + " is not instance of " + unwrappedType);
+
+      return unwrappedType.cast(bean);
+   }
+
+   protected U getUtilityFromAttribute(Kernel kernel)
+   {
+      KernelController controller = kernel.getController();
+      ControllerContext context;
+      if (state == null)
+         context = controller.getContext(getBeanKey(), state);
+      else
+         context = controller.getInstalledContext(getBeanKey());
+
+      if (context == null)
+         return null;
+
+      Object target = context.getTarget();
+      Class<T> beanType = getBeanType();
+      if (beanType.isInstance(target) == false)
+         throw new IllegalArgumentException("Bean " + target + " is not instance of " + beanType);
+
+      return unwrap(beanType.cast(target));
+   }
+
+   /**
+    * Set the expected bean state.
+    *
+    * @param state the bean state
+    */
+   public void setState(ControllerState state)
+   {
+      this.state = state;
+   }
+
+   @Override
+   public String toString()
+   {
+      StringBuilder builder = new StringBuilder();
+      builder.append("bean=").append(getBeanKey());
+      if (state != null)
+         builder.append(", state=").append(state);
+      return builder.toString();
+   }
+}
\ No newline at end of file

Modified: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractVDFConnector.java
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractVDFConnector.java	2009-02-20 15:23:50 UTC (rev 84543)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/AbstractVDFConnector.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -43,6 +43,16 @@
    }
 
    /**
+    * Get servlet context.
+    *
+    * @return the servlet context
+    */
+   protected ServletContext getServletContext()
+   {
+      return servletContext;
+   }
+
+   /**
     * Get utility type.
     *
     * @return the utility type

Modified: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/FederatedAnnotationEnvironmentVDFConnector.java
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/FederatedAnnotationEnvironmentVDFConnector.java	2009-02-20 15:23:50 UTC (rev 84543)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/FederatedAnnotationEnvironmentVDFConnector.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -43,22 +43,28 @@
    protected List<AnnotationEnvironment> getUtilityFromAttribute(DeploymentUnit unit)
    {
       List<AnnotationEnvironment> list = new ArrayList<AnnotationEnvironment>();
-      DeploymentUnit parent = unit.getParent();
-      if (parent != null)
+      DeploymentUnit top = unit.getTopLevel();
+      findAllAnnotationEnvironments(top, list);
+      return list;
+   }
+
+   /**
+    * Find all anotation environments recursively.
+    *
+    * @param unit the current deployment unit
+    * @param list the holder list
+    */
+   protected void findAllAnnotationEnvironments(DeploymentUnit unit, List<AnnotationEnvironment> list)
+   {
+      applyAnnotationEnvironment(unit, list);
+      List<DeploymentUnit> children = unit.getChildren();
+      if (children != null && children.isEmpty() == false)
       {
-         applyAnnotationEnvironment(parent, list);
-         List<DeploymentUnit> children = parent.getChildren();
-         // cannot be null, since unit is its child
          for (DeploymentUnit child : children)
          {
-            applyAnnotationEnvironment(child, list);
+            findAllAnnotationEnvironments(child, list);
          }
       }
-      else
-      {
-         applyAnnotationEnvironment(unit, list);
-      }
-      return list;
    }
 
    /**

Copied: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/SimpleBeanVDFConnector.java (from rev 84542, projects/jboss-seam-int/trunk/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/SimpleBeanVDFConnector.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/SimpleBeanVDFConnector.java	                        (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/SimpleBeanVDFConnector.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.seam.integration.jbossas.vdf;
+
+import javax.servlet.ServletContext;
+
+/**
+ * AbstractBeanTypeVDFConnector.
+ *
+ * @param <T> exact bean type
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class SimpleBeanVDFConnector<T> extends AbstractBeanVDFConnector<T, T>
+{
+   protected SimpleBeanVDFConnector(ServletContext servletContext)
+   {
+      super(servletContext);
+   }
+
+   protected Class<T> getUnwrappedType()
+   {
+      return getBeanType();
+   }
+}
\ No newline at end of file

Modified: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java	2009-02-20 15:23:50 UTC (rev 84543)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -13,8 +13,7 @@
 import org.jboss.seam.log.Logging;
 import org.jboss.virtual.VFS;
 import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.spi.cache.VFSCache;
-import org.jboss.virtual.spi.cache.VFSCacheFactory;
+import org.jboss.virtual.spi.registry.VFSRegistry;
 
 /**
  * JBoss VFS aware scanner.
@@ -46,8 +45,8 @@
       log.trace("Root url: " + url);
 
       // try cache first, it should also have proper depth
-      VFSCache cache = VFSCacheFactory.getInstance();
-      VirtualFile vf = cache.getFile(url);
+      VFSRegistry registry = VFSRegistry.getInstance();
+      VirtualFile vf = registry.getFile(url);
       int depth = parentDepth;
       while (vf != null && depth > 0)
       {

Deleted: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamModificationTypeMatcher.java
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamModificationTypeMatcher.java	2009-02-20 15:23:50 UTC (rev 84543)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamModificationTypeMatcher.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.seam.integration.microcontainer.deployers;
-
-import org.jboss.deployers.vfs.plugins.structure.modify.TempTopModificationTypeMatcher;
-
-/**
- * Enable temp modification for Seam apps.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class SeamModificationTypeMatcher extends TempTopModificationTypeMatcher
-{
-   public SeamModificationTypeMatcher()
-   {
-      super(SeamConstants.SEAM_FILES);
-   }
-}

Copied: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamTempModificationTypeMatcher.java (from rev 84542, projects/jboss-seam-int/trunk/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamTempModificationTypeMatcher.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamTempModificationTypeMatcher.java	                        (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamTempModificationTypeMatcher.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.integration.microcontainer.deployers;
+
+import org.jboss.deployers.vfs.plugins.structure.modify.TempTopModificationTypeMatcher;
+
+/**
+ * Enable temp modification for Seam apps.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class SeamTempModificationTypeMatcher extends TempTopModificationTypeMatcher
+{
+   public SeamTempModificationTypeMatcher()
+   {
+      super(SeamConstants.SEAM_FILES);
+   }
+}
\ No newline at end of file

Copied: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUnjarModificationTypeMatcher.java (from rev 84542, projects/jboss-seam-int/trunk/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUnjarModificationTypeMatcher.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUnjarModificationTypeMatcher.java	                        (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUnjarModificationTypeMatcher.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.integration.microcontainer.deployers;
+
+import org.jboss.deployers.vfs.plugins.structure.modify.UnjarTopModificationTypeMatcher;
+
+/**
+ * Enable unjar modification for Seam apps.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class SeamUnjarModificationTypeMatcher extends UnjarTopModificationTypeMatcher
+{
+   public SeamUnjarModificationTypeMatcher()
+   {
+      super(SeamConstants.SEAM_FILES);
+   }
+}
\ No newline at end of file

Copied: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf (from rev 84542, projects/jboss-seam-int/trunk/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf)

Deleted: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java
===================================================================
--- projects/jboss-seam-int/trunk/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java	2009-02-20 15:20:54 UTC (rev 84542)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.seam.integration.microcontainer.vdf;
-
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * Deployment unit aware marker.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public interface DeploymentUnitAware
-{
-   /**
-    * Set the deployment unit.
-    *
-    * @param unit the deployment unit
-    */
-   void setDeploymentUnit(DeploymentUnit unit);
-}

Copied: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java (from rev 84542, projects/jboss-seam-int/trunk/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java	                        (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/vdf/DeploymentUnitAware.java	2009-02-20 15:26:16 UTC (rev 84544)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.integration.microcontainer.vdf;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * Deployment unit aware marker.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public interface DeploymentUnitAware
+{
+   /**
+    * Set the deployment unit.
+    *
+    * @param unit the deployment unit
+    */
+   void setDeploymentUnit(DeploymentUnit unit);
+}




More information about the jboss-cvs-commits mailing list