Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20096/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor
Modified Files:
beans.jelly EjbJarXmlPlugin.java ejb-ref.jelly
Log Message:
- ServiceEndpointPlugin stub created
- Uniformed package/pattern/class tag values for java generation for tags that
permit default naming override
- Qtags classes name fixed
- Qtags refactorings
- Fixed testcases
Index: EjbJarXmlPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/EjbJarXmlPlugin.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** EjbJarXmlPlugin.java 6 Sep 2005 01:49:59 -0000 1.12
--- EjbJarXmlPlugin.java 13 Sep 2005 02:22:33 -0000 1.13
***************
*** 40,44 ****
public class EjbJarXmlPlugin extends QDoxPlugin {
private EjbUtils ejbUtils;
-
private String description;
private String displayname;
--- 40,43 ----
***************
*** 46,54 ****
--- 45,56 ----
private String largeicon;
private boolean useids = true;
+
/** Directory of merge file(s) */
private File mergeDir;
+
/** Default name for generated file */
private String fileName = "ejb-jar.xml";
private String clientjar;
+ private EjbConfig config;
// DONE: Pending fix to be applied:
http://issues.apache.org/jira/browse/JELLY-213
***************
*** 63,69 ****
EjbRuntime.setPlugin(this);
Map dtds = EjbVersion.fillEntityResolverMap(new HashMap());
! setMultioutput(false);
setOutputValidator(new XMLOutputValidator(dtds));
this.ejbUtils = new EjbUtils();
new TagLibrary(metadataProvider);
}
--- 65,72 ----
EjbRuntime.setPlugin(this);
Map dtds = EjbVersion.fillEntityResolverMap(new HashMap());
! super.setMultioutput(false);
setOutputValidator(new XMLOutputValidator(dtds));
this.ejbUtils = new EjbUtils();
+ this.config = config;
new TagLibrary(metadataProvider);
}
***************
*** 71,79 ****
protected void populateContextMap(Map map) {
super.populateContextMap(map);
! map.put("util", ejbUtils);
map.put("version", getVersion());
}
/**
* Setter for fileName property
*
--- 74,89 ----
protected void populateContextMap(Map map) {
super.populateContextMap(map);
! map.put("util", getEjbUtils());
map.put("version", getVersion());
}
/**
+ * Don't let multioutput be changed
+ */
+ public void setMultioutput(boolean multioutput) {
+ throw new RuntimeException("Can't set multioutput for plugin");
+ }
+
+ /**
* Setter for fileName property
*
***************
*** 138,142 ****
public EjbConfig getConfig() {
! return EjbRuntime.getConfig();
}
--- 148,152 ----
public EjbConfig getConfig() {
! return config;
}
***************
*** 164,167 ****
--- 174,178 ----
if (useids) {
return EjbIds.get().prefixedId(ejbUtils.entityType(javaClass),
javaClass, ejbUtils.getEjbName(javaClass));
+
/*
String entityType = ejbUtils.entityType(javaClass);
Index: beans.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/beans.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** beans.jelly 7 Sep 2005 01:13:08 -0000 1.2
--- beans.jelly 13 Sep 2005 02:22:33 -0000 1.3
***************
*** 20,33 ****
<ejb-name>${util.getEjbName(class)}</ejb-name>
<j:if
test="${plugin.remoteHomeInterfacePlugin.shouldGenerate(class)}">
!
<home>${plugin.remoteHomeInterfacePlugin.getDestinationFullyQualifiedClassName(class)}</home>
</j:if>
<j:if
test="${plugin.remoteInterfacePlugin.shouldGenerate(class)}">
!
<remote>${plugin.remoteInterfacePlugin.getDestinationFullyQualifiedClassName(class)}</remote>
</j:if>
<j:if
test="${plugin.localHomeInterfacePlugin.shouldGenerate(class)}">
!
<local-home>${plugin.localHomeInterfacePlugin.getDestinationFullyQualifiedClassName(class)}</local-home>
</j:if>
<j:if
test="${plugin.localInterfacePlugin.shouldGenerate(class)}">
!
<local>${plugin.localInterfacePlugin.getDestinationFullyQualifiedClassName(class)}</local>
</j:if>
<x:comment trim="false">
--- 20,33 ----
<ejb-name>${util.getEjbName(class)}</ejb-name>
<j:if
test="${plugin.remoteHomeInterfacePlugin.shouldGenerate(class)}">
!
<home>${plugin.remoteHomeInterfacePlugin.getVirtualType(class)}</home>
</j:if>
<j:if
test="${plugin.remoteInterfacePlugin.shouldGenerate(class)}">
!
<remote>${plugin.remoteInterfacePlugin.getVirtualType(class)}</remote>
</j:if>
<j:if
test="${plugin.localHomeInterfacePlugin.shouldGenerate(class)}">
!
<local-home>${plugin.localHomeInterfacePlugin.getVirtualType(class)}</local-home>
</j:if>
<j:if
test="${plugin.localInterfacePlugin.shouldGenerate(class)}">
!
<local>${plugin.localInterfacePlugin.getVirtualType(class)}</local>
</j:if>
<x:comment trim="false">
Index: ejb-ref.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/ejb-ref.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ejb-ref.jelly 26 Aug 2005 17:52:30 -0000 1.1
--- ejb-ref.jelly 13 Sep 2005 02:22:33 -0000 1.2
***************
*** 7,12 ****
<ejb-ref-name>${util.ejbRefName(reference,
refClass)}</ejb-ref-name>
<ejb-ref-type>${util.beanType(refClass)}</ejb-ref-type>
!
<home>${plugin.remoteHomeInterfacePlugin.getDestinationFullyQualifiedClassName(refClass)}</home>
!
<remote>${plugin.remoteInterfacePlugin.getDestinationFullyQualifiedClassName(refClass)}</remote>
<ejb-link>${refTag.ejbName}</ejb-link>
</ejb-ref>
--- 7,12 ----
<ejb-ref-name>${util.ejbRefName(reference,
refClass)}</ejb-ref-name>
<ejb-ref-type>${util.beanType(refClass)}</ejb-ref-type>
!
<home>${plugin.remoteHomeInterfacePlugin.getVirtualType(refClass)}</home>
!
<remote>${plugin.remoteInterfacePlugin.getVirtualType(refClass)}</remote>
<ejb-link>${refTag.ejbName}</ejb-link>
</ejb-ref>
***************
*** 49,54 ****
<ejb-ref-name>${util.ejbRefName(reference,
refClass)}</ejb-ref-name>
<ejb-ref-type>${util.beanType(refClass)}</ejb-ref-type>
!
<local-home>${plugin.localHomeInterfacePlugin.getDestinationFullyQualifiedClassName(refClass)}</local-home>
!
<local>${plugin.localInterfacePlugin.getDestinationFullyQualifiedClassName(refClass)}</local>
<ejb-link>${refTag.ejbName}</ejb-link>
</ejb-local-ref>
--- 49,54 ----
<ejb-ref-name>${util.ejbRefName(reference,
refClass)}</ejb-ref-name>
<ejb-ref-type>${util.beanType(refClass)}</ejb-ref-type>
!
<local-home>${plugin.localHomeInterfacePlugin.getVirtualType(refClass)}</local-home>
!
<local>${plugin.localInterfacePlugin.getVirtualType(refClass)}</local>
<ejb-link>${refTag.ejbName}</ejb-link>
</ejb-local-ref>
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
