User: oberg
Date: 00/12/07 07:45:03
Modified: src/main/org/jboss/metadata ApplicationMetaData.java
BeanMetaData.java ConfigurationMetaData.java
EjbRefMetaData.java EntityMetaData.java
EnvEntryMetaData.java MetaData.java
MethodMetaData.java ResourceRefMetaData.java
SecurityRoleRefMetaData.java SessionMetaData.java
XmlFileLoader.java XmlLoadable.java
Log:
Changed configuration scheme (lots of changes to jboss.conf, jboss.jcml,
org.jboss.Main)
Added ServiceControl
Changed jBoss -> JBoss
Changed GPL -> LGPL
Added jaxp/parser
Updated services to have default constructors
Revision Changes Path
1.12 +3 -3 jboss/src/main/org/jboss/metadata/ApplicationMetaData.java
Index: ApplicationMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/ApplicationMetaData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApplicationMetaData.java 2000/12/06 13:02:29 1.11
+++ ApplicationMetaData.java 2000/12/07 15:45:00 1.12
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -27,7 +27,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author Peter Antman ([EMAIL PROTECTED])
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class ApplicationMetaData extends MetaData {
// Constants -----------------------------------------------------
1.14 +3 -3 jboss/src/main/org/jboss/metadata/BeanMetaData.java
Index: BeanMetaData.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/metadata/BeanMetaData.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BeanMetaData.java 2000/12/06 13:02:29 1.13
+++ BeanMetaData.java 2000/12/07 15:45:00 1.14
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -25,7 +25,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author Peter Antman ([EMAIL PROTECTED])
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public abstract class BeanMetaData extends MetaData {
// Constants -----------------------------------------------------
1.9 +12 -7 jboss/src/main/org/jboss/metadata/ConfigurationMetaData.java
Index: ConfigurationMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/ConfigurationMetaData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConfigurationMetaData.java 2000/12/06 13:02:29 1.8
+++ ConfigurationMetaData.java 2000/12/07 15:45:00 1.9
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -15,7 +15,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class ConfigurationMetaData extends MetaData {
@@ -43,11 +43,12 @@
private String instanceCache;
private String persistenceManager;
private String transactionManager;
- private byte commitOption;
+ private byte commitOption;
private boolean callLogging;
+ private boolean readOnlyGetMethods;
- private String authenticationModule;
- private String roleMappingManager;
+ private String authenticationModule;
+ private String roleMappingManager;
private Element containerInvokerConf;
private Element containerPoolConf;
@@ -86,7 +87,8 @@
public boolean getCallLogging() { return callLogging; }
public byte getCommitOption() { return commitOption; }
-
+
+ public boolean getReadOnlyGetMethods() { return readOnlyGetMethods; }
public void importJbossXml(Element element) throws DeploymentException {
@@ -96,6 +98,9 @@
// set call logging
callLogging =
Boolean.valueOf(getElementContent(getOptionalChild(element, "call-logging"),
String.valueOf(callLogging))).booleanValue();
+ // set read-only get methods
+ readOnlyGetMethods =
Boolean.valueOf(getElementContent(getOptionalChild(element,
"read-only-get-methods"))).booleanValue();
+
// set the container invoker
containerInvoker = getElementContent(getOptionalChild(element,
"container-invoker"), containerInvoker);
1.3 +3 -3 jboss/src/main/org/jboss/metadata/EjbRefMetaData.java
Index: EjbRefMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/EjbRefMetaData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EjbRefMetaData.java 2000/08/22 19:26:41 1.2
+++ EjbRefMetaData.java 2000/12/07 15:45:00 1.3
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -15,7 +15,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class EjbRefMetaData extends MetaData {
// Constants -----------------------------------------------------
1.5 +3 -3 jboss/src/main/org/jboss/metadata/EntityMetaData.java
Index: EntityMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/EntityMetaData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EntityMetaData.java 2000/09/09 02:46:21 1.4
+++ EntityMetaData.java 2000/12/07 15:45:00 1.5
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -17,7 +17,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class EntityMetaData extends BeanMetaData {
// Constants -----------------------------------------------------
1.2 +3 -3 jboss/src/main/org/jboss/metadata/EnvEntryMetaData.java
Index: EnvEntryMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/EnvEntryMetaData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnvEntryMetaData.java 2000/08/12 00:37:58 1.1
+++ EnvEntryMetaData.java 2000/12/07 15:45:01 1.2
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -15,7 +15,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class EnvEntryMetaData extends MetaData {
// Constants -----------------------------------------------------
1.12 +19 -9 jboss/src/main/org/jboss/metadata/MetaData.java
Index: MetaData.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/metadata/MetaData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MetaData.java 2000/11/24 19:00:06 1.11
+++ MetaData.java 2000/12/07 15:45:01 1.12
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -22,7 +22,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public abstract class MetaData implements XmlLoadable {
// Constants -----------------------------------------------------
@@ -119,12 +119,22 @@
if (element == null) return defaultStr;
NodeList children = element.getChildNodes();
- if ((children.getLength() == 1) && (children.item(0).getNodeType() ==
Node.TEXT_NODE)) {
- String result = children.item(0).getNodeValue();
- return result == null ? null : result.trim();
- } else {
- return null;
- }
+
+ if (children.getLength() > 0)
+ {
+ String result = "";
+ for (int i = 0; i < children.getLength(); i++)
+ {
+ if (children.item(i).getNodeType() == Node.TEXT_NODE)
+ result += children.item(i).getNodeValue();
+ else
+ result += children.item(i).getFirstChild();
+ }
+ return result;
+ } else
+ {
+ return defaultStr;
+ }
}
1.7 +3 -3 jboss/src/main/org/jboss/metadata/MethodMetaData.java
Index: MethodMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/MethodMetaData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MethodMetaData.java 2000/08/21 18:11:47 1.6
+++ MethodMetaData.java 2000/12/07 15:45:01 1.7
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -19,7 +19,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class MethodMetaData extends MetaData {
// Constants -----------------------------------------------------
1.3 +3 -3 jboss/src/main/org/jboss/metadata/ResourceRefMetaData.java
Index: ResourceRefMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/ResourceRefMetaData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceRefMetaData.java 2000/08/15 01:40:57 1.2
+++ ResourceRefMetaData.java 2000/12/07 15:45:01 1.3
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -15,7 +15,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ResourceRefMetaData extends MetaData {
// Constants -----------------------------------------------------
1.2 +3 -3 jboss/src/main/org/jboss/metadata/SecurityRoleRefMetaData.java
Index: SecurityRoleRefMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/SecurityRoleRefMetaData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityRoleRefMetaData.java 2000/08/12 00:38:00 1.1
+++ SecurityRoleRefMetaData.java 2000/12/07 15:45:01 1.2
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -15,7 +15,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class SecurityRoleRefMetaData extends MetaData {
// Constants -----------------------------------------------------
1.4 +3 -3 jboss/src/main/org/jboss/metadata/SessionMetaData.java
Index: SessionMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/SessionMetaData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionMetaData.java 2000/08/25 20:19:18 1.3
+++ SessionMetaData.java 2000/12/07 15:45:01 1.4
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -16,7 +16,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class SessionMetaData extends BeanMetaData {
// Constants -----------------------------------------------------
1.10 +31 -7 jboss/src/main/org/jboss/metadata/XmlFileLoader.java
Index: XmlFileLoader.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/metadata/XmlFileLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XmlFileLoader.java 2000/11/29 14:04:12 1.9
+++ XmlFileLoader.java 2000/12/07 15:45:01 1.10
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -19,8 +19,12 @@
import org.xml.sax.Parser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.EntityResolver;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+
import org.jboss.ejb.DeploymentException;
//import org.jboss.logging.Logger;
@@ -30,7 +34,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Wolfgang Werner</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class XmlFileLoader {
// Constants -----------------------------------------------------
@@ -131,12 +135,17 @@
}
}
- public static Document getDocument(InputStream _in) throws DeploymentException
{
- try {
+ public static Document getDocument(InputStream _in) throws DeploymentException
+ {
+ try
+ {
Reader in = new InputStreamReader(_in);
+
+/*
+
com.sun.xml.tree.XmlDocumentBuilder xdb = new
com.sun.xml.tree.XmlDocumentBuilder();
- Parser parser = new com.sun.xml.parser.Parser();
+ Parser parser = new com.sun.xml.parser.ValidatingParser();
// Use a local entity resolver to get rid of the DTD loading
via internet
EntityResolver er = new LocalResolver();
@@ -144,7 +153,21 @@
xdb.setParser(parser);
parser.parse(new InputSource(in));
- return xdb.getDocument();
+ com.sun.xml.tree.XmlDocument doc = xdb.getDocument();
+ doc.write(System.out);
+*/
+ DocumentBuilderFactory docBuilderFactory =
DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+ EntityResolver er = new LocalResolver();
+ docBuilder.setEntityResolver(er);
+ Document doc = docBuilder.parse(_in);
+ return doc;
+ } catch (SAXParseException e) {
+
System.out.println(e.getMessage()+":"+e.getColumnNumber()+":"+e.getLineNumber());
+ throw new DeploymentException(e.getMessage());
+ } catch (SAXException e) {
+ System.out.println(e.getException());
+ throw new DeploymentException(e.getMessage());
} catch (Exception e) {
throw new DeploymentException(e.getMessage());
}
@@ -164,6 +187,7 @@
public LocalResolver() {
registerDTD("-//Sun Microsystems, Inc.//DTD Enterprise
JavaBeans 1.1//EN", "ejb-jar.dtd");
registerDTD("-//Sun Microsystems, Inc.//DTD J2EE Application
1.2//EN", "application_1_2.dtd");
+ registerDTD("-//JBoss//DTD JAWS//EN", "jaws.dtd");
}
public void registerDTD(String publicId, String dtdFileName) {
1.2 +3 -3 jboss/src/main/org/jboss/metadata/XmlLoadable.java
Index: XmlLoadable.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/metadata/XmlLoadable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XmlLoadable.java 2000/08/12 00:38:00 1.1
+++ XmlLoadable.java 2000/12/07 15:45:01 1.2
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.metadata;
@@ -14,7 +14,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface XmlLoadable {
