Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2625/src/main/java/org/xdoclet/plugin/struts
Modified Files:
StrutsConfigXMLPlugin.java StrutsTilesPlugin.java
StrutsValidationXMLPlugin.java
Log Message:
(XDP-84) Added the possibility to specify 'type' attribute of <action-mappings>
element in struts-config.xml
Index: StrutsTilesPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts/StrutsTilesPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StrutsTilesPlugin.java 2 Jul 2005 13:16:29 -0000 1.1
--- StrutsTilesPlugin.java 10 Aug 2005 15:21:10 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (c) 2003
* XDoclet Team
* All rights reserved.
--- 1,4 ----
/*
! * Copyright (c) 2003-2005
* XDoclet Team
* All rights reserved.
***************
*** 6,13 ****
package org.xdoclet.plugin.struts;
- import org.xdoclet.plugin.struts.qtags.StrutsTilesPutTagImpl;
- import org.xdoclet.plugin.struts.qtags.StrutsTilesTagImpl;
- import org.xdoclet.plugin.struts.qtags.TagLibrary;
-
import java.io.File;
--- 6,9 ----
***************
*** 25,28 ****
--- 21,28 ----
import org.generama.defaults.XMLOutputValidator;
+ import org.xdoclet.plugin.struts.qtags.StrutsTilesPutTagImpl;
+ import org.xdoclet.plugin.struts.qtags.StrutsTilesTagImpl;
+ import org.xdoclet.plugin.struts.qtags.TagLibrary;
+
import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.JavaClass;
***************
*** 68,71 ****
--- 68,72 ----
if (getMergedir().isDirectory()) {
File[] files = getMergedir().listFiles();
+
for (int i = 0; i < files.length; i++) {
if (fileName.trim().equals(files[i].getName())) {
***************
*** 75,78 ****
--- 76,80 ----
}
}
+
return null;
}
***************
*** 170,172 ****
}
}
! }
--- 172,174 ----
}
}
! }
\ No newline at end of file
Index: StrutsConfigXMLPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts/StrutsConfigXMLPlugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StrutsConfigXMLPlugin.java 31 May 2005 11:26:15 -0000 1.5
--- StrutsConfigXMLPlugin.java 10 Aug 2005 15:21:10 -0000 1.6
***************
*** 1,4 ****
/*
! * Copyright (c) 2003
* XDoclet Team
* All rights reserved.
--- 1,4 ----
/*
! * Copyright (c) 2003-2005
* XDoclet Team
* All rights reserved.
***************
*** 7,30 ****
import java.io.File;
import java.util.Collection;
- import java.util.Map;
import java.util.Collections;
import org.apache.commons.collections.CollectionUtils;
import org.generama.JellyTemplateEngine;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.WriterMapper;
import org.generama.defaults.QDoxPlugin;
import org.generama.defaults.XMLOutputValidator;
import org.xdoclet.plugin.struts.qtags.TagLibrary;
import org.xdoclet.predicate.IsA;
/**
* Plugin producing struts-config declarations.
! *
* @author Alexandre Martins
*/
public class StrutsConfigXMLPlugin extends QDoxPlugin {
-
private static final String OBJECT_CLASSNAME = "java.lang.Object";
private static final String ACTION_CLASSNAME =
"org.apache.struts.action.Action";
--- 7,34 ----
import java.io.File;
+
import java.util.Collection;
import java.util.Collections;
+ import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
+
import org.generama.JellyTemplateEngine;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.WriterMapper;
+
import org.generama.defaults.QDoxPlugin;
import org.generama.defaults.XMLOutputValidator;
+
import org.xdoclet.plugin.struts.qtags.TagLibrary;
+
import org.xdoclet.predicate.IsA;
/**
* Plugin producing struts-config declarations.
! *
* @author Alexandre Martins
*/
public class StrutsConfigXMLPlugin extends QDoxPlugin {
private static final String OBJECT_CLASSNAME = "java.lang.Object";
private static final String ACTION_CLASSNAME =
"org.apache.struts.action.Action";
***************
*** 35,53 ****
private File mergeDir;
private String fileName = "struts-config.xml";
! public StrutsConfigXMLPlugin(JellyTemplateEngine jellyTemplateEngine,
QDoxCapableMetadataProvider metadataProvider, WriterMapper writerMapper) {
super(jellyTemplateEngine, metadataProvider, writerMapper);
setMultioutput(false);
! Map dtds =
Collections.singletonMap("http://struts.apache.org/dtds/struts-config_1_2.dtd";,
getClass().getResource("struts-config_1_2.dtd"));
setOutputValidator(new XMLOutputValidator(dtds));
-
new TagLibrary(metadataProvider);
}
public Collection getActionClasses() {
if (actionClasses == null) {
this.actionClasses =
CollectionUtils.select(metadataProvider.getMetadata(), new
IsA(ACTION_CLASSNAME));
}
return this.actionClasses;
}
--- 39,72 ----
private File mergeDir;
private String fileName = "struts-config.xml";
+ private String mappingType;
! public StrutsConfigXMLPlugin(JellyTemplateEngine jellyTemplateEngine,
QDoxCapableMetadataProvider metadataProvider,
! WriterMapper writerMapper) {
super(jellyTemplateEngine, metadataProvider, writerMapper);
setMultioutput(false);
! Map dtds =
Collections.singletonMap("http://struts.apache.org/dtds/struts-config_1_2.dtd";,
getClass().getResource("struts-config_1_2.dtd"));
setOutputValidator(new XMLOutputValidator(dtds));
new TagLibrary(metadataProvider);
}
+ public String getMappingtype() {
+ return mappingType;
+ }
+
+ /**
+ * Use this to specify the "type" attribute of the action-mappings element
+ *
+ * @generama.property required="false" default="null"
+ */
+ public void setMappingtype(String mappingType) {
+ this.mappingType = mappingType;
+ }
+
public Collection getActionClasses() {
if (actionClasses == null) {
this.actionClasses =
CollectionUtils.select(metadataProvider.getMetadata(), new
IsA(ACTION_CLASSNAME));
}
+
return this.actionClasses;
}
***************
*** 55,60 ****
public Collection getActionFormClasses() {
if (actionFormClasses == null) {
! this.actionFormClasses =
CollectionUtils.select(metadataProvider.getMetadata(), new
IsA(ACTIONFORM_CLASSNAME));
}
return this.actionFormClasses;
}
--- 74,81 ----
public Collection getActionFormClasses() {
if (actionFormClasses == null) {
! this.actionFormClasses =
CollectionUtils.select(metadataProvider.getMetadata(),
! new IsA(ACTIONFORM_CLASSNAME));
}
+
return this.actionFormClasses;
}
***************
*** 66,69 ****
--- 87,91 ----
this.allClasses =
CollectionUtils.select(metadataProvider.getMetadata(), new
IsA(OBJECT_CLASSNAME));
}
+
return this.allClasses;
}
***************
*** 89,92 ****
--- 111,115 ----
if (getMergedir().isDirectory()) {
File[] files = getMergedir().listFiles();
+
for (int i = 0; i < files.length; i++) {
if (fileName.trim().equals(files[i].getName())) {
***************
*** 96,99 ****
--- 119,123 ----
}
}
+
return null;
}
Index: StrutsValidationXMLPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts/StrutsValidationXMLPlugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StrutsValidationXMLPlugin.java 2 Jul 2005 13:16:29 -0000 1.5
--- StrutsValidationXMLPlugin.java 10 Aug 2005 15:21:10 -0000 1.6
***************
*** 1,10 ****
/*
!
! * Copyright (c) 2003
!
* XDoclet Team
-
* All rights reserved.
-
*/
package org.xdoclet.plugin.struts;
--- 1,6 ----
/*
! * Copyright (c) 2003-2005
* XDoclet Team
* All rights reserved.
*/
package org.xdoclet.plugin.struts;
***************
*** 13,23 ****
--- 9,24 ----
import org.apache.commons.collections.CollectionUtils;
+
import org.generama.JellyTemplateEngine;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.WriterMapper;
+
import org.generama.defaults.QDoxPlugin;
import org.generama.defaults.XMLOutputValidator;
+
import org.xdoclet.plugin.struts.qtags.TagLibrary;
+
import org.xdoclet.predicate.IsA;
+
import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.JavaClass;
***************
*** 26,39 ****
/**
* Plugin producing validation declarations.
! *
* @author Alexandre Martins
*/
public class StrutsValidationXMLPlugin extends QDoxPlugin {
-
private static final String VALIDATOR_FORM_CLASSNAME =
"org.apache.struts.validator.ValidatorForm";
//private final static List PROPERTY_TAGS = new ArrayList();
private Collection validatorFormClasses;
! public StrutsValidationXMLPlugin(JellyTemplateEngine jellyTemplateEngine,
QDoxCapableMetadataProvider metadataProvider, WriterMapper writerMapper) {
super(jellyTemplateEngine, metadataProvider, writerMapper);
setMultioutput(false);
--- 27,41 ----
/**
* Plugin producing validation declarations.
! *
* @author Alexandre Martins
*/
public class StrutsValidationXMLPlugin extends QDoxPlugin {
private static final String VALIDATOR_FORM_CLASSNAME =
"org.apache.struts.validator.ValidatorForm";
+
//private final static List PROPERTY_TAGS = new ArrayList();
private Collection validatorFormClasses;
! public StrutsValidationXMLPlugin(JellyTemplateEngine jellyTemplateEngine,
! QDoxCapableMetadataProvider metadataProvider, WriterMapper
writerMapper) {
super(jellyTemplateEngine, metadataProvider, writerMapper);
setMultioutput(false);
***************
*** 41,45 ****
getClass().getResource("validator_1_1_3.dtd"));
setOutputValidator(new XMLOutputValidator(dtds));
-
new TagLibrary(metadataProvider);
}
--- 43,46 ----
***************
*** 47,52 ****
public Collection getValidatorFormClasses() {
if (validatorFormClasses == null) {
! this.validatorFormClasses =
CollectionUtils.select(metadataProvider.getMetadata(), new
IsA(VALIDATOR_FORM_CLASSNAME));
}
return validatorFormClasses;
}
--- 48,55 ----
public Collection getValidatorFormClasses() {
if (validatorFormClasses == null) {
! this.validatorFormClasses =
CollectionUtils.select(metadataProvider.getMetadata(),
! new IsA(VALIDATOR_FORM_CLASSNAME));
}
+
return validatorFormClasses;
}
***************
*** 58,61 ****
--- 61,65 ----
}
}
+
return false;
}
***************
*** 63,70 ****
--- 67,77 ----
public JavaParameter[] getFieldArgs(DocletTag tag) {
List fieldArgs = new ArrayList();
+
if (tag != null) {
fieldArgs = Arrays.asList(tag.getParameters());
+
for (Iterator it = fieldArgs.iterator(); it.hasNext();) {
String arg = (String) it.next();
+
if (arg != null && !arg.startsWith("arg")) {
fieldArgs.remove(arg);
***************
*** 72,75 ****
--- 79,83 ----
}
}
+
return (JavaParameter[]) fieldArgs.toArray();
}
***************
*** 79,82 ****
--- 87,91 ----
return argName.charAt(3) + "";
}
+
return null;
}
***************
*** 86,89 ****
--- 95,99 ----
return true;
}
+
return false;
}
***************
*** 93,96 ****
--- 103,107 ----
return true;
}
+
return false;
}
***************
*** 100,103 ****
--- 111,115 ----
return true;
}
+
return false;
}
-------------------------------------------------------
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
