[jboss-cvs] jboss-seam/src/main/org/jboss/seam/init ...
Gavin King
gavin.king at jboss.com
Wed Jun 20 22:56:17 EDT 2007
User: gavin
Date: 07/06/20 22:56:17
Modified: src/main/org/jboss/seam/init DeploymentDescriptor.java
Initialization.java
Log:
non-faces specific resource loading
Revision Changes Path
1.3 +6 -3 jboss-seam/src/main/org/jboss/seam/init/DeploymentDescriptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DeploymentDescriptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/DeploymentDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DeploymentDescriptor.java 21 Jun 2007 02:34:48 -0000 1.2
+++ DeploymentDescriptor.java 21 Jun 2007 02:56:16 -0000 1.3
@@ -32,17 +32,20 @@
}
catch (DocumentException e)
{
- log.warn("Couldn't parse /META-INF/ejb-jar.xml for component types " + e.getMessage());
+ log.warn("Couldn't parse META-INF/ejb-jar.xml for component types " + e.getMessage());
}
try
{
InputStream ormXml = clazz.getClassLoader().getResourceAsStream("META-INF/orm.xml");
+ if (ormXml!=null)
+ {
parseOrmXml( XML.getRootElement(ormXml) );
}
+ }
catch (DocumentException e)
{
- log.warn("Couldn't parse /META-INF/orm.xml for component types " + e.getMessage());
+ log.warn("Couldn't parse META-INF/orm.xml for component types " + e.getMessage());
}
}
1.181 +2 -1 jboss-seam/src/main/org/jboss/seam/init/Initialization.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Initialization.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- Initialization.java 21 Jun 2007 02:29:39 -0000 1.180
+++ Initialization.java 21 Jun 2007 02:56:16 -0000 1.181
@@ -139,7 +139,8 @@
try
{
Properties replacements = new Properties();
- InputStream replaceStream = Resources.getResourceAsStream("components.properties");
+ InputStream replaceStream = Thread.currentThread().getContextClassLoader()
+ .getResourceAsStream("components.properties");
if (replaceStream != null) replacements.load(replaceStream);
return replacements;
}
More information about the jboss-cvs-commits
mailing list