[jboss-cvs] jboss-seam/src/gen/org/jboss/seam/tool ...
Gavin King
gavin.king at jboss.com
Thu Nov 2 17:34:20 EST 2006
User: gavin
Date: 06/11/02 17:34:20
Modified: src/gen/org/jboss/seam/tool AbstractSeamGen.java
BuildPropertiesBean.java FaceletGenerator.java
JavaClassGenerator.java SeamGenCommandLine.java
Log:
seam-gen fixes and improvements
Revision Changes Path
1.2 +0 -2 jboss-seam/src/gen/org/jboss/seam/tool/AbstractSeamGen.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractSeamGen.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/AbstractSeamGen.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractSeamGen.java 2 Nov 2006 20:34:10 -0000 1.1
+++ AbstractSeamGen.java 2 Nov 2006 22:34:20 -0000 1.2
@@ -68,8 +68,6 @@
this.projectProps.setActionDir(buildProps.getProperty("action.dir"));
this.projectProps.setActionPackage(buildProps
.getProperty("action.package"));
- this.projectProps.setBpmDir(buildProps.getProperty("bpm.dir"));
- this.projectProps.setBpmPackage(buildProps.getProperty("bpm.package"));
this.projectProps.setJbossHome(buildProps.getProperty("jboss.home"));
this.projectProps.setMdbDir(buildProps.getProperty("mdb.dir"));
this.projectProps.setMdbPackage(buildProps.getProperty("mdb.package"));
1.2 +0 -16 jboss-seam/src/gen/org/jboss/seam/tool/BuildPropertiesBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BuildPropertiesBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/BuildPropertiesBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BuildPropertiesBean.java 2 Nov 2006 20:34:10 -0000 1.1
+++ BuildPropertiesBean.java 2 Nov 2006 22:34:20 -0000 1.2
@@ -31,8 +31,6 @@
private String modelDir;
private String testDir;
private String testPackage;
- private String bpmDir;
- private String bpmPackage;
private String mdbDir;
private String mdbPackage;
private String wtp;
@@ -50,8 +48,6 @@
this.modelDir = args[4].replace(".", "/");
this.testDir = args[5].replace(".", "/");
this.testPackage = args[5];
- this.bpmDir = args[6].replace(".", "/");
- this.bpmPackage = args[6];
this.mdbDir = args[7].replace(".", "/");
this.mdbPackage = args[7];
this.wtp = args[8];
@@ -74,18 +70,6 @@
public void setActionPackage(String actionPackage) {
this.actionPackage = actionPackage;
}
- public String getBpmDir() {
- return bpmDir;
- }
- public void setBpmDir(String bpmDir) {
- this.bpmDir = bpmDir;
- }
- public String getBpmPackage() {
- return bpmPackage;
- }
- public void setBpmPackage(String bpmPackage) {
- this.bpmPackage = bpmPackage;
- }
public String getJbossHome() {
return jbossHome;
}
1.2 +14 -6 jboss-seam/src/gen/org/jboss/seam/tool/FaceletGenerator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FaceletGenerator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/FaceletGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- FaceletGenerator.java 2 Nov 2006 20:34:10 -0000 1.1
+++ FaceletGenerator.java 2 Nov 2006 22:34:20 -0000 1.2
@@ -37,8 +37,10 @@
public FaceletGenerator(String[] args) throws IOException {
this.projectName = args[1];
- this.pageName = args[3];
this.actionName = args[2];
+ this.pageName = args[3];
+ //make the component name same as action name but first char lower case
+ this.componentName = this.actionName.substring(0,1).toLowerCase() + this.actionName.substring(1);
}
private HashMap getModel() throws IOException {
@@ -47,10 +49,6 @@
map.put("pageName", this.pageName);
map.put("actionName", this.actionName);
map.put("componentName", this.componentName);
-
- //make the component name same as action name but first char lower case
- this.componentName = this.actionName.substring(0,1).toLowerCase() + this.actionName.substring(1);
-
return map;
}
@@ -74,6 +72,16 @@
generateFile("action-page.ftl", page, getModel());
}
+ public void newConversationPage() throws IOException, TemplateException {
+ logger.info("Generating a new conversation Facelet Page");
+ String pageTemplate = getFaceletPath( this.projectProps.getWorkspaceHome(),
+ this.projectName, "template", this.projectProps.getWtp());
+ String page = getFaceletPath( this.projectProps.getWorkspaceHome(),
+ this.projectName, this.pageName, this.projectProps.getWtp());
+
+ generateFile("conversation-page.ftl", page, getModel());
+ }
+
public String getProjectName() {
return projectName;
}
1.2 +1 -13 jboss-seam/src/gen/org/jboss/seam/tool/JavaClassGenerator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JavaClassGenerator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/JavaClassGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- JavaClassGenerator.java 2 Nov 2006 20:34:10 -0000 1.1
+++ JavaClassGenerator.java 2 Nov 2006 22:34:20 -0000 1.2
@@ -43,7 +43,6 @@
this.projectName = args[1];
this.actionName = args[2];
this.interfaceName = args[2];
-
//make the component name same as action name but first char lower case
this.componentName = this.actionName.substring(0,1).toLowerCase() + this.actionName.substring(1);
}
@@ -56,14 +55,12 @@
map.put("interfaceName", this.interfaceName);
map.put("packageName", this.projectProps.getActionPackage());
map.put("testPackageName", this.projectProps.getTestPackage());
- map.put("bpmPackage", this.projectProps.getBpmPackage());
map.put("mdbPackage", this.projectProps.getMdbPackage());
map.put("entityPackage", this.projectProps.getModelPackage());
-
return map;
}
- public void newAction() throws IOException, TemplateException {
+ public void newStatefulAction() throws IOException, TemplateException {
logger.info("Generating a new SFSB and interface");
String sfsbAction = getJavaFilePath(this.projectProps.getWorkspaceHome(),
this.projectName, this.projectProps.getActionDir(),
@@ -116,15 +113,6 @@
generateFile("testng.ftl", testNgXml, getModel());
}
- public void newBpmAction() throws IOException, TemplateException {
- logger.info("Generating a new jBPM Action Class");
- String bpmAction = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getBpmDir(),
- this.actionName, this.projectProps.getWtp());
-
- generateFile("BpmAction.ftl", bpmAction, getModel());
- }
-
public void newEntity() throws IOException, TemplateException {
logger.info("Generating a new Entity EJB");
String entity = getJavaFilePath(this.projectProps.getWorkspaceHome(),
1.2 +15 -10 jboss-seam/src/gen/org/jboss/seam/tool/SeamGenCommandLine.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamGenCommandLine.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/SeamGenCommandLine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SeamGenCommandLine.java 2 Nov 2006 20:34:10 -0000 1.1
+++ SeamGenCommandLine.java 2 Nov 2006 22:34:20 -0000 1.2
@@ -37,35 +37,40 @@
}
}
- else if (args[0].equals("new-stateless-action")) {
+ else if (args[0].equals("new-stateful-action")) {
if (args.length == 4) {
JavaClassGenerator actionGen = new JavaClassGenerator(args);
FaceletGenerator faceletGen = new FaceletGenerator(args);
- faceletGen.newPage();
- actionGen.newStatelessAction();
+ faceletGen.newActionPage();
+ actionGen.newStatefulAction();
actionGen.newTestcase();
} else {
throw new Exception("Wrong number of arguments");
}
}
- else if (args[0].equals("new-conversation")) {
+ else if (args[0].equals("new-stateless-action")) {
if (args.length == 4) {
JavaClassGenerator actionGen = new JavaClassGenerator(args);
FaceletGenerator faceletGen = new FaceletGenerator(args);
- faceletGen.newPage();
- actionGen.newConversation();
+ faceletGen.newActionPage();
+ actionGen.newStatelessAction();
actionGen.newTestcase();
} else {
throw new Exception("Wrong number of arguments");
}
}
- else if (args[0].equals("new-bpm-action")) {
- if (args.length == 3) {
+
+ else if (args[0].equals("new-conversation")) {
+ if (args.length == 4) {
JavaClassGenerator actionGen = new JavaClassGenerator(args);
- actionGen.newBpmAction();
+ FaceletGenerator faceletGen = new FaceletGenerator(args);
+
+ faceletGen.newConversationPage();
+ actionGen.newConversation();
+ actionGen.newTestcase();
} else {
throw new Exception("Wrong number of arguments");
}
More information about the jboss-cvs-commits
mailing list