[jboss-cvs] JBossAS SVN: r69115 - in trunk: ejb3/src/main/org/jboss/ejb3/embedded and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 18 11:29:44 EST 2008
Author: alesj
Date: 2008-01-18 11:29:43 -0500 (Fri, 18 Jan 2008)
New Revision: 69115
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java
trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplate.java
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java
trunk/server/src/main/org/jboss/deployment/EARStructure.java
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingTestCase.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/VFSDirContext.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/jasper/TagLibCache.java
Log:
VFS change usage from findChild to getChild.
Perhaps EARStructure should not handle IOE exceptions via log, throwing them fwd.
Modified: trunk/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java 2008-01-18 16:29:43 UTC (rev 69115)
@@ -244,7 +244,7 @@
{
try
{
- return vfsRoot.findChild(path);
+ return vfsRoot.getChild(path);
}
catch (IOException e)
{
Modified: trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java 2008-01-18 16:29:43 UTC (rev 69115)
@@ -250,7 +250,7 @@
{
try
{
- return vfsRoot.findChild(path);
+ return vfsRoot.getChild(path);
}
catch (IOException e)
{
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplate.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplate.java 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplate.java 2008-01-18 16:29:43 UTC (rev 69115)
@@ -68,8 +68,7 @@
URI dsXmlURI = new URI(root.toURI()+dsName);
File dsXml = new File(dsXmlURI.getPath());
writeTemplate(dsXml, values);
- VirtualFile dsXmlVF = root.findChild(dsName);
- return dsXmlVF;
+ return root.findChild(dsName);
}
/**
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java 2008-01-18 16:29:43 UTC (rev 69115)
@@ -89,8 +89,7 @@
URI dsXmlURI = new URI(root.toURI()+dsName);
File dsXml = new File(dsXmlURI.getPath());
writeTemplate(dsXml, values);
- VirtualFile dsXmlVF = root.findChild(dsName);
- return dsXmlVF;
+ return root.findChild(dsName);
}
/**
* Update the ctx with the metadata values that correspond to the
Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java 2008-01-18 16:29:43 UTC (rev 69115)
@@ -183,7 +183,7 @@
log.trace("Checking for ear lib directory: "+libDir);
try
{
- lib = file.findChild(libDir);
+ lib = file.getChild(libDir);
if (lib != null)
{
if(trace)
@@ -195,7 +195,7 @@
try
{
// add any jars with persistence.xml as a deployment
- if (archive.findChild("META-INF/persistence.xml") != null)
+ if (archive.getChild("META-INF/persistence.xml") != null)
{
log.trace(archive.getName() + " in ear lib directory has persistence units");
if (deployers.determineStructure(root, file, archive, metaData) == false)
@@ -205,21 +205,22 @@
+ file.getName());
}
}
+ else if (trace)
+ log.trace(archive.getPathName() + " does not contain META-INF/persistence.xml");
+
}
catch(IOException e)
{
- // META-INF/persistence.xml does not exist
- if(trace)
- log.trace(archive.getPathName()+" does not contain META-INF/persistence.xml");
+ log.warn("Exception searching for META-INF/persistence.xml in " + archive.getPathName() + ", " + e);
}
}
}
+ else if (trace)
+ log.trace("No lib directory in ear archive.");
}
- catch (IOException ignored)
+ catch (IOException e)
{
- // lib directory does not exist
- if(trace)
- log.trace("Ignoring exception while searching for lib dir", ignored);
+ log.warn("Exception while searching for lib dir: " + e);
}
// Add the ear manifest locations?
@@ -245,7 +246,7 @@
try
{
- VirtualFile module = file.findChild(fileName);
+ VirtualFile module = file.getChild(fileName);
if (module == null)
{
throw new RuntimeException(fileName + " module listed in application.xml does not exist within .ear " + file.getName());
@@ -258,9 +259,9 @@
+ file.getName());
}
}
- catch (IOException ignored)
+ catch (IOException e)
{
- throw new RuntimeException(fileName + " module listed in application.xml does not exist within .ear " + file.getName(), ignored);
+ throw new RuntimeException("Exception looking for " + fileName + " module listed in application.xml, .ear " + file.getName(), e);
}
}
}
@@ -409,7 +410,7 @@
VirtualFile metaFile = null;
try
{
- metaFile = file.findChild(path);
+ metaFile = file.getChild(path);
}
catch(IOException e)
{
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/testsuite/build.xml 2008-01-18 16:29:43 UTC (rev 69115)
@@ -2669,6 +2669,7 @@
<sysproperty key="javax.net.ssl.trustStore"
value="${build.resources}/security/tst.keystore"/>
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+ <!-- <sysproperty key="jboss.vfs.forceNoCopy" value="true"/> -->
<classpath>
<pathelement location="${build.classes}"/>
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingTestCase.java 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingTestCase.java 2008-01-18 16:29:43 UTC (rev 69115)
@@ -162,7 +162,7 @@
public void testVFSPolicy() throws Exception
{
VirtualFile vf = getRoot(false);
- VirtualFile child = vf.findChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-debug.jar");
+ VirtualFile child = vf.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-debug.jar");
assertNotNull(child);
VirtualFile[] roots = {child};
ClassLoaderPolicy policy = new VFSClassLoaderPolicy(roots);
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/VFSDirContext.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/VFSDirContext.java 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/VFSDirContext.java 2008-01-18 16:29:43 UTC (rev 69115)
@@ -768,7 +768,7 @@
for (int i = 0; i < name.size(); i++) {
if (name.get(i).length() == 0)
continue;
- currentFile = currentFile.findChild(name.get(i));
+ currentFile = currentFile.getChild(name.get(i));
if (currentFile == null)
return null;
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/jasper/TagLibCache.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/jasper/TagLibCache.java 2008-01-18 16:28:41 UTC (rev 69114)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/jasper/TagLibCache.java 2008-01-18 16:29:43 UTC (rev 69115)
@@ -15,28 +15,28 @@
*/
package org.jboss.web.tomcat.service.jasper;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-import java.io.InputStream;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
import javax.servlet.ServletContext;
-import java.util.Map; // SYNC
+import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.compiler.Localizer;
import org.apache.jasper.compiler.TldLocationsCache;
-import org.apache.jasper.compiler.Localizer;
-import org.apache.jasper.JasperException;
-import org.apache.jasper.Constants;
+import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
-import org.apache.jasper.xmlparser.ParserUtils;
import org.jboss.logging.Logger;
/**
More information about the jboss-cvs-commits
mailing list