User: salborini
Date: 00/08/16 15:36:04
Modified: src/main/org/jboss/metadata ConfigurationMetaData.java
EntityMetaData.java MetaData.java
SessionMetaData.java
Log:
Added 4 configurations in standardjboss.xml, with the jrmp12 container invoker.
Added code in the metadata package to detect vm version and use the right
configuration.
jboss.xml is no longer required to run with jdk1.2.2
Revision Changes Path
1.3 +10 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigurationMetaData.java 2000/08/15 02:36:50 1.2
+++ ConfigurationMetaData.java 2000/08/16 22:36:03 1.3
@@ -15,15 +15,20 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ConfigurationMetaData extends MetaData {
// Constants -----------------------------------------------------
- public static final String DEFAULT_CMP = "Standard CMP EntityBean";
- public static final String DEFAULT_BMP = "Standard BMP EntityBean";
- public static final String DEFAULT_STATELESS = "Standard Stateless
SessionBean";
- public static final String DEFAULT_STATEFUL = "Standard Stateful SessionBean";
+ public static final String CMP_13 = "Standard CMP EntityBean";
+ public static final String BMP_13 = "Standard BMP EntityBean";
+ public static final String STATELESS_13 = "Standard Stateless SessionBean";
+ public static final String STATEFUL_13 = "Standard Stateful SessionBean";
+
+ public static final String CMP_12 = "jdk1.2.2 CMP EntityBean";
+ public static final String BMP_12 = "jdk1.2.2 BMP EntityBean";
+ public static final String STATELESS_12 = "jdk1.2.2 Stateless SessionBean";
+ public static final String STATEFUL_12 = "jdk1.2.2 Stateful SessionBean";
public static final byte A_COMMIT_OPTION = 0;
public static final byte B_COMMIT_OPTION = 1;
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntityMetaData.java 2000/08/12 00:37:58 1.1
+++ EntityMetaData.java 2000/08/16 22:36:04 1.2
@@ -17,7 +17,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class EntityMetaData extends BeanMetaData {
// Constants -----------------------------------------------------
@@ -47,9 +47,9 @@
public String getDefaultConfigurationName() {
if (isCMP()) {
- return ConfigurationMetaData.DEFAULT_CMP;
+ return jdk13Enabled() ? ConfigurationMetaData.CMP_13 :
ConfigurationMetaData.CMP_12;
} else {
- return ConfigurationMetaData.DEFAULT_BMP;
+ return jdk13Enabled() ? ConfigurationMetaData.BMP_13 :
ConfigurationMetaData.BMP_12;
}
}
1.4 +11 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MetaData.java 2000/08/12 00:37:59 1.3
+++ MetaData.java 2000/08/16 22:36:04 1.4
@@ -22,7 +22,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class MetaData implements XmlLoadable {
// Constants -----------------------------------------------------
@@ -118,6 +118,16 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
+ protected boolean jdk13Enabled() {
+ // should use "java.version" ?
+ String javaVersion = System.getProperty("java.vm.version");
+ if (javaVersion.startsWith("1.2.2")) {
+ return false;
+ } else {
+ // other versions should be ok (>=1.3) or crash (<1.2.2)
+ return true;
+ }
+ }
// Private -------------------------------------------------------
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionMetaData.java 2000/08/12 00:38:00 1.1
+++ SessionMetaData.java 2000/08/16 22:36:04 1.2
@@ -16,7 +16,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class SessionMetaData extends BeanMetaData {
// Constants -----------------------------------------------------
@@ -41,9 +41,9 @@
public String getDefaultConfigurationName() {
if (isStateful()) {
- return ConfigurationMetaData.DEFAULT_STATEFUL;
+ return jdk13Enabled() ? ConfigurationMetaData.STATEFUL_13 :
ConfigurationMetaData.STATEFUL_12;
} else {
- return ConfigurationMetaData.DEFAULT_STATELESS;
+ return jdk13Enabled() ? ConfigurationMetaData.STATELESS_13 :
ConfigurationMetaData.STATELESS_12;
}
}
