User: starksm
Date: 01/11/25 19:12:28
Modified: src/main/org/jboss/ejb/plugins/jaws/metadata
CMPFieldMetaData.java FinderMetaData.java
JawsApplicationMetaData.java
JawsEntityMetaData.java JawsXmlFileLoader.java
MappingMetaData.java TypeMappingMetaData.java
Log:
Drop the org.jboss.ejb.DeploymentException in favor of the
org.jboss.deployment.DeploymentException class.
Clean up the org.jboss.logging.Logger to use the Logger.getLogger
factory method.
Revision Changes Path
1.13 +5 -4
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/CMPFieldMetaData.java
Index: CMPFieldMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/CMPFieldMetaData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CMPFieldMetaData.java 2001/11/24 20:43:25 1.12
+++ CMPFieldMetaData.java 2001/11/26 03:12:28 1.13
@@ -13,7 +13,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.XmlLoadable;
import org.jboss.metadata.MetaData;
@@ -31,16 +31,17 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Harcq</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*
* Revison:
* 20010621 danch: merged patch from David Jenks - null constraint on columns.
*/
-public class CMPFieldMetaData extends MetaData implements XmlLoadable {
+public class CMPFieldMetaData extends MetaData implements XmlLoadable
+{
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- protected static Logger log = Logger.create(CMPFieldMetaData.class);
+ protected static Logger log = Logger.getLogger(CMPFieldMetaData.class);
/** The entity this field belongs to. */
private JawsEntityMetaData jawsEntity;
1.7 +2 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/FinderMetaData.java
Index: FinderMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/FinderMetaData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FinderMetaData.java 2001/08/03 17:15:49 1.6
+++ FinderMetaData.java 2001/11/26 03:12:28 1.7
@@ -9,8 +9,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
-
+import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.MetaData;
import org.jboss.metadata.XmlLoadable;
@@ -22,7 +21,7 @@
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author <a href="[EMAIL PROTECTED]">danch</a>
* @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*
* Revisions:
* 20010621 Bill Burke: setReadAhead added.
1.12 +2 -2
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsApplicationMetaData.java
Index: JawsApplicationMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsApplicationMetaData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JawsApplicationMetaData.java 2001/08/12 10:46:22 1.11
+++ JawsApplicationMetaData.java 2001/11/26 03:12:28 1.12
@@ -16,7 +16,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.XmlLoadable;
import org.jboss.metadata.MetaData;
@@ -32,7 +32,7 @@
*
* @see <related>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*
* <p><b>Revisions:</b>
*
1.16 +2 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsEntityMetaData.java
Index: JawsEntityMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsEntityMetaData.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JawsEntityMetaData.java 2001/09/01 19:50:31 1.15
+++ JawsEntityMetaData.java 2001/11/26 03:12:28 1.16
@@ -21,8 +21,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
-
+import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.EntityMetaData;
import org.jboss.metadata.MetaData;
import org.jboss.metadata.XmlLoadable;
@@ -36,7 +35,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vinay Menon</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*
* Revisions:
* 20010621 Bill Burke: made read-ahead defaultable in standardjboss.xml and
jaws.xml
1.9 +53 -52
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsXmlFileLoader.java
Index: JawsXmlFileLoader.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsXmlFileLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JawsXmlFileLoader.java 2001/11/24 20:43:25 1.8
+++ JawsXmlFileLoader.java 2001/11/26 03:12:28 1.9
@@ -11,20 +11,17 @@
import org.w3c.dom.Document;
-import org.jboss.ejb.DeploymentException;
-
+import org.jboss.deployment.DeploymentException;
+import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.XmlFileLoader;
-import org.apache.log4j.Category;
-
-
/**
* <description>
*
* @see <related>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*
* <p><b>Revisions:</b>
*
@@ -34,51 +31,55 @@
* </ul>
*
*/
-public class JawsXmlFileLoader {
-
- // Attributes ----------------------------------------------------
- private ApplicationMetaData application;
- private ClassLoader classLoader;
- private ClassLoader localClassLoader;
- private Category log = Category.getInstance(JawsXmlFileLoader.class);
-
-
- // Constructors --------------------------------------------------
- public JawsXmlFileLoader(ApplicationMetaData app, ClassLoader cl, ClassLoader
localCl) {
- application = app;
- classLoader = cl;
- localClassLoader = localCl;
- }
-
-
- // Public --------------------------------------------------------
- public JawsApplicationMetaData load() throws DeploymentException {
-
- // first create the metadata
- JawsApplicationMetaData jamd = new
JawsApplicationMetaData(application, classLoader);
-
- // Load standardjaws.xml from the default classLoader
- // we always load defaults first
- URL stdJawsUrl = classLoader.getResource("standardjaws.xml");
-
- if (stdJawsUrl == null) throw new DeploymentException("No
standardjaws.xml found");
-
- log.debug("Loading standardjaws.xml : " + stdJawsUrl.toString());
- Document stdJawsDocument = XmlFileLoader.getDocument(stdJawsUrl);
- jamd.importXml(stdJawsDocument.getDocumentElement());
-
- // Load jaws.xml if provided
- URL jawsUrl = localClassLoader.getResource("META-INF/jaws.xml");
-
- if (jawsUrl != null) {
- log.debug(jawsUrl.toString() + " found. Overriding defaults");
- Document jawsDocument = XmlFileLoader.getDocument(jawsUrl);
- jamd.importXml(jawsDocument.getDocumentElement());
- }
-
- // this can only be done once all the beans are built
- jamd.init();
-
- return jamd;
+public class JawsXmlFileLoader
+{
+
+ // Attributes ----------------------------------------------------
+ private ApplicationMetaData application;
+ private ClassLoader classLoader;
+ private ClassLoader localClassLoader;
+ private Logger log = Logger.getLogger(JawsXmlFileLoader.class);
+
+
+ // Constructors --------------------------------------------------
+ public JawsXmlFileLoader(ApplicationMetaData app, ClassLoader cl, ClassLoader
localCl)
+ {
+ application = app;
+ classLoader = cl;
+ localClassLoader = localCl;
+ }
+
+
+ // Public --------------------------------------------------------
+ public JawsApplicationMetaData load() throws DeploymentException
+ {
+
+ // first create the metadata
+ JawsApplicationMetaData jamd = new JawsApplicationMetaData(application,
classLoader);
+
+ // Load standardjaws.xml from the default classLoader
+ // we always load defaults first
+ URL stdJawsUrl = classLoader.getResource("standardjaws.xml");
+
+ if (stdJawsUrl == null) throw new DeploymentException("No standardjaws.xml
found");
+
+ log.debug("Loading standardjaws.xml : " + stdJawsUrl.toString());
+ Document stdJawsDocument = XmlFileLoader.getDocument(stdJawsUrl);
+ jamd.importXml(stdJawsDocument.getDocumentElement());
+
+ // Load jaws.xml if provided
+ URL jawsUrl = localClassLoader.getResource("META-INF/jaws.xml");
+
+ if (jawsUrl != null)
+ {
+ log.debug(jawsUrl.toString() + " found. Overriding defaults");
+ Document jawsDocument = XmlFileLoader.getDocument(jawsUrl);
+ jamd.importXml(jawsDocument.getDocumentElement());
+ }
+
+ // this can only be done once all the beans are built
+ jamd.init();
+
+ return jamd;
}
}
1.6 +5 -4
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/MappingMetaData.java
Index: MappingMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/MappingMetaData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MappingMetaData.java 2001/09/11 18:35:01 1.5
+++ MappingMetaData.java 2001/11/26 03:12:28 1.6
@@ -10,7 +10,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.metadata.MetaData;
import org.jboss.metadata.XmlLoadable;
@@ -20,13 +20,14 @@
*
* @see <related>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
-public class MappingMetaData extends MetaData implements XmlLoadable {
+public class MappingMetaData extends MetaData implements XmlLoadable
+{
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- protected static Logger log = Logger.create(MappingMetaData.class);
+ protected static Logger log = Logger.getLogger(MappingMetaData.class);
private String javaType;
private int jdbcType;
1.6 +2 -5
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/TypeMappingMetaData.java
Index: TypeMappingMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/TypeMappingMetaData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TypeMappingMetaData.java 2001/11/24 20:43:25 1.5
+++ TypeMappingMetaData.java 2001/11/26 03:12:28 1.6
@@ -9,12 +9,9 @@
import java.util.Hashtable;
import java.util.Iterator;
-
-
import org.w3c.dom.Element;
-
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.MetaData;
import org.jboss.metadata.XmlLoadable;
@@ -24,7 +21,7 @@
*
* @see <related>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class TypeMappingMetaData extends MetaData implements XmlLoadable {
// Constants -----------------------------------------------------
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
