[jboss-cvs] JBossAS SVN: r77185 - in projects/jboss-seam-int/trunk: jbossas/src/main/META-INF and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 19 05:35:19 EDT 2008
Author: alesj
Date: 2008-08-19 05:35:19 -0400 (Tue, 19 Aug 2008)
New Revision: 77185
Added:
projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/vfs/
projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java
projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamWebUrlIntegrationDeployer.java
Removed:
projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/VFSScanner.java
Modified:
projects/jboss-seam-int/trunk/build/pom.xml
projects/jboss-seam-int/trunk/jbossas/src/main/META-INF/seam-deployment.properties
projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java
Log:
Fix top pom.
Abstract integration deployer.
Modified: projects/jboss-seam-int/trunk/build/pom.xml
===================================================================
--- projects/jboss-seam-int/trunk/build/pom.xml 2008-08-19 07:23:19 UTC (rev 77184)
+++ projects/jboss-seam-int/trunk/build/pom.xml 2008-08-19 09:35:19 UTC (rev 77185)
@@ -19,14 +19,15 @@
</scm>
<properties>
- <version.jboss.man>2.0.0.Beta12</version.jboss.man>
- <version.jboss.microcontainer>2.0.0-SNAPSHOT</version.jboss.microcontainer>
- <version.jboss.deployers>2.0.0-SNAPSHOT</version.jboss.deployers>
+ <version.jboss.seam>2.0.3.CR1</version.jboss.seam>
+ <version.jboss.man>2.0.0.Beta13</version.jboss.man>
+ <version.jboss.microcontainer>2.0.0.Beta17</version.jboss.microcontainer>
+ <version.jboss.deployers>2.0.0.Beta20</version.jboss.deployers>
<version.jboss.common.core>2.2.5.GA</version.jboss.common.core>
<version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
<version.jboss.classloading.spi>5.0.0.Beta4</version.jboss.classloading.spi>
- <version.jboss.vfs>2.0.0.Beta20</version.jboss.vfs>
- <version.jboss.metadata>1.0.0.Beta29</version.jboss.metadata>
+ <version.jboss.vfs>2.0.0.Beta21</version.jboss.vfs>
+ <version.jboss.metadata>1.0.0.Beta35</version.jboss.metadata>
<version.jbossxb>2.0.0.CR8</version.jbossxb>
<version.org.jboss.test>1.1.0.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
@@ -302,6 +303,12 @@
<version>${version.jboss.metadata}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${version.jboss.seam}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.jboss.test</groupId>
Modified: projects/jboss-seam-int/trunk/jbossas/src/main/META-INF/seam-deployment.properties
===================================================================
--- projects/jboss-seam-int/trunk/jbossas/src/main/META-INF/seam-deployment.properties 2008-08-19 07:23:19 UTC (rev 77184)
+++ projects/jboss-seam-int/trunk/jbossas/src/main/META-INF/seam-deployment.properties 2008-08-19 09:35:19 UTC (rev 77185)
@@ -1 +1 @@
-org.jboss.seam.deployment.scanners=org.jboss.seam.integration.jbossas.VFSScanner
\ No newline at end of file
+org.jboss.seam.deployment.scanners=org.jboss.seam.integration.jbossas.vfs.VFSScanner
\ No newline at end of file
Deleted: projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/VFSScanner.java
===================================================================
--- projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/VFSScanner.java 2008-08-19 07:23:19 UTC (rev 77184)
+++ projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/VFSScanner.java 2008-08-19 09:35:19 UTC (rev 77185)
@@ -1,171 +0,0 @@
-package org.jboss.seam.integration.jbossas;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.jboss.seam.deployment.AbstractScanner;
-import org.jboss.seam.deployment.DeploymentStrategy;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * JBoss VSF aware scanner.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class VFSScanner extends AbstractScanner
-{
- private static final LogProvider log = Logging.getLogProvider(VFSScanner.class);
-
- public VFSScanner(DeploymentStrategy deploymentStrategy)
- {
- super(deploymentStrategy);
- }
-
- /**
- * Get the virtual file root.
- *
- * @param url the root URL
- * @param parentDepth level of parent depth
- * @return actual virtual file from url param
- * @throws IOException for any error
- */
- protected static VirtualFile getRoot(URL url, int parentDepth) throws IOException
- {
-
- log.trace("Root url: " + url);
-
- String urlString = url.toString();
- // TODO - this should go away once we figure out why -exp.war is part of CL resources
- if (urlString.startsWith("vfs") == false)
- return null;
-
- int p = urlString.indexOf(":");
- String file = urlString.substring(p + 1);
- URL vfsurl = null;
- String relative;
- File fp = new File(file);
-
- log.trace("File: " + fp);
-
- if (fp.exists())
- {
- vfsurl = fp.getParentFile().toURL();
- relative = fp.getName();
- }
- else
- {
- File curr = fp;
- relative = fp.getName();
- while ((curr = curr.getParentFile()) != null)
- {
- if (curr.exists())
- {
- vfsurl = curr.toURL();
- break;
- }
- else
- {
- relative = curr.getName() + "/" + relative;
- }
- }
- }
-
- log.trace("URL: " + vfsurl + ", relative: " + relative);
-
- VirtualFile top = VFS.getRoot(vfsurl);
- top = top.getChild(relative);
- while(parentDepth > 0)
- {
- if (top == null)
- throw new IllegalArgumentException("Null parent: " + vfsurl + ", relative: " + relative);
- top = top.getParent();
- parentDepth--;
- }
-
- log.trace("Top: " + top);
-
- return top;
- }
-
- public void scanDirectories(File[] directories)
- {
- for (File dir : directories)
- {
- try
- {
- VirtualFile root = getRoot(dir.toURL(), 0);
- if (root != null)
- handleRoot(root);
- else
- log.trace("Null root: " + dir);
- }
- catch (IOException e)
- {
- log.warn("Cannot scan directory " + dir, e);
- }
- }
- }
-
- public void scanResources(String[] resources)
- {
- for (String resourceName : resources)
- {
- try
- {
- Enumeration<URL> urlEnum = getDeploymentStrategy().getClassLoader().getResources(resourceName);
- while (urlEnum.hasMoreElements())
- {
- URL url = urlEnum.nextElement();
- VirtualFile root = getRoot(url, resourceName.lastIndexOf('/') > 0 ? 2 : 1);
- if (root != null)
- handleRoot(root);
- else
- log.trace("Null root: " + url);
- }
- }
- catch (IOException ioe)
- {
- log.warn("Cannot read resource: " + resourceName, ioe);
- }
- }
- }
-
- /**
- * Handle virtual file root.
- *
- * @param root the virtual file root
- * @throws IOException for any error
- */
- protected void handleRoot(VirtualFile root) throws IOException
- {
- if (root.isLeaf())
- {
- getDeploymentStrategy().handle(root.getPathName());
- }
- else
- {
- String rootPathName = root.getPathName();
- int rootPathNameLength = rootPathName.length();
- List<VirtualFile> children = root.getChildrenRecursively();
- for (VirtualFile child : children)
- {
- if (child.isLeaf())
- {
- String name = child.getPathName();
- // move past '/'
- int length = rootPathNameLength;
- if (name.charAt(length) == '/')
- length++;
- getDeploymentStrategy().handle(name.substring(length));
- }
- }
- }
- }
-}
Copied: projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java (from rev 77184, projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/VFSScanner.java)
===================================================================
--- projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java (rev 0)
+++ projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java 2008-08-19 09:35:19 UTC (rev 77185)
@@ -0,0 +1,170 @@
+package org.jboss.seam.integration.jbossas.vfs;
+
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.List;
+
+import org.jboss.seam.deployment.AbstractScanner;
+import org.jboss.seam.deployment.DeploymentStrategy;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * JBoss VSF aware scanner.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class VFSScanner extends AbstractScanner
+{
+ private static final LogProvider log = Logging.getLogProvider(VFSScanner.class);
+
+ public VFSScanner(DeploymentStrategy deploymentStrategy)
+ {
+ super(deploymentStrategy);
+ }
+
+ /**
+ * Get the virtual file root.
+ *
+ * @param url the root URL
+ * @param parentDepth level of parent depth
+ * @return actual virtual file from url param
+ * @throws IOException for any error
+ */
+ protected static VirtualFile getRoot(URL url, int parentDepth) throws IOException
+ {
+ log.trace("Root url: " + url);
+
+ String urlString = url.toString();
+ // TODO - this should go away once we figure out why -exp.war is part of CL resources
+ if (urlString.startsWith("vfs") == false)
+ return null;
+
+ int p = urlString.indexOf(":");
+ String file = urlString.substring(p + 1);
+ URL vfsurl = null;
+ String relative;
+ File fp = new File(file);
+
+ log.trace("File: " + fp);
+
+ if (fp.exists())
+ {
+ vfsurl = fp.getParentFile().toURL();
+ relative = fp.getName();
+ }
+ else
+ {
+ File curr = fp;
+ relative = fp.getName();
+ while ((curr = curr.getParentFile()) != null)
+ {
+ if (curr.exists())
+ {
+ vfsurl = curr.toURL();
+ break;
+ }
+ else
+ {
+ relative = curr.getName() + "/" + relative;
+ }
+ }
+ }
+
+ log.trace("URL: " + vfsurl + ", relative: " + relative);
+
+ VirtualFile top = VFS.getRoot(vfsurl);
+ top = top.getChild(relative);
+ while(parentDepth > 0)
+ {
+ if (top == null)
+ throw new IllegalArgumentException("Null parent: " + vfsurl + ", relative: " + relative);
+ top = top.getParent();
+ parentDepth--;
+ }
+
+ log.trace("Top: " + top);
+
+ return top;
+ }
+
+ public void scanDirectories(File[] directories)
+ {
+ for (File dir : directories)
+ {
+ try
+ {
+ VirtualFile root = getRoot(dir.toURL(), 0);
+ if (root != null)
+ handleRoot(root);
+ else
+ log.trace("Null root: " + dir);
+ }
+ catch (IOException e)
+ {
+ log.warn("Cannot scan directory " + dir, e);
+ }
+ }
+ }
+
+ public void scanResources(String[] resources)
+ {
+ for (String resourceName : resources)
+ {
+ try
+ {
+ Enumeration<URL> urlEnum = getDeploymentStrategy().getClassLoader().getResources(resourceName);
+ while (urlEnum.hasMoreElements())
+ {
+ URL url = urlEnum.nextElement();
+ VirtualFile root = getRoot(url, resourceName.lastIndexOf('/') > 0 ? 2 : 1);
+ if (root != null)
+ handleRoot(root);
+ else
+ log.trace("Null root: " + url);
+ }
+ }
+ catch (IOException ioe)
+ {
+ log.warn("Cannot read resource: " + resourceName, ioe);
+ }
+ }
+ }
+
+ /**
+ * Handle virtual file root.
+ *
+ * @param root the virtual file root
+ * @throws IOException for any error
+ */
+ protected void handleRoot(VirtualFile root) throws IOException
+ {
+ if (root.isLeaf())
+ {
+ getDeploymentStrategy().handle(root.getPathName());
+ }
+ else
+ {
+ String rootPathName = root.getPathName();
+ int rootPathNameLength = rootPathName.length();
+ List<VirtualFile> children = root.getChildrenRecursively();
+ for (VirtualFile child : children)
+ {
+ if (child.isLeaf())
+ {
+ String name = child.getPathName();
+ // move past '/'
+ int length = rootPathNameLength;
+ if (name.charAt(length) == '/')
+ length++;
+ getDeploymentStrategy().handle(name.substring(length));
+ }
+ }
+ }
+ }
+}
Property changes on: projects/jboss-seam-int/trunk/jbossas/src/main/org/jboss/seam/integration/jbossas/vfs/VFSScanner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java
===================================================================
--- projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java 2008-08-19 07:23:19 UTC (rev 77184)
+++ projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java 2008-08-19 09:35:19 UTC (rev 77185)
@@ -21,24 +21,23 @@
*/
package org.jboss.seam.integration.microcontainer.deployers;
+import java.net.MalformedURLException;
import java.net.URL;
-import java.net.MalformedURLException;
import org.jboss.deployers.vfs.plugins.classloader.PathUrlIntegrationDeployer;
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.util.StringPropertyReplacer;
/**
* Seam integration deployer.
*
+ * @param <T> exact input type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class SeamUrlIntegrationDeployer extends PathUrlIntegrationDeployer<JBossWebMetaData>
+public abstract class SeamUrlIntegrationDeployer<T> extends PathUrlIntegrationDeployer<T>
{
- public SeamUrlIntegrationDeployer()
+ protected SeamUrlIntegrationDeployer(Class<T> input)
{
- // we only look at wars
- super(JBossWebMetaData.class);
+ super(input);
setIntegrationURL(getURL());
setFiles(new String[]{"seam.properties", "META-INF/seam.properties", "META-INF/components.xml"});
}
@@ -52,8 +51,10 @@
{
try
{
- String url = "${jboss.home.url}/integration/seam/jboss-seam-int-jbossas.jar";
+ String url = getJBossHome() + getIntegrationPath() + getIntegrationJar();
url = StringPropertyReplacer.replaceProperties(url);
+ if (log.isTraceEnabled())
+ log.trace("Seam integration url: " + url);
return new URL(url);
}
catch (MalformedURLException e)
@@ -61,4 +62,34 @@
throw new IllegalArgumentException("Unexpected error: " + e);
}
}
+
+ /**
+ * Get JBoss home.
+ *
+ * @return the jboss home location
+ */
+ protected String getJBossHome()
+ {
+ return "${jboss.home.url}/";
+ }
+
+ /**
+ * Get the integration path.
+ *
+ * @return the integration path
+ */
+ protected String getIntegrationPath()
+ {
+ return "integration/seam/";
+ }
+
+ /**
+ * Get the integration jar.
+ *
+ * @return the integration jar
+ */
+ protected String getIntegrationJar()
+ {
+ return "jboss-seam-int-jbossas.jar";
+ }
}
Copied: projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamWebUrlIntegrationDeployer.java (from rev 77184, projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamUrlIntegrationDeployer.java)
===================================================================
--- projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamWebUrlIntegrationDeployer.java (rev 0)
+++ projects/jboss-seam-int/trunk/microcontainer/src/main/org/jboss/seam/integration/microcontainer/deployers/SeamWebUrlIntegrationDeployer.java 2008-08-19 09:35:19 UTC (rev 77185)
@@ -0,0 +1,38 @@
+/*
+* 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.microcontainer.deployers;
+
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+
+/**
+ * Seam web integration deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SeamWebUrlIntegrationDeployer extends SeamUrlIntegrationDeployer<JBossWebMetaData>
+{
+ public SeamWebUrlIntegrationDeployer()
+ {
+ // we only look at wars
+ super(JBossWebMetaData.class);
+ }
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list