[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/report GenTag.java,1.4,1.5 IDRSHead.java,1
Brought to you by:
bigman921
|
From: Marc B. <big...@us...> - 2003-03-17 14:05:35
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report
In directory sc8-pr-cvs1:/tmp/cvs-serv25653/dev/src/net/sourceforge/idrs/core/report
Modified Files:
GenTag.java IDRSHead.java InputChunk.java core
Log Message:
Added Initial EJB Support
Index: GenTag.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/GenTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GenTag.java 6 Feb 2003 20:13:44 -0000 1.4
--- GenTag.java 17 Mar 2003 14:04:53 -0000 1.5
***************
*** 180,184 ****
sval = head.getRequest().getParameter(name);
if (sval == null) {
! // System.out.println("Getting db value " + owner + "." + src + " : " + head.getFieldData(owner,src));
return (sval = head.getFieldData(owner,src)) != null ? sval : "";
}
--- 180,184 ----
sval = head.getRequest().getParameter(name);
if (sval == null) {
! System.out.println("Getting db value " + owner + "." + src + " : " + head.getFieldData(owner,src));
return (sval = head.getFieldData(owner,src)) != null ? sval : "";
}
***************
*** 188,192 ****
}
else {
! // System.out.println("Getting db value " + owner + "." + src + " : " + head.getFieldData(owner,src));
return (sval = head.getFieldData(owner,src)) != null ? sval : "";
}
--- 188,192 ----
}
else {
! System.out.println("Getting db value " + owner + "." + src + " : " + head.getFieldData(owner,src));
return (sval = head.getFieldData(owner,src)) != null ? sval : "";
}
Index: IDRSHead.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** IDRSHead.java 17 Feb 2003 02:48:48 -0000 1.14
--- IDRSHead.java 17 Mar 2003 14:04:53 -0000 1.15
***************
*** 11,14 ****
--- 11,19 ----
import java.sql.*;
import java.security.*;
+ import javax.ejb.*;
+ import javax.rmi.*;
+ import net.sourceforge.idrs.jndi.*;
+ import javax.naming.*;
+ import java.lang.reflect.*;
public final class IDRSHead implements Serializable, IDRSScript {
***************
*** 736,739 ****
--- 741,758 ----
}
+ public EJBObject getEJB(Connection con, String name, String home, String remote, boolean session) throws Exception {
+ if (! (con instanceof JndiConnection)) {
+ throw new Exception("A Connection Must Be an instance of JndiConnection");
+ }
+
+ Context ctx = ((JndiConnection) con).getContext();
+ Object obj = ctx.lookup(name);
+
+ EJBHome hm = (EJBHome) PortableRemoteObject.narrow(obj,Class.forName(home));
+
+ Method create = Class.forName(home).getMethod("create",new Class[] {});
+ return (EJBObject) create.invoke(hm,new Object[] {});
+
+ }
}
Index: InputChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/InputChunk.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InputChunk.java 6 Feb 2003 20:13:45 -0000 1.3
--- InputChunk.java 17 Mar 2003 14:04:53 -0000 1.4
***************
*** 41,57 ****
public String toString(IDRSHead head) throws Exception {
! StringBuffer tag = new StringBuffer();
! String nm = nameIsScript ? head.getScriptContext().eval(name) : name;
! switch (type) {
! case INPUT_HIDDEN : getTextTag(nm,"HIDDEN",head,tag); break;
! case INPUT_TEXT : getTextTag(nm,"TEXT",head,tag); break;
! case INPUT_PASSWORD : getTextTag(nm,"PASSWORD",head,tag); break;
! case INPUT_FILE : getTextTag(nm,"FILE",head,tag); break;
! case INPUT_RADIO : getBoolTag(nm,"RADIO",head,tag); break;
! case INPUT_CHECKBOX : getBoolTag(nm,"CHECKBOX",head,tag); break;
! case INPUT_TEXTAREA : tag.append("<TEXTAREA NAME=\"").append(nm).append("\" ").append(atts).append(" >").append(getValue(head,nm)).append("</TEXTAREA>");
! }
!
! return tag.toString();
}
--- 41,62 ----
public String toString(IDRSHead head) throws Exception {
! try {
! StringBuffer tag = new StringBuffer();
! String nm = nameIsScript ? head.getScriptContext().eval(name) : name;
! switch (type) {
! case INPUT_HIDDEN : getTextTag(nm,"HIDDEN",head,tag); break;
! case INPUT_TEXT : getTextTag(nm,"TEXT",head,tag); break;
! case INPUT_PASSWORD : getTextTag(nm,"PASSWORD",head,tag); break;
! case INPUT_FILE : getTextTag(nm,"FILE",head,tag); break;
! case INPUT_RADIO : getBoolTag(nm,"RADIO",head,tag); break;
! case INPUT_CHECKBOX : getBoolTag(nm,"CHECKBOX",head,tag); break;
! case INPUT_TEXTAREA : tag.append("<TEXTAREA NAME=\"").append(nm).append("\" ").append(atts).append(" >").append(getValue(head,nm)).append("</TEXTAREA>");
! }
!
! return tag.toString();
! } catch (Exception e) {
! e.printStackTrace();
! return "ERROR";
! }
}
Index: core
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/core,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvswWADTu and /tmp/cvsLpfwqH differ
|