conor 01/10/09 05:13:40
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb
DescriptorHandler.java WeblogicDeploymentTool.java
Log:
D'Oh - didn;t resolve all conflicts :-( - done now.
Revision Changes Path
1.14 +1 -5
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
Index: DescriptorHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
--- DescriptorHandler.java 2001/10/09 12:11:23 1.13
+++ DescriptorHandler.java 2001/10/09 12:13:40 1.14
@@ -342,12 +342,8 @@
protected void processElement() {
-<<<<<<< DescriptorHandler.java
- if (parseState != STATE_IN_ENTITY && parseState != STATE_IN_SESSION
&& parseState != STATE_IN_MESSAGE) {
-=======
if (inEJBRef ||
- (parseState != STATE_IN_ENTITY && parseState !=
STATE_IN_SESSION)) {
->>>>>>> 1.12
+ (parseState != STATE_IN_ENTITY && parseState != STATE_IN_SESSION
&& parseState != STATE_IN_MESSAGE)) {
return;
}
1.31 +99 -72
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
Index: WeblogicDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -u -r1.30 -r1.31
--- WeblogicDeploymentTool.java 2001/07/19 14:09:38 1.30
+++ WeblogicDeploymentTool.java 2001/10/09 12:13:40 1.31
@@ -133,6 +133,12 @@
private Path wlClasspath = null;
/**
+ * The weblogic.StdoutSeverityLevel to use when running the JVM that
executes ejbc.
+ * Set to 16 to avoid the warnings about EJB Home and Remotes being in
the classpath
+ */
+ private Integer jvmDebugLevel = null;
+
+ /**
* Get the classpath to the weblogic classpaths
*/
public Path createWLClasspath() {
@@ -161,6 +167,21 @@
this.alwaysRebuild = rebuild;
}
+ /**
+ * Sets the weblogic.StdoutSeverityLevel to use when running the JVM
that executes ejbc.
+ * Set to 16 to avoid the warnings about EJB Home and Remotes being in
the classpath
+ */
+ public void setJvmDebugLevel(Integer jvmDebugLevel)
+ {
+ this.jvmDebugLevel = jvmDebugLevel;
+ }
+
+ public Integer getJvmDebugLevel()
+ {
+ return jvmDebugLevel;
+ }
+
+
/**
* Setter used to store the suffix for the generated weblogic jar file.
@@ -404,6 +425,12 @@
try {
javaTask = (Java) getTask().getProject().createTask("java");
javaTask.setTaskName("ejbc");
+
+ if (getJvmDebugLevel() != null)
+ {
+ javaTask.createJvmarg().setLine("
-Dweblogic.StdoutSeverityLevel=" + jvmDebugLevel);
+ }
+
if (ejbcClassName == null) {
// try to determine it from publicId
if (PUBLICID_EJB11.equals(publicId)) {
