[overlord-commits] Overlord SVN: r548 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb: generator and 1 other directory.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Tue Mar 24 13:52:23 EDT 2009
Author: objectiser
Date: 2009-03-24 13:52:23 -0400 (Tue, 24 Mar 2009)
New Revision: 548
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java
Log:
Partial implementation of the generation of the JMS configuration for JBoss Messaging.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -358,8 +358,10 @@
public void okPressed() {
try {
+ GeneratorContext context=new GeneratorContext(getSelectedBuildSystem());
+
Generator generator=new Generator(m_file,
- getSelectedBuildSystem());
+ context);
for (int i=0; i < m_roles.size(); i++) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -26,7 +26,8 @@
private static final String ANT = "Ant";
private static final String ESB_CONFIG_PATH = "src/conf/jboss-esb.xml";
private static final String DEPLOYMENT_PATH = "src/conf/deployment.xml";
- private static final String JBMQ_CONFIG_PATH = "src/conf/jbmq-queue-service.xml";
+ private static final String JBOSSMQ_CONFIG_PATH = "src/conf/jbmq-queue-service.xml";
+ private static final String JBM_CONFIG_PATH = "src/conf/jbm-queue-service.xml";
private static final String JAVA_SOURCE_PATH = "src/java";
private static final String LIBRARY_PATH = "src/lib";
@@ -71,16 +72,26 @@
}
/**
- * This method returns the JBMQ configuration file
+ * This method returns the JBossMQ configuration file
* path.
*
- * @return The JBMQ configuration file path
+ * @return The JBossMQ configuration file path
*/
- public String getJBMQConfigFilePath() {
- return(JBMQ_CONFIG_PATH);
+ public String getJBossMQConfigFilePath() {
+ return(JBOSSMQ_CONFIG_PATH);
}
/**
+ * This method returns the JBM configuration file
+ * path.
+ *
+ * @return The JBM configuration file path
+ */
+ public String getJBMConfigFilePath() {
+ return(JBM_CONFIG_PATH);
+ }
+
+ /**
* This method returns the Java source path.
*
* @return The Java source path
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -35,15 +35,15 @@
*
* @param jproj The Java project
* @param model The model
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- ESBLanguageModel model, BuildSystem buildSystem)
+ ESBLanguageModel model, GeneratorContext context)
throws GeneratorException {
IPath buildConfigPath=jproj.getPath().append(
- new Path(buildSystem.getBuildFilePath()));
+ new Path(context.getBuildSystem().getBuildFilePath()));
IFile buildConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
@@ -53,7 +53,7 @@
buildConfigFile.create(null, true,
new org.eclipse.core.runtime.NullProgressMonitor());
- String config=buildSystem.getBuildFileContents(jproj.getProject().getName());
+ String config=context.getBuildSystem().getBuildFileContents(jproj.getProject().getName());
if (config != null) {
buildConfigFile.setContents(new java.io.ByteArrayInputStream(
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -65,14 +65,22 @@
public String getDeploymentFilePath();
/**
- * This method returns the JBMQ configuration file
+ * This method returns the JBossMQ configuration file
* path.
*
- * @return The JBMQ configuration file path
+ * @return The JBossMQ configuration file path
*/
- public String getJBMQConfigFilePath();
+ public String getJBossMQConfigFilePath();
/**
+ * This method returns the JBM configuration file
+ * path.
+ *
+ * @return The JBM configuration file path
+ */
+ public String getJBMConfigFilePath();
+
+ /**
* This method returns the Java source path.
*
* @return The Java source path
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -65,14 +65,14 @@
*
* @param jproj The Java project
* @param conversation The conversation
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- Conversation conversation, BuildSystem buildSystem)
+ Conversation conversation, GeneratorContext context)
throws GeneratorException {
IPath sourceLocation=jproj.getPath().append(
- new Path(buildSystem.getJavaSourcePath()));
+ new Path(context.getBuildSystem().getJavaSourcePath()));
String javaClass=ConversationUtil.getBusinessObjectType(conversation);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -32,11 +32,11 @@
*
* @param jproj The Java project
* @param conversation The conversation
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- Conversation conversation, BuildSystem buildSystem)
+ Conversation conversation, GeneratorContext context)
throws GeneratorException;
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -38,16 +38,16 @@
*
* @param jproj The Java project
* @param model The model
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- ESBLanguageModel model, BuildSystem buildSystem)
+ ESBLanguageModel model, GeneratorContext context)
throws GeneratorException {
try {
IPath deploymentPath=jproj.getPath().append(
- new Path(buildSystem.getDeploymentFilePath()));
+ new Path(context.getBuildSystem().getDeploymentFilePath()));
IFile deploymentFile=jproj.getProject().getWorkspace().getRoot().getFile(deploymentPath);
GeneratorUtil.createParentFolder(deploymentFile);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -55,9 +55,9 @@
* This is the constructor for the generator.
*
*/
- public Generator(IFile file, BuildSystem buildSystem) {
+ public Generator(IFile file, GeneratorContext context) {
m_file = file;
- m_buildSystem = buildSystem;
+ m_context = context;
initialize(m_file);
}
@@ -241,7 +241,7 @@
for (int i=0; i < m_conversationBasedGen.size(); i++) {
try {
m_conversationBasedGen.get(i).generate(jproj,
- (Conversation)obj, getBuildSystem());
+ (Conversation)obj, getContext());
} catch(GeneratorException e) {
logger.log(java.util.logging.Level.SEVERE,
"Failed to generate conversation based artefact",
@@ -256,7 +256,7 @@
// Store ESB configuration
IPath esbConfigPath=jproj.getPath().append(
- new Path(getBuildSystem().getESBConfigFilePath()));
+ new Path(getContext().getBuildSystem().getESBConfigFilePath()));
IFile esbConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(esbConfigPath);
GeneratorUtil.createParentFolder(esbConfigFile);
@@ -274,7 +274,7 @@
for (int i=0; i < m_modelBasedGen.size(); i++) {
try {
m_modelBasedGen.get(i).generate(jproj, model,
- getBuildSystem());
+ getContext());
} catch(GeneratorException e) {
logger.log(java.util.logging.Level.SEVERE,
"Failed to generate model based artefact",
@@ -318,11 +318,12 @@
IPath outputLocation=jproj.getPath().append(new Path(OUTPUT_LOCATION));
IPath classpathLocation=jproj.getPath().append(new Path(CLASSPATH_FILENAME));
IPath sourceLocation=jproj.getPath().append(
- new Path(getBuildSystem().getJavaSourcePath()));
+ new Path(getContext().getBuildSystem().getJavaSourcePath()));
IPath libLocation=null;
- if (getBuildSystem().getLibraryPath() != null) {
- libLocation=jproj.getPath().append(new Path(getBuildSystem().getLibraryPath()));
+ if (getContext().getBuildSystem().getLibraryPath() != null) {
+ libLocation=jproj.getPath().append(
+ new Path(getContext().getBuildSystem().getLibraryPath()));
}
// create and set the output and source paths first
@@ -499,8 +500,8 @@
return(ret);
}
- public BuildSystem getBuildSystem() {
- return(m_buildSystem);
+ public GeneratorContext getContext() {
+ return(m_context);
}
private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
@@ -508,7 +509,7 @@
private IFile m_file=null;
private java.util.List<Role> m_roles=null;
private ConversationModel m_conversationModel=null;
- private BuildSystem m_buildSystem=null;
+ private GeneratorContext m_context=null;
private java.util.List<ConversationBasedGenerator> m_conversationBasedGen=
new java.util.Vector<ConversationBasedGenerator>();
private java.util.List<ModelBasedGenerator> m_modelBasedGen=
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+/**
+ * This class provides context information used by the
+ * generator.
+ */
+public class GeneratorContext {
+
+ /**
+ * This is the constructor for the generator context.
+ *
+ * @param buildSystem The build system
+ */
+ public GeneratorContext(BuildSystem buildSystem) {
+ m_buildSystem = buildSystem;
+ }
+
+ /**
+ * This method returns the build system.
+ *
+ * @return The build system
+ */
+ public BuildSystem getBuildSystem() {
+ return(m_buildSystem);
+ }
+
+ private BuildSystem m_buildSystem=null;
+}
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+import java.util.logging.Logger;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
+
+/**
+ * This class implements the model based generator to generate
+ * the JBMQ configuration.
+ */
+public class JBMConfigurationGenerator implements ModelBasedGenerator {
+
+ /**
+ * This method generates the relevant artefacts based on
+ * the supplied model, within the specified Java project.
+ *
+ * @param jproj The Java project
+ * @param model The model
+ * @param context The generator context
+ * @throws GeneratorException Failed to generate
+ */
+ public void generate(IJavaProject jproj,
+ ESBLanguageModel model, GeneratorContext context)
+ throws GeneratorException {
+ IPath buildConfigPath=jproj.getPath().append(
+ new Path(context.getBuildSystem().getJBMConfigFilePath()));
+
+ IFile jbmqConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
+ GeneratorUtil.createParentFolder(jbmqConfigFile);
+
+ try {
+ jbmqConfigFile.create(null, true,
+ new org.eclipse.core.runtime.NullProgressMonitor());
+
+ StringBuffer buf=new StringBuffer();
+ buf.append("<server>\r\n");
+
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while (iter.hasNext()) {
+ ESBService service=iter.next();
+
+ String dest=model.getJMSDefinition(service.getJMSBusIdRef());
+
+ if (dest != null) {
+ buf.append("\t<mbean code=\"org.jboss.jms.server.destination.QueueService\"\r\n");
+ buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\"\r\n");
+ buf.append("\t\t\txmbean-dd=\"xmdesc/Queue-xmbean.xml\">\r\n");
+ buf.append("\t\t<depends optional-attribute-name=\"ServerPeer\">\r\n");
+ buf.append("\t\t\tjboss.messaging:service=ServerPeer\r\n");
+ buf.append("\t\t</depends>\r\n");
+ buf.append("\t\t<depends>jboss.messaging:service=PostOffice</depends>\r\n");
+ buf.append("\t</mbean>\r\n");
+ } else {
+ logger.severe("Failed to find destination for JMS bus id '"+
+ service.getJMSBusIdRef()+"'");
+ }
+ }
+
+ buf.append("</server>\r\n");
+
+ jbmqConfigFile.setContents(new java.io.ByteArrayInputStream(
+ buf.toString().getBytes()), true, false,
+ new org.eclipse.core.runtime.NullProgressMonitor());
+ } catch(Exception e) {
+ throw new GeneratorException("Failed to save JBM configuration", e);
+ }
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -38,14 +38,14 @@
*
* @param jproj The Java project
* @param model The model
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- ESBLanguageModel model, BuildSystem buildSystem)
+ ESBLanguageModel model, GeneratorContext context)
throws GeneratorException {
IPath buildConfigPath=jproj.getPath().append(
- new Path(buildSystem.getJBMQConfigFilePath()));
+ new Path(context.getBuildSystem().getJBossMQConfigFilePath()));
IFile jbmqConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
GeneratorUtil.createParentFolder(jbmqConfigFile);
@@ -83,7 +83,7 @@
buf.toString().getBytes()), true, false,
new org.eclipse.core.runtime.NullProgressMonitor());
} catch(Exception e) {
- throw new GeneratorException("Failed to save JBMQ configuration", e);
+ throw new GeneratorException("Failed to save JBossMQ configuration", e);
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -26,7 +26,8 @@
private static final String MAVEN = "Maven";
private static final String ESB_CONFIG_PATH = "src/main/resources/META-INF/jboss-esb.xml";
private static final String DEPLOYMENT_PATH = "src/main/resources/META-INF/deployment.xml";
- private static final String JBMQ_CONFIG_PATH = "src/main/resources/jbmq-queue-service.xml";
+ private static final String JBOSSMQ_CONFIG_PATH = "src/main/resources/jbmq-queue-service.xml";
+ private static final String JBM_CONFIG_PATH = "src/main/resources/jbm-queue-service.xml";
private static final String JAVA_SOURCE_PATH = "src/main/java";
private static final String LIBRARY_PATH = null;
@@ -71,16 +72,26 @@
}
/**
- * This method returns the JBMQ configuration file
+ * This method returns the JBossMQ configuration file
* path.
*
- * @return The JBMQ configuration file path
+ * @return The JBossMQ configuration file path
*/
- public String getJBMQConfigFilePath() {
- return(JBMQ_CONFIG_PATH);
+ public String getJBossMQConfigFilePath() {
+ return(JBOSSMQ_CONFIG_PATH);
}
/**
+ * This method returns the JBM configuration file
+ * path.
+ *
+ * @return The JBM configuration file path
+ */
+ public String getJBMConfigFilePath() {
+ return(JBM_CONFIG_PATH);
+ }
+
+ /**
* This method returns the Java source path.
*
* @return The Java source path
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -32,11 +32,11 @@
*
* @param jproj The Java project
* @param model The model
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- ESBLanguageModel model, BuildSystem buildSystem)
+ ESBLanguageModel model, GeneratorContext context)
throws GeneratorException;
}
More information about the overlord-commits
mailing list