[jboss-cvs] JBossAS SVN: r106301 - in projects/jboss-jca/trunk/codegenerator/src/main: resources and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 29 03:23:46 EDT 2010
Author: jeff.zhang
Date: 2010-06-29 03:23:46 -0400 (Tue, 29 Jun 2010)
New Revision: 106301
Modified:
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
Log:
[JBJCA-365] Generator proper default values for inputs
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java 2010-06-29 03:29:31 UTC (rev 106300)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java 2010-06-29 07:23:46 UTC (rev 106301)
@@ -40,7 +40,7 @@
{
/** jca version */
@XmlElement(name = "version")
- private String version;
+ private String version = "1.6";
/** output directory */
private String outputDir;
/** resource adapter package name */
@@ -229,7 +229,7 @@
{
if (raClass == null || raClass.equals(""))
{
- raClass = getDefaultValue() + "ResourceAdpater";
+ raClass = getDefaultValue() + "ResourceAdpater";
}
return raClass;
}
@@ -273,7 +273,7 @@
{
if (mcfClass == null || mcfClass.equals(""))
{
- mcfClass = getDefaultValue() + "ManagedConnectionFactory";
+ mcfClass = getDefaultValue() + "ManagedConnectionFactory";
}
return mcfClass;
}
@@ -297,7 +297,7 @@
{
if (mcClass == null || mcClass.equals(""))
{
- mcClass = getDefaultValue() + "ManagedConnection";
+ mcClass = getDefaultValue() + "ManagedConnection";
}
return mcClass;
}
@@ -321,7 +321,7 @@
{
if (connInterfaceClass == null || connInterfaceClass.equals(""))
{
- connInterfaceClass = getDefaultValue() + "ConnectionInterface";
+ connInterfaceClass = getDefaultValue() + "Connection";
}
return connInterfaceClass;
}
@@ -345,7 +345,7 @@
{
if (connImplClass == null || connImplClass.equals(""))
{
- connImplClass = getDefaultValue() + "ConnectionImpl";
+ connImplClass = getDefaultValue() + "ConnectionImpl";
}
return connImplClass;
}
@@ -428,7 +428,7 @@
public String getCciConnFactoryClass()
{
if (cciConnFactoryClass == null || cciConnFactoryClass.equals(""))
- cciConnFactoryClass = "MyCciConnectionFactory";
+ cciConnFactoryClass = getDefaultValue() + "CciConnectionFactory";
return cciConnFactoryClass;
}
@@ -450,7 +450,7 @@
public String getCciConnClass()
{
if (cciConnClass == null || cciConnClass.equals(""))
- cciConnClass = "MyCciConnection";
+ cciConnClass = getDefaultValue() + "CciConnection";
return cciConnClass;
}
@@ -472,7 +472,7 @@
public String getMcMetaClass()
{
if (mcMetaClass == null || mcMetaClass.equals(""))
- mcMetaClass = "MyManagedConnectionMetaData";
+ mcMetaClass = getDefaultValue() + "ManagedConnectionMetaData";
return mcMetaClass;
}
@@ -494,7 +494,7 @@
public String getCmClass()
{
if (cmClass == null || cmClass.equals(""))
- cmClass = "MyConnectionManager";
+ cmClass = getDefaultValue() + "ConnectionManager";
return cmClass;
}
@@ -517,7 +517,7 @@
{
if (cfClass == null || cfClass.equals(""))
{
- cfClass = getDefaultValue() + "ConnectionFactory";
+ cfClass = getDefaultValue() + "ConnectionFactoryImpl";
}
return cfClass;
}
@@ -541,7 +541,7 @@
{
if (cfInterfaceClass == null || cfInterfaceClass.equals(""))
{
- cfInterfaceClass = getDefaultValue() + "ConnectionFactoryInterface";
+ cfInterfaceClass = getDefaultValue() + "ConnectionFactory";
}
return cfInterfaceClass;
}
@@ -564,7 +564,7 @@
public String getConnMetaClass()
{
if (connMetaClass == null || connMetaClass.equals(""))
- connMetaClass = "MyConnectionMetaData";
+ connMetaClass = getDefaultValue() + "ConnectionMetaData";
return connMetaClass;
}
@@ -586,7 +586,7 @@
public String getConnSpecClass()
{
if (connSpecClass == null || connSpecClass.equals(""))
- connSpecClass = "MyConnectionSpec";
+ connSpecClass = getDefaultValue() + "ConnectionSpec";
return connSpecClass;
}
@@ -608,7 +608,7 @@
public String getRaMetaClass()
{
if (raMetaClass == null || raMetaClass.equals(""))
- raMetaClass = "MyRaMetaData";
+ raMetaClass = getDefaultValue() + "RaMetaData";
return raMetaClass;
}
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java 2010-06-29 03:29:31 UTC (rev 106300)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java 2010-06-29 07:23:46 UTC (rev 106301)
@@ -283,7 +283,7 @@
if (def.isUseRa() || def.isSupportInbound())
{
System.out.print(rb.getString("ra.class.name"));
- System.out.print("[" + def.getRaClass() + "] ");
+ System.out.print("[" + def.getRaClass() + "]: ");
String raClassName = in.readLine();
if (raClassName != null && !raClassName.equals(""))
{
@@ -300,7 +300,7 @@
if (def.isSupportOutbound())
{
System.out.print(rb.getString("mcf.class.name"));
- System.out.print("[" + def.getMcfClass() + "] ");
+ System.out.print("[" + def.getMcfClass() + "]: ");
String mcfClassName = in.readLine();
if (mcfClassName != null && !mcfClassName.equals(""))
{
@@ -328,7 +328,7 @@
}
System.out.print(rb.getString("mc.class.name"));
- System.out.print("[" + def.getMcClass() + "] ");
+ System.out.print("[" + def.getMcClass() + "]: ");
String mcClassName = in.readLine();
if (mcClassName != null && !mcClassName.equals(""))
def.setMcClass(mcClassName);
@@ -348,25 +348,25 @@
if (!def.isUseCciConnection())
{
System.out.print(rb.getString("cf.interface.name"));
- System.out.print("[" + def.getCfInterfaceClass() + "] ");
+ System.out.print("[" + def.getCfInterfaceClass() + "]: ");
String cfInterfaceName = in.readLine();
if (cfInterfaceName != null && !cfInterfaceName.equals(""))
def.setCfInterfaceClass(cfInterfaceName);
System.out.print(rb.getString("cf.class.name"));
- System.out.print("[" + def.getCfClass() + "] ");
+ System.out.print("[" + def.getCfClass() + "]: ");
String cfClassName = in.readLine();
if (cfClassName != null && !cfClassName.equals(""))
def.setCfClass(cfClassName);
System.out.print(rb.getString("conn.interface.name"));
- System.out.print("[" + def.getConnInterfaceClass() + "] ");
+ System.out.print("[" + def.getConnInterfaceClass() + "]: ");
String connInterfaceName = in.readLine();
if (connInterfaceName != null && !connInterfaceName.equals(""))
def.setConnInterfaceClass(connInterfaceName);
System.out.print(rb.getString("conn.class.name"));
- System.out.print("[" + def.getConnImplClass() + "] ");
+ System.out.print("[" + def.getConnImplClass() + "]: ");
String connImplName = in.readLine();
if (connImplName != null && !connImplName.equals(""))
def.setConnImplClass(connImplName);
@@ -393,7 +393,7 @@
if (def.isSupportInbound())
{
System.out.print(rb.getString("ml.interface.name"));
- System.out.print("[" + def.getMlClass() + "] ");
+ System.out.print("[" + def.getMlClass() + "]: ");
String mlClassName = in.readLine();
if (mlClassName != null && !mlClassName.equals(""))
{
@@ -403,7 +403,7 @@
}
System.out.print(rb.getString("as.class.name"));
- System.out.print("[" + def.getAsClass() + "] ");
+ System.out.print("[" + def.getAsClass() + "]: ");
String asClassName = in.readLine();
if (asClassName != null && !asClassName.equals(""))
def.setAsClass(asClassName);
@@ -412,7 +412,7 @@
def.setAsConfigProps(asProps);
System.out.print(rb.getString("acti.class.name"));
- System.out.print("[" + def.getActivationClass() + "] ");
+ System.out.print("[" + def.getActivationClass() + "]: ");
String actiClassName = in.readLine();
if (actiClassName != null && !actiClassName.equals(""))
def.setActivationClass(actiClassName);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties 2010-06-29 03:29:31 UTC (rev 106300)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties 2010-06-29 07:23:46 UTC (rev 106301)
@@ -3,13 +3,13 @@
use.annotation=Use annotations [Y/Yes/N/No]:
use.ra=Include a ResourceAdapter [Y/Yes/N/No]:
package.name=Package name:
-ra.class.name=Resource adapter class name:
-mcf.class.name=Managed connection factory class name:
-mc.class.name=Managed connection class name:
-conn.interface.name=Connection interface name:
-conn.class.name=Connection implementation name:
-cf.interface.name=Connection factory interface name:
-cf.class.name=Connection factory class name:
+ra.class.name=Resource adapter class name
+mcf.class.name=Managed connection factory class name
+mc.class.name=Managed connection class name
+conn.interface.name=Connection interface name
+conn.class.name=Connection implementation name
+cf.interface.name=Connection factory interface name
+cf.class.name=Connection factory class name
ra.config.properties=Resource adapter config properties [enter to quit]:
mcf.config.properties=Managed connection factory config properties [enter to quit]:
config.properties.name=Name:
@@ -18,11 +18,11 @@
config.properties.value=Value:
config.properties.required=Required [Y/Yes/N/No]:
mcf.impl.raa=Use ResourceAdapterAssociation [Y/Yes/N/No]:
-mcf.use.cci=Use CCI [Y/Yes/N/No]:
-ml.interface.name=MessageListener interface name:
-as.class.name=ActivationSpec class name:
+mcf.use.cci=Use CCI [N/No/Y/Yes]:
+ml.interface.name=MessageListener interface name
+as.class.name=ActivationSpec class name
as.config.properties=ActivationSpec config properties [enter to quit]:
-acti.class.name=Activation class name:
+acti.class.name=Activation class name
support.transaction=Transaction support [N/NoTransaction/L/LocalTransaction/X/XATransaction]:
connection.method.support=Add methods to connection interface [Y/Yes/N/No]:
connection.method.name=Method name [enter to quit]:
More information about the jboss-cvs-commits
mailing list