[jboss-cvs] JBossAS SVN: r112698 - in projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main: java/org/jboss/jca/codegenerator/code and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 27 09:17:21 EST 2012
Author: jesper.pedersen
Date: 2012-02-27 09:17:19 -0500 (Mon, 27 Feb 2012)
New Revision: 112698
Modified:
projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java
projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java
projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java
projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/header.template
projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/pom.xml.template
Log:
Backport code generator improvements
Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java 2012-02-27 12:52:57 UTC (rev 112697)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java 2012-02-27 14:17:19 UTC (rev 112698)
@@ -433,18 +433,37 @@
{
try
{
- outputDir = outputDir + File.separatorChar + "src" + File.separatorChar +
+ String resourceDir = outputDir + File.separatorChar + "src" + File.separatorChar +
"main" + File.separatorChar + "resources";
- FileWriter ijfw = Utils.createFile("ironjacamar.xml", outputDir + File.separatorChar + "META-INF");
- IronjacamarXmlGen ijxGen = new IronjacamarXmlGen();
- ijxGen.generate(def, ijfw);
- ijfw.close();
+ writeIronjacamarXml(def, resourceDir);
+
+ if (def.getBuild().equals("maven"))
+ {
+ String rarDir = outputDir + File.separatorChar + "src" + File.separatorChar +
+ "main" + File.separatorChar + "rar";
+ writeIronjacamarXml(def, rarDir);
+ }
}
catch (IOException ioe)
{
ioe.printStackTrace();
}
}
+
+
+ /**
+ * writeIronjacamarXml
+ * @param def Definition
+ * @param outputDir output directory
+ * @throws IOException output exception
+ */
+ private void writeIronjacamarXml(Definition def, String outputDir) throws IOException
+ {
+ FileWriter ijfw = Utils.createFile("ironjacamar.xml", outputDir + File.separatorChar + "META-INF");
+ IronjacamarXmlGen ijxGen = new IronjacamarXmlGen();
+ ijxGen.generate(def, ijfw);
+ ijfw.close();
+ }
/**
* generate mbean deployment xml
Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java 2012-02-27 12:52:57 UTC (rev 112697)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java 2012-02-27 14:17:19 UTC (rev 112698)
@@ -26,9 +26,11 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
+import java.util.Set;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -60,7 +62,7 @@
String outputDir = "out"; //default output directory
String defxml = null;
int arg = 0;
-
+
if (args.length > 0)
{
while (args.length > arg + 1)
@@ -172,6 +174,7 @@
{
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
Definition def = new Definition();
+ Set<String> classes = new HashSet<String>();
//profile version
String version = null;
@@ -303,6 +306,7 @@
System.out.print(rb.getString("ra.class.name"));
System.out.print("[" + def.getRaClass() + "]: ");
String raClassName = in.readLine();
+ classes.add(raClassName);
if (raClassName != null && !raClassName.equals(""))
{
def.setRaClass(raClassName);
@@ -324,10 +328,15 @@
do
{
McfDef mcfdef = new McfDef(mcfID, def);
-
- System.out.print(rb.getString("mcf.class.name"));
- System.out.print("[" + mcfdef.getMcfClass() + "]: ");
- String mcfClassName = in.readLine();
+ String mcfClassName = "";
+ do
+ {
+ System.out.print(rb.getString("mcf.class.name"));
+ System.out.print("[" + mcfdef.getMcfClass() + "]: ");
+ mcfClassName = in.readLine();
+ }
+ while (classes.contains(mcfClassName) && !mcfClassName.equals(""));
+ classes.add(mcfClassName);
if (mcfClassName != null && !mcfClassName.equals(""))
{
mcfdef.setMcfClass(mcfClassName);
@@ -353,9 +362,16 @@
}
}
- System.out.print(rb.getString("mc.class.name"));
- System.out.print("[" + mcfdef.getMcClass() + "]: ");
- String mcClassName = in.readLine();
+ String mcClassName = "";
+ do
+ {
+ System.out.print(rb.getString("mc.class.name"));
+ System.out.print("[" + mcfdef.getMcClass() + "]: ");
+ mcClassName = in.readLine();
+ }
+ while (classes.contains(mcClassName) && !mcClassName.equals(""));
+ classes.add(mcClassName);
+
if (mcClassName != null && !mcClassName.equals(""))
mcfdef.setMcClass(mcClassName);
@@ -373,27 +389,51 @@
if (!mcfdef.isUseCciConnection())
{
- System.out.print(rb.getString("cf.interface.name"));
- System.out.print("[" + mcfdef.getCfInterfaceClass() + "]: ");
- String cfInterfaceName = in.readLine();
+ String cfInterfaceName = "";
+ do
+ {
+ System.out.print(rb.getString("cf.interface.name"));
+ System.out.print("[" + mcfdef.getCfInterfaceClass() + "]: ");
+ cfInterfaceName = in.readLine();
+ }
+ while (classes.contains(cfInterfaceName) && !cfInterfaceName.equals(""));
+ classes.add(cfInterfaceName);
if (cfInterfaceName != null && !cfInterfaceName.equals(""))
mcfdef.setCfInterfaceClass(cfInterfaceName);
- System.out.print(rb.getString("cf.class.name"));
- System.out.print("[" + mcfdef.getCfClass() + "]: ");
- String cfClassName = in.readLine();
+ String cfClassName = "";
+ do
+ {
+ System.out.print(rb.getString("cf.class.name"));
+ System.out.print("[" + mcfdef.getCfClass() + "]: ");
+ cfClassName = in.readLine();
+ }
+ while (classes.contains(cfClassName) && !cfClassName.equals(""));
+ classes.add(cfClassName);
if (cfClassName != null && !cfClassName.equals(""))
mcfdef.setCfClass(cfClassName);
-
- System.out.print(rb.getString("conn.interface.name"));
- System.out.print("[" + mcfdef.getConnInterfaceClass() + "]: ");
- String connInterfaceName = in.readLine();
+
+ String connInterfaceName = "";
+ do
+ {
+ System.out.print(rb.getString("conn.interface.name"));
+ System.out.print("[" + mcfdef.getConnInterfaceClass() + "]: ");
+ connInterfaceName = in.readLine();
+ }
+ while (classes.contains(connInterfaceName) && !connInterfaceName.equals(""));
+ classes.add(connInterfaceName);
if (connInterfaceName != null && !connInterfaceName.equals(""))
mcfdef.setConnInterfaceClass(connInterfaceName);
- System.out.print(rb.getString("conn.class.name"));
- System.out.print("[" + mcfdef.getConnImplClass() + "]: ");
- String connImplName = in.readLine();
+ String connImplName = "";
+ do
+ {
+ System.out.print(rb.getString("conn.class.name"));
+ System.out.print("[" + mcfdef.getConnImplClass() + "]: ");
+ connImplName = in.readLine();
+ }
+ while (classes.contains(connImplName) && !connImplName.equals(""));
+ classes.add(connImplName);
if (connImplName != null && !connImplName.equals(""))
mcfdef.setConnImplClass(connImplName);
@@ -432,10 +472,16 @@
//inbound
if (def.isSupportInbound())
{
+ String mlClassName = "";
+ do
+ {
+ System.out.print(rb.getString("ml.interface.name"));
+ System.out.print("[" + def.getMlClass() + "]: ");
+ mlClassName = in.readLine();
+ }
+ while (classes.contains(mlClassName) && !mlClassName.equals(""));
+ classes.add(mlClassName);
boolean defaultPackage = true;
- System.out.print(rb.getString("ml.interface.name"));
- System.out.print("[" + def.getMlClass() + "]: ");
- String mlClassName = in.readLine();
if (mlClassName != null && !mlClassName.equals(""))
{
def.setMlClass(mlClassName);
@@ -449,18 +495,30 @@
}
def.setDefaultPackageInbound(defaultPackage);
- System.out.print(rb.getString("as.class.name"));
- System.out.print("[" + def.getAsClass() + "]: ");
- String asClassName = in.readLine();
+ String asClassName = "";
+ do
+ {
+ System.out.print(rb.getString("as.class.name"));
+ System.out.print("[" + def.getAsClass() + "]: ");
+ asClassName = in.readLine();
+ }
+ while (classes.contains(asClassName) && !asClassName.equals(""));
+ classes.add(asClassName);
if (asClassName != null && !asClassName.equals(""))
def.setAsClass(asClassName);
List<ConfigPropType> asProps = inputProperties("as", in, true);
def.setAsConfigProps(asProps);
- System.out.print(rb.getString("acti.class.name"));
- System.out.print("[" + def.getActivationClass() + "]: ");
- String actiClassName = in.readLine();
+ String actiClassName = "";
+ do
+ {
+ System.out.print(rb.getString("acti.class.name"));
+ System.out.print("[" + def.getActivationClass() + "]: ");
+ actiClassName = in.readLine();
+ }
+ while (classes.contains(actiClassName) && !actiClassName.equals(""));
+ classes.add(actiClassName);
if (actiClassName != null && !actiClassName.equals(""))
def.setActivationClass(actiClassName);
}
@@ -497,9 +555,17 @@
{
String strOrder = numOfAo > 0 ? Integer.valueOf(numOfAo).toString() : "";
AdminObjectType aoType = new AdminObjectType();
- System.out.print(rb.getString("adminobject.interface.name"));
- System.out.print("[" + def.getDefaultValue() + strOrder + "AdminObjectInterface]: ");
- String aoInterfaceName = in.readLine();
+
+ String aoInterfaceName = "";
+ do
+ {
+ System.out.print(rb.getString("adminobject.interface.name"));
+ System.out.print("[" + def.getDefaultValue() + strOrder + "AdminObjectInterface]: ");
+ aoInterfaceName = in.readLine();
+ }
+ while (classes.contains(aoInterfaceName) && !aoInterfaceName.equals(""));
+ classes.add(aoInterfaceName);
+
if (aoInterfaceName != null && !aoInterfaceName.equals(""))
{
aoType.setAdminObjectInterface(aoInterfaceName);
@@ -509,9 +575,15 @@
aoType.setAdminObjectInterface(def.getDefaultValue() + strOrder + "AdminObjectInterface");
}
- System.out.print(rb.getString("adminobject.class.name"));
- System.out.print("[" + def.getDefaultValue() + strOrder + "AdminObjectImpl]: ");
- String aoClassName = in.readLine();
+ String aoClassName = "";
+ do
+ {
+ System.out.print(rb.getString("adminobject.class.name"));
+ System.out.print("[" + def.getDefaultValue() + strOrder + "AdminObjectImpl]: ");
+ aoClassName = in.readLine();
+ }
+ while (classes.contains(aoClassName) && !aoClassName.equals(""));
+ classes.add(aoClassName);
if (aoClassName != null && !aoClassName.equals(""))
{
aoType.setAdminObjectClass(aoClassName);
Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java 2012-02-27 12:52:57 UTC (rev 112697)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java 2012-02-27 14:17:19 UTC (rev 112698)
@@ -101,6 +101,14 @@
}
writeLeftCurlyBracket(out, 0);
int indent = 1;
+
+ writeIndent(out, indent);
+ out.write("/** Serial version uid */");
+ writeEol(out);
+ writeIndent(out, indent);
+ out.write("private static final long serialVersionUID = 1L;");
+ writeEol(out);
+ writeEol(out);
if (def.isAdminObjectImplRaAssociation())
{
Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java 2012-02-27 12:52:57 UTC (rev 112697)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java 2012-02-27 14:17:19 UTC (rev 112698)
@@ -247,7 +247,15 @@
out.write("/** Resource */");
writeEol(out);
writeIndent(out, indent);
- out.write("@Resource(mappedName = \"java:/eis/" + def.getMcfDefs().get(num).getMcfClass() + "\")");
+ if (def.getMcfDefs().get(num).isUseCciConnection())
+ {
+ out.write("@Resource(mappedName = \"java:/eis/" +
+ def.getMcfDefs().get(num).getCciConnFactoryClass() + "\")");
+ }
+ else
+ {
+ out.write("@Resource(mappedName = \"java:/eis/" + def.getMcfDefs().get(num).getCfInterfaceClass() + "\")");
+ }
writeEol(out);
writeIndent(out, indent);
if (def.getMcfDefs().get(num).isUseCciConnection())
Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java 2012-02-27 12:52:57 UTC (rev 112697)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java 2012-02-27 14:17:19 UTC (rev 112698)
@@ -68,11 +68,22 @@
strMcf.append(def.getRaPackage());
strMcf.append(".");
strMcf.append(def.getMcfDefs().get(num).getMcfClass());
- strMcf.append("\" enabled=\"true\" ");
- strMcf.append("jndi-name=\"java:/eis/");
- strMcf.append(def.getMcfDefs().get(num).getMcfClass());
- strMcf.append("\" use-java-context=\"true\" ");
- strMcf.append("pool-name=\"" + def.getMcfDefs().get(num).getMcfClass());
+ strMcf.append("\" ");
+
+ if (def.getMcfDefs().get(num).isUseCciConnection())
+ {
+ strMcf.append("jndi-name=\"java:/eis/");
+ strMcf.append(def.getMcfDefs().get(num).getCciConnFactoryClass());
+ strMcf.append("\" ");
+ strMcf.append("pool-name=\"" + def.getMcfDefs().get(num).getCciConnFactoryClass());
+ }
+ else
+ {
+ strMcf.append("jndi-name=\"java:/eis/");
+ strMcf.append(def.getMcfDefs().get(num).getCfInterfaceClass());
+ strMcf.append("\" ");
+ strMcf.append("pool-name=\"" + def.getMcfDefs().get(num).getCfInterfaceClass());
+ }
strMcf.append("\">\n");
StringBuilder strMcfProps = new StringBuilder();
@@ -94,8 +105,8 @@
strAo.append(def.getRaPackage());
strAo.append(".");
strAo.append(def.getAdminObjects().get(i).getAdminObjectClass());
- strAo.append("\" jndi-name=\"java:/");
- strAo.append(def.getAdminObjects().get(i).getAdminObjectClass());
+ strAo.append("\" jndi-name=\"java:/eis/ao/");
+ strAo.append(def.getAdminObjects().get(i).getAdminObjectInterface());
strAo.append("\">\n");
getPropsString(strAo, def.getAdminObjects().get(i).getAoConfigProps(), 6);
strAo.append(" </admin-object>\n");
Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/header.template
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/header.template 2012-02-27 12:52:57 UTC (rev 112697)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/header.template 2012-02-27 14:17:19 UTC (rev 112698)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/pom.xml.template
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/pom.xml.template 2012-02-27 12:52:57 UTC (rev 112697)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/pom.xml.template 2012-02-27 14:17:19 UTC (rev 112698)
@@ -17,6 +17,7 @@
<groupId>org.jboss.ironjacamar</groupId>
<artifactId>ironjacamar-spec-api</artifactId>
<version>${version.org.jboss.ironjacamar}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ironjacamar</groupId>
@@ -119,11 +120,40 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <excludes>
+ <exclude>**/META-INF/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-rar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <goals>
+ <goal>rar</goal>
+ </goals>
+ <configuration>
+ <raXmlFile>src/main/resources/META-INF/ra.xml</raXmlFile>
+ </configuration>
+ </execution></executions>
+ </plugin>
+
</plugins>
</build>
<repositories>
More information about the jboss-cvs-commits
mailing list