User: fleury
Date: 00/05/28 12:43:02
Modified: src/main/org/jboss/ejb/plugins/jaws/deployment
JawsFileManager.java JawsEnterpriseBeans.java
JawsEjbJar.java
Log:
work from the proper defaults in JawsFile manager, for now we code the Hypersonic
SQL stuff since it is the db shipping
Revision Changes Path
1.4 +6 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/deployment/JawsFileManager.java
Index: JawsFileManager.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jaws/deployment/JawsFileManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JawsFileManager.java 2000/05/19 07:11:56 1.3
+++ JawsFileManager.java 2000/05/28 19:43:01 1.4
@@ -30,7 +30,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class JawsFileManager
extends BeanContextServicesSupport
@@ -93,6 +93,7 @@
InputStream jawsXml = getClass().getResourceAsStream("defaultjaws.xml");
if (jawsXml != null)
{
+
in = new BufferedReader(new InputStreamReader(jawsXml));
doc = xm.load(in);
in.close();
@@ -116,6 +117,7 @@
} else if (file.getFile().endsWith(".jar")) // JAR file
{
+
// Load EJB-JAR XML
InputStream ejbXml =
getClassLoader().getResourceAsStream("META-INF/ejb-jar.xml");
if (ejbXml == null)
@@ -162,10 +164,10 @@
ejbXml.close();
ejbJar.importXml(doc.getDocumentElement());
- // Load jBoss XML
+ // Load jaws XML
InputStream jbossXml =
getClassLoader().getResourceAsStream("META-INF/jaws.xml");
if (jbossXml == null)
- {
+ {
// We want to use this file, but it doesn't contain the XML file yet
(i.e. it's a JAR without the jboss.xml file)
// Load default jBoss XML
jbossXml = getClass().getResourceAsStream("defaultjaws.xml");
@@ -174,6 +176,7 @@
// No default found
return ejbJar;
}
+
in = new BufferedReader(new InputStreamReader(jbossXml));
doc = xm.load(in);
in.close();
1.2 +24 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/deployment/JawsEnterpriseBeans.java
Index: JawsEnterpriseBeans.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jaws/deployment/JawsEnterpriseBeans.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JawsEnterpriseBeans.java 2000/05/19 07:11:56 1.1
+++ JawsEnterpriseBeans.java 2000/05/28 19:43:01 1.2
@@ -27,7 +27,8 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
+ * @version $Revision: 1.2 $
*/
public class JawsEnterpriseBeans
extends com.dreambean.ejx.ejb.EnterpriseBeans
@@ -47,8 +48,27 @@
public String getDataSource() { return dataSource; }
public void setTypeMapping(String tm) { String old = typeMapping; typeMapping =
tm; firePropertyChange("TypeMapping", old, typeMapping); }
- public String getTypeMapping() { return typeMapping; }
+ /*
+ * getTypeMapping()
+ *
+ * If no type mapping is specified (no jaws.xml file provided) we use the default
+ * Hypersonic default database settings
+ *
+ */
+ public String getTypeMapping() {
+
+ if (!typeMapping.equals("")) {
+
+ // We have a specified typeMapping either from XML or default
+ return typeMapping;
+ }
+ else {
+
+ return "Hypersonic SQL";
+ }
+ }
+
public com.dreambean.ejx.ejb.Entity addEntity()
throws IOException, ClassNotFoundException
{
@@ -70,6 +90,7 @@
public void importXml(Element elt)
throws Exception
{
+
if
(elt.getOwnerDocument().getDocumentElement().getTagName().equals(JawsEjbJar.JAWS_DOCUMENT))
{
NodeList nl = elt.getChildNodes();
@@ -96,7 +117,7 @@
setDataSource(n.hasChildNodes() ? XMLManager.getString(n) : "");
} else if (name.equals("type-mapping"))
{
- setTypeMapping(n.hasChildNodes() ? XMLManager.getString(n) : "");
+ setTypeMapping(n.hasChildNodes() ? XMLManager.getString(n)
: "");
}
}
} else
1.2 +4 -4
jboss/src/main/org/jboss/ejb/plugins/jaws/deployment/JawsEjbJar.java
Index: JawsEjbJar.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jaws/deployment/JawsEjbJar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JawsEjbJar.java 2000/05/19 07:11:55 1.1
+++ JawsEjbJar.java 2000/05/28 19:43:01 1.2
@@ -27,7 +27,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JawsEjbJar
extends com.dreambean.ejx.ejb.EjbJar
@@ -67,7 +67,7 @@
public void importXml(Element elt)
throws Exception
{
- if
(elt.getOwnerDocument().getDocumentElement().getTagName().equals(JAWS_DOCUMENT))
+ if
(elt.getOwnerDocument().getDocumentElement().getTagName().equals(JAWS_DOCUMENT))
{
NodeList nl = elt.getChildNodes();
for (int i = 0; i < nl.getLength(); i++)
@@ -80,12 +80,12 @@
eb.importXml((Element)n);
} else if (name.equals("type-mappings"))
{
- tm.importXml((Element)n);
+ tm.importXml((Element)n);
}
}
} else
{
- super.importXml(elt);
+ super.importXml(elt);
remove(ad);
}
}
