User: starksm
Date: 01/11/25 19:24:52
Modified: src/main/org/jboss/resource ConnectionFactoryLoader.java
ConnectionManagerFactoryLoader.java
JBossConnectionListenerImpl.java
JBossResourceSubjectFactory.java RARDeployer.java
RARMetaData.java
Log:
Drop the org.jboss.ejb.DeploymentException in favor of the
org.jboss.deployment.DeploymentException class.
Use the org.jboss.logging.Logger.getLogger factory method.
Revision Changes Path
1.14 +5 -4 jbosscx/src/main/org/jboss/resource/ConnectionFactoryLoader.java
Index: ConnectionFactoryLoader.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/ConnectionFactoryLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ConnectionFactoryLoader.java 2001/11/12 06:36:49 1.13
+++ ConnectionFactoryLoader.java 2001/11/26 03:24:52 1.14
@@ -61,7 +61,7 @@
* @author <a href="[EMAIL PROTECTED]">Toby Allsopp</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
* @see RARDeployer
- * @version $Revision: 1.13 $ <p>
+ * @version $Revision: 1.14 $ <p>
*
* <b>Revisions:</b> <p>
*
@@ -393,7 +393,7 @@
{
//add the factory name to the log:
String name = getClass().getName() + "." + jndiName;
- log = Logger.create(name);
+ log = Logger.getLogger(name);
// If this factory has not already been loaded...
if (!cfs.containsKey(jndiName))
{
@@ -598,8 +598,9 @@
}
// Give it somewhere to tell people things
-
- PrintWriter logWriter = new
CategoryWriter(Logger.create(mcf.getClass().getName() + "." + jndiName));
+ String categoryName = mcf.getClass().getName() + "." + jndiName;
+ Logger log = Logger.getLogger(categoryName);
+ PrintWriter logWriter = new CategoryWriter(log.getCategory());
try
{
mcf.setLogWriter(logWriter);
1.9 +2 -2
jbosscx/src/main/org/jboss/resource/ConnectionManagerFactoryLoader.java
Index: ConnectionManagerFactoryLoader.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/ConnectionManagerFactoryLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConnectionManagerFactoryLoader.java 2001/11/12 06:36:49 1.8
+++ ConnectionManagerFactoryLoader.java 2001/11/26 03:24:52 1.9
@@ -36,7 +36,7 @@
*
* @author Toby Allsopp ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class ConnectionManagerFactoryLoader
extends ServiceMBeanSupport
@@ -217,7 +217,7 @@
throws Exception
{
String name = getClass().getName() + "." + factoryName;
- log = Logger.create(name);
+ log = Logger.getLogger(name);
Context ctx = new InitialContext();
Class cls = Class.forName(factoryClass);
1.5 +2 -2
jbosscx/src/main/org/jboss/resource/JBossConnectionListenerImpl.java
Index: JBossConnectionListenerImpl.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/JBossConnectionListenerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JBossConnectionListenerImpl.java 2001/09/11 18:38:58 1.4
+++ JBossConnectionListenerImpl.java 2001/11/26 03:24:52 1.5
@@ -19,7 +19,7 @@
* @author Toby Allsopp ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
* @see ConnectionManagerFactory
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class JBossConnectionListenerImpl
implements JBossConnectionListener
@@ -39,7 +39,7 @@
JBossConnectionListenerImpl(ManagedConnectionFactory mcf, String factoryName)
{
this.mcf = mcf;
- category = Logger.create(getClass().getName() + "." + factoryName);
+ category = Logger.getLogger(getClass().getName() + "." + factoryName);
}
// Public --------------------------------------------------------
1.5 +2 -2
jbosscx/src/main/org/jboss/resource/JBossResourceSubjectFactory.java
Index: JBossResourceSubjectFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/JBossResourceSubjectFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JBossResourceSubjectFactory.java 2001/09/11 18:38:58 1.4
+++ JBossResourceSubjectFactory.java 2001/11/26 03:24:52 1.5
@@ -25,7 +25,7 @@
*
* @author Toby Allsopp ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class JBossResourceSubjectFactory
implements ResourceSubjectFactory
@@ -33,7 +33,7 @@
// Static --------------------------------------------------------
- private static Logger category =
Logger.create("org.jboss.resource.JBossResourceSubjectFactory");
+ private static Logger category =
Logger.getLogger("org.jboss.resource.JBossResourceSubjectFactory");
private static Method getPrincipalMethod;
private final static Object[] noArgs = new Object[0];
1.14 +2 -10 jbosscx/src/main/org/jboss/resource/RARDeployer.java
Index: RARDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/RARDeployer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RARDeployer.java 2001/11/19 06:58:56 1.13
+++ RARDeployer.java 2001/11/26 03:24:52 1.14
@@ -49,7 +49,7 @@
*
* @author Toby Allsopp ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
-* @version $Revision: 1.13 $
+* @version $Revision: 1.14 $
* @see org.jboss.resource.ConnectionFactoryLoader <p>
*
* <b>Revisions:</b> <p>
@@ -162,15 +162,7 @@
"resource adapter at '" + url + "'");
}
- Document dd;
- try
- {
- dd = XmlFileLoader.getDocument(ddUrl);
- }
- catch (org.jboss.ejb.DeploymentException de)
- {
- throw new DeploymentException(de.getMessage(), de.getCause());
- }
+ Document dd = XmlFileLoader.getDocument(ddUrl);
Element root = dd.getDocumentElement();
1.12 +36 -65 jbosscx/src/main/org/jboss/resource/RARMetaData.java
Index: RARMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/RARMetaData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RARMetaData.java 2001/11/10 21:38:03 1.11
+++ RARMetaData.java 2001/11/26 03:24:52 1.12
@@ -25,10 +25,9 @@
*
* @author Toby Allsopp ([EMAIL PROTECTED])
* @see RARDeployer
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class RARMetaData
-// extends Y
implements XmlLoadable
{
public final static int TX_SUPPORT_NO = 0;
@@ -38,7 +37,7 @@
// Attributes ----------------------------------------------------
- private Logger category = Logger.create(RARMetaData.class);
+ private Logger category = Logger.getLogger(RARMetaData.class);
private ClassLoader classLoader;
@@ -278,61 +277,47 @@
private void setConfigProperty(Element element)
throws DeploymentException
{
- try
+ Element nameE = MetaData.getUniqueChild(element,
+ "config-property-name");
+ Element typeE = MetaData.getUniqueChild(element,
+ "config-property-type");
+ Element valueE = MetaData.getOptionalChild(element,
+ "config-property-value");
+ Element descE = MetaData.getOptionalChild(element,
+ "description");
+
+ Property p = new Property();
+ p.name = getElementContent(nameE);
+ p.type = getElementContent(typeE);
+ if (valueE != null)
{
- Element nameE = MetaData.getUniqueChild(element,
- "config-property-name");
- Element typeE = MetaData.getUniqueChild(element,
- "config-property-type");
- Element valueE = MetaData.getOptionalChild(element,
- "config-property-value");
- Element descE = MetaData.getOptionalChild(element,
- "description");
-
- Property p = new Property();
- p.name = getElementContent(nameE);
- p.type = getElementContent(typeE);
- if (valueE != null)
- {
- p.value = getElementContent(valueE);
- }
- if (descE != null)
- {
- p.desc = getElementContent(descE);
- }
-
- properties.put(p.name, p);
+ p.value = getElementContent(valueE);
}
- catch (org.jboss.ejb.DeploymentException de)
+ if (descE != null)
{
- throw new DeploymentException(de.getMessage(), de.getCause());
+ p.desc = getElementContent(descE);
}
+
+ properties.put(p.name, p);
}
private void setLicense(Element element)
throws DeploymentException
{
- try
+ Element requiredE = MetaData.getUniqueChild(element,
+ "license-required");
+ Element descriptionE = MetaData.getOptionalChild(element,
+ "description");
+ boolean required =
+ new Boolean(getElementContent(requiredE).trim()).booleanValue();
+ if (required)
{
- Element requiredE = MetaData.getUniqueChild(element,
- "license-required");
- Element descriptionE = MetaData.getOptionalChild(element,
- "description");
- boolean required =
- new Boolean(getElementContent(requiredE).trim()).booleanValue();
- if (required)
- {
- category.info("Required license terms present. See deployment " +
- "descriptor.");
- }
- else
- {
- category.info("License terms present. See deployment descriptor.");
- }
+ category.info("Required license terms present. See deployment " +
+ "descriptor.");
}
- catch (org.jboss.ejb.DeploymentException de)
+ else
{
- throw new DeploymentException(de.getMessage(), de.getCause());
+ category.info("License terms present. See deployment descriptor.");
}
}
@@ -376,30 +361,16 @@
private void setSecurityPermission(Element element)
throws DeploymentException
{
- try
- {
- Element permSpec = MetaData.getUniqueChild(element,
- "security-permission-spec");
- String spec = getElementContent(permSpec);
- category.debug("Ignoring security-permission("+spec+")");
- }
- catch (org.jboss.ejb.DeploymentException de)
- {
- throw new DeploymentException(de.getMessage(), de.getCause());
- }
+ Element permSpec = MetaData.getUniqueChild(element,
+ "security-permission-spec");
+ String spec = getElementContent(permSpec);
+ category.debug("Ignoring security-permission("+spec+")");
}
private String getElementContent(Element element)
throws DeploymentException
{
- try
- {
- return MetaData.getElementContent(element);
- }
- catch (org.jboss.ejb.DeploymentException de)
- {
- throw new DeploymentException(de.getMessage(), de.getCause());
- }
+ return MetaData.getElementContent(element);
}
// Y overrides ---------------------------------------------------
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
