[jboss-cvs] JBossAS SVN: r83495 - in projects/jboss-seam-int/branches/Branch_5_0: jbossas and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 27 09:24:12 EST 2009
Author: alesj
Date: 2009-01-27 09:24:12 -0500 (Tue, 27 Jan 2009)
New Revision: 83495
Added:
projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamConstants.java
projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamModificationTypeMatcher.java
Modified:
projects/jboss-seam-int/branches/Branch_5_0/jbossas/pom.xml
projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/BaseAttachmentVDFConnector.java
projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/NamedAttachmentVDFConnector.java
projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java
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/microcontainer/pom.xml
projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java
projects/jboss-seam-int/branches/Branch_5_0/pom.xml
Log:
Update libs.
Add Seam modification type matcher.
Modified: projects/jboss-seam-int/branches/Branch_5_0/jbossas/pom.xml
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/pom.xml 2009-01-27 14:16:51 UTC (rev 83494)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/pom.xml 2009-01-27 14:24:12 UTC (rev 83495)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int</artifactId>
- <version>5.0.0.SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-seam-int-jbossas</artifactId>
Modified: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/BaseAttachmentVDFConnector.java
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/BaseAttachmentVDFConnector.java 2009-01-27 14:16:51 UTC (rev 83494)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/BaseAttachmentVDFConnector.java 2009-01-27 14:24:12 UTC (rev 83495)
@@ -34,6 +34,8 @@
*/
public abstract class BaseAttachmentVDFConnector<U> extends AttachmentVDFConnector<U>
{
+ private boolean allowHierarchyLookup;
+
protected BaseAttachmentVDFConnector(ServletContext servletContext)
{
super(servletContext);
@@ -48,6 +50,37 @@
protected U getUtilityFromAttribute(DeploymentUnit unit)
{
+ U utility = lookup(unit);
+ if (utility == null && allowHierarchyLookup)
+ {
+ DeploymentUnit parent = unit.getParent();
+ while(parent != null && utility == null)
+ {
+ utility = lookup(parent);
+ parent = parent.getParent();
+ }
+ }
+ return utility;
+ }
+
+ /**
+ * Do attachment lookup.
+ *
+ * @param unit the deployment unit
+ * @return the lookup result
+ */
+ protected U lookup(DeploymentUnit unit)
+ {
return unit.getAttachment(getAttachmentType());
}
+
+ /**
+ * Do we allow to do hierarchy attachment lookup on deployment unit.
+ *
+ * @param allowHierarchyLookup the allow hierarchy lookup flag
+ */
+ public void setAllowHierarchyLookup(boolean allowHierarchyLookup)
+ {
+ this.allowHierarchyLookup = allowHierarchyLookup;
+ }
}
\ 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/NamedAttachmentVDFConnector.java
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/NamedAttachmentVDFConnector.java 2009-01-27 14:16:51 UTC (rev 83494)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vdf/NamedAttachmentVDFConnector.java 2009-01-27 14:24:12 UTC (rev 83495)
@@ -45,7 +45,7 @@
*/
protected abstract String getAttchmentName();
- protected U getUtilityFromAttribute(DeploymentUnit unit)
+ protected U lookup(DeploymentUnit unit)
{
return unit.getAttachment(getAttchmentName(), getAttachmentType());
}
Modified: projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java 2009-01-27 14:16:51 UTC (rev 83494)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/CachingVFSScanner.java 2009-01-27 14:24:12 UTC (rev 83495)
@@ -37,7 +37,7 @@
log.trace("Root url: " + url);
// get the cached file directly, as we expect it to already be there
- VirtualFile top = VFS.getCachedFile(url);
+ VirtualFile top = VFS.getRoot(url);
while (parentDepth > 0)
{
if (top == null)
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-01-27 14:16:51 UTC (rev 83494)
+++ projects/jboss-seam-int/branches/Branch_5_0/jbossas/src/main/java/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java 2009-01-27 14:24:12 UTC (rev 83495)
@@ -92,7 +92,7 @@
log.trace("URL: " + vfsurl + ", relative: " + relative);
// no sense in checking cache, we already did that
- VirtualFile top = VFS.getRoot(vfsurl);
+ VirtualFile top = VFS.createNewRoot(vfsurl);
top = top.getChild(relative);
while (parentDepth > 0)
{
@@ -109,22 +109,8 @@
public void scanDirectories(File[] directories)
{
- scanDirectories(directories, new File[0]);
- }
-
- public void scanDirectories(File[] directories, File[] excludedDirectories)
- {
for (File dir : directories)
{
- for (File excludedDirectory : excludedDirectories)
- {
- if (dir.equals(excludedDirectory))
- {
- log.trace("skipping excluded directory: " + dir);
- continue;
- }
- }
-
try
{
VirtualFile root = getRoot(dir.toURL(), 0);
Modified: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/pom.xml
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/microcontainer/pom.xml 2009-01-27 14:16:51 UTC (rev 83494)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/pom.xml 2009-01-27 14:24:12 UTC (rev 83495)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int</artifactId>
- <version>5.0.0.SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-seam-int-microcontainer</artifactId>
Copied: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamConstants.java (from rev 83493, projects/jboss-seam-int/trunk/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamConstants.java)
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamConstants.java (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamConstants.java 2009-01-27 14:24:12 UTC (rev 83495)
@@ -0,0 +1,45 @@
+/*
+ * 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;
+
+/**
+ * Seam constants.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public interface SeamConstants
+{
+ public static final String SEAM_PROPERTIES = "seam.properties";
+ public static final String SEAM_PROPERTIES_META_INF = "META-INF/" + SEAM_PROPERTIES;
+ public static final String SEAM_PROPERTIES_WEB_INF = "WEB-INF/classes/" + SEAM_PROPERTIES;
+ public static final String SEAM_COMPONENTS = "components.xml";
+ public static final String SEAM_COMPONENTS_META_INF = "META-INF/" + SEAM_COMPONENTS;
+ public static final String SEAM_COMPONENTS_WEB_INF = "WEB-INF/classes/META-INF/" + SEAM_COMPONENTS;
+
+ public static final String[] SEAM_FILES = new String[]{
+ SEAM_PROPERTIES,
+ SEAM_PROPERTIES_META_INF,
+ SEAM_PROPERTIES_WEB_INF,
+ SEAM_COMPONENTS_META_INF,
+ SEAM_COMPONENTS_WEB_INF
+ };
+}
Copied: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamModificationTypeMatcher.java (from rev 83493, projects/jboss-seam-int/trunk/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 (rev 0)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamModificationTypeMatcher.java 2009-01-27 14:24:12 UTC (rev 83495)
@@ -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 SeamModificationTypeMatcher extends TempTopModificationTypeMatcher
+{
+ public SeamModificationTypeMatcher()
+ {
+ super(SeamConstants.SEAM_FILES);
+ }
+}
Modified: projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java 2009-01-27 14:16:51 UTC (rev 83494)
+++ projects/jboss-seam-int/branches/Branch_5_0/microcontainer/src/main/java/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java 2009-01-27 14:24:12 UTC (rev 83495)
@@ -39,13 +39,7 @@
{
super(input);
setIntegrationURL(getURL());
- setFiles(new String[]{
- "seam.properties",
- "META-INF/seam.properties",
- "WEB-INF/classes/seam.properties",
- "META-INF/components.xml",
- "WEB-INF/classes/META-INF/components.xml"}
- );
+ setFiles(SeamConstants.SEAM_FILES);
}
/**
Modified: projects/jboss-seam-int/branches/Branch_5_0/pom.xml
===================================================================
--- projects/jboss-seam-int/branches/Branch_5_0/pom.xml 2009-01-27 14:16:51 UTC (rev 83494)
+++ projects/jboss-seam-int/branches/Branch_5_0/pom.xml 2009-01-27 14:24:12 UTC (rev 83495)
@@ -15,9 +15,9 @@
JBoss ClassLoader Parent POM
</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-seam-int/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-seam-int/trunk/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-seam-int/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-seam-int/branches/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-seam-int/branches/</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-seam-int/branches/</url>
</scm>
<modules>
@@ -28,14 +28,14 @@
<properties>
<version.jboss.seam>2.1.0.GA</version.jboss.seam>
- <version.jboss.vfs>2.0.0.GA</version.jboss.vfs>
+ <version.jboss.vfs>2.0.1.GA</version.jboss.vfs>
<version.jboss.man>2.0.0.GA</version.jboss.man>
- <version.jboss.microcontainer>2.0.1.GA</version.jboss.microcontainer>
+ <version.jboss.microcontainer>2.0.3.GA</version.jboss.microcontainer>
<version.jboss.cl>2.0.0.GA</version.jboss.cl>
- <version.jboss.deployers>2.0.0.GA</version.jboss.deployers>
- <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
+ <version.jboss.deployers>2.0.4.GA</version.jboss.deployers>
+ <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
<version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
- <version.jboss.classloading.spi>5.0.0.CR2</version.jboss.classloading.spi>
+ <version.jboss.classloading.spi>5.0.3.GA</version.jboss.classloading.spi>
<version.jboss.metadata>1.0.0.CR7</version.jboss.metadata>
<version.jbossxb>2.0.0.GA</version.jbossxb>
<version.servlet.api>2.5</version.servlet.api>
More information about the jboss-cvs-commits
mailing list