[jboss-svn-commits] JBL Code SVN: r10316 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/listeners/config and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Mar 18 17:47:39 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-03-18 17:47:39 -0400 (Sun, 18 Mar 2007)
New Revision: 10316
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Configuration.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/src/quickstart/HsqldbUtil.java
Log:
Change lookup of resources
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java 2007-03-18 21:43:30 UTC (rev 10315)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java 2007-03-18 21:47:39 UTC (rev 10316)
@@ -24,6 +24,7 @@
import groovy.util.GroovyScriptEngine;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.util.ClassUtil;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.actions.ActionPipelineProcessor;
import org.jboss.soa.esb.actions.ActionLifecycleException;
@@ -91,7 +92,7 @@
scriptStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptName);
if(scriptStream == null) {
- scriptStream = getClass().getResourceAsStream(scriptName);
+ scriptStream = ClassUtil.getResourceAsStream(scriptName, getClass());
}
return scriptStream;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Configuration.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Configuration.java 2007-03-18 21:43:30 UTC (rev 10315)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Configuration.java 2007-03-18 21:47:39 UTC (rev 10316)
@@ -26,6 +26,7 @@
import org.jboss.soa.esb.listeners.LifecycleUtil;
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycle;
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
+import org.jboss.soa.esb.util.ClassUtil;
import org.xml.sax.InputSource;
import javax.xml.transform.stream.StreamSource;
@@ -69,7 +70,7 @@
public static ManagedLifecycleController create(String configXml)
{
- InputStream validationInputStream = Configuration.class.getResourceAsStream(JBOSSESB_XSD);
+ InputStream validationInputStream = ClassUtil.getResourceAsStream(JBOSSESB_XSD, Configuration.class);
//if this fails try using the
if (validationInputStream == null)
{
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java 2007-03-18 21:43:30 UTC (rev 10315)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java 2007-03-18 21:47:39 UTC (rev 10316)
@@ -43,6 +43,7 @@
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycle;
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
import org.jboss.soa.esb.parameters.ParamRepositoryFactory;
+import org.jboss.soa.esb.util.ClassUtil;
import org.xml.sax.InputSource;
/**
* The controller monitors changes in the jbossesb configuration file call jbossesb.xml. When
@@ -273,7 +274,7 @@
if (isReloadNeeded()) {
try {
StreamSource validationInputSource=null;
- InputStream validationInputStream = this.getClass().getResourceAsStream(mValidationFileName);
+ InputStream validationInputStream = ClassUtil.getResourceAsStream(mValidationFileName, getClass());
//if this fails try using the
if (validationInputStream==null) {
File validationFile = new File(mValidationFileName);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java 2007-03-18 21:43:30 UTC (rev 10315)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java 2007-03-18 21:47:39 UTC (rev 10316)
@@ -39,6 +39,7 @@
import javax.xml.validation.SchemaFactory;
import org.apache.log4j.Logger;
+import org.jboss.soa.esb.util.ClassUtil;
import org.w3c.dom.Document;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
@@ -103,7 +104,7 @@
public boolean validate(InputSource xmlSource) throws XmlValidatorException {
StreamSource validationInputSource = null;
- InputStream validationInputStream = this.getClass().getResourceAsStream(defaultSchema);
+ InputStream validationInputStream = ClassUtil.getResourceAsStream(defaultSchema, getClass());
// if this fails try using the
if (validationInputStream==null) {
File validationFile = new File(defaultSchema);
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java 2007-03-18 21:43:30 UTC (rev 10315)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java 2007-03-18 21:47:39 UTC (rev 10316)
@@ -43,6 +43,7 @@
import org.jboss.soa.esb.services.routing.MessageRouterException;
import org.jboss.soa.esb.services.routing.cbr.CBRException;
import org.jboss.soa.esb.services.routing.cbr.ContentBasedRouter;
+import org.jboss.soa.esb.util.ClassUtil;
/**
* The Implementation of a rule based Content Router. Here we use JBossRules. We
@@ -158,8 +159,7 @@
{
// read in the rules
logger.debug("Going to read the rule: " + rulesFile);
- InputStream inputStreamDrl = JBossRulesRouter.class
- .getResourceAsStream("/" + rulesFile);
+ InputStream inputStreamDrl = ClassUtil.getResourceAsStream("/" + rulesFile, JBossRulesRouter.class);
if (inputStreamDrl == null)
{
logger.error("Could not find rulesFile: " + rulesFile);
@@ -179,8 +179,7 @@
else
{
logger.debug("Going to read the language: " + ruleLanguage);
- InputStream inputStreamDsl = JBossRulesRouter.class
- .getResourceAsStream("/" + ruleLanguage);
+ InputStream inputStreamDsl = ClassUtil.getResourceAsStream("/" + ruleLanguage, JBossRulesRouter.class);
if (inputStreamDsl == null)
{
logger.error("Could not find ruleLanguage: " + rulesFile);
@@ -213,8 +212,7 @@
throws IOException
{
logger.debug("Going to hash the rule: " + rulesFile);
- InputStream inputStreamDrl = JBossRulesRouter.class
- .getResourceAsStream("/" + rulesFile);
+ InputStream inputStreamDrl = ClassUtil.getResourceAsStream("/" + rulesFile, JBossRulesRouter.class);
if (inputStreamDrl == null)
{
logger.error("Could not find rulesFile: " + rulesFile);
@@ -227,8 +225,7 @@
if (ruleLanguage != null)
{
logger.debug("Going to hash the language: " + ruleLanguage);
- InputStream inputStreamDsl = JBossRulesRouter.class
- .getResourceAsStream("/" + ruleLanguage);
+ InputStream inputStreamDsl = ClassUtil.getResourceAsStream("/" + ruleLanguage, JBossRulesRouter.class);
if (inputStreamDrl == null)
{
logger.error("Could not find language: " + ruleLanguage);
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/src/quickstart/HsqldbUtil.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/src/quickstart/HsqldbUtil.java 2007-03-18 21:43:30 UTC (rev 10315)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/src/quickstart/HsqldbUtil.java 2007-03-18 21:47:39 UTC (rev 10316)
@@ -29,6 +29,7 @@
import org.jboss.internal.soa.esb.persistence.format.db.DBConnectionManager;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.testutils.FileUtil;
+import org.jboss.soa.esb.util.ClassUtil;
/**
* Utility to start and stop a hsql Database.
@@ -97,8 +98,8 @@
private static void createDatabase() throws Exception{
//message store db
- String sqlCreateCmd = FileUtil.readStream(HsqldbUtil.class.getResourceAsStream("/install/message-store/sql/hsqldb/create_database.sql"));
- String sqlDropCmd = FileUtil.readStream(HsqldbUtil.class.getResourceAsStream("/install/message-store/sql/hsqldb/drop_database.sql"));
+ String sqlCreateCmd = FileUtil.readStream(ClassUtil.getResourceAsStream("/install/message-store/sql/hsqldb/create_database.sql", HsqldbUtil.class));
+ String sqlDropCmd = FileUtil.readStream(ClassUtil.getResourceAsStream("/install/message-store/sql/hsqldb/drop_database.sql", HsqldbUtil.class));
DBConnectionManager mgr = DBConnectionManager.getInstance();
Connection con = mgr.getConnection();
@@ -111,13 +112,13 @@
//registry DB
System.out.println("Dropping the registry schema if exists...");
- sqlDropCmd = FileUtil.readStream(HsqldbUtil.class.getResourceAsStream("/install/jUDDI-registry/sql/hsqldb/drop_database.sql"));
+ sqlDropCmd = FileUtil.readStream(ClassUtil.getResourceAsStream("/install/jUDDI-registry/sql/hsqldb/drop_database.sql", HsqldbUtil.class));
stmnt.execute(sqlDropCmd);
System.out.println("creating the registry schema...");
- sqlCreateCmd = FileUtil.readStream(HsqldbUtil.class.getResourceAsStream("/install/jUDDI-registry/sql/hsqldb/create_database.sql"));
+ sqlCreateCmd = FileUtil.readStream(ClassUtil.getResourceAsStream("/install/jUDDI-registry/sql/hsqldb/create_database.sql", HsqldbUtil.class));
stmnt.execute(sqlCreateCmd);
System.out.println("inserting registry publishers...");
- String sqlInsertPubCmd = FileUtil.readStream(HsqldbUtil.class.getResourceAsStream("/install/jUDDI-registry/sql/hsqldb/insert_publishers.sql"));
+ String sqlInsertPubCmd = FileUtil.readStream(ClassUtil.getResourceAsStream("/install/jUDDI-registry/sql/hsqldb/insert_publishers.sql", HsqldbUtil.class));
stmnt.execute(sqlInsertPubCmd);
stmnt.close();
con.close();
More information about the jboss-svn-commits
mailing list