Overlord SVN: r640 - in cdl/trunk/tools/plugins: org.jboss.tools.overlord.cdl.bpel/META-INF and 16 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-05-11 17:06:51 -0400 (Mon, 11 May 2009)
New Revision: 640
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELModelParserRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELTokenizer.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBModelParserRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBTokenizer.java
Removed:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELParser.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/META-INF/MANIFEST.MF
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/plugin.xml
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/actions/GenerateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/META-INF/MANIFEST.MF
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/plugin.xml
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/actions/GenerateAction.java
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/editor/JBossESBConfigEditorManager.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.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/model/util/ClasspathUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java
Log:
Updated to use plugins as OSGi services, and changed to use DefaultParser rather than specialising it for ESB and BPEL use.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/META-INF/MANIFEST.MF
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/META-INF/MANIFEST.MF 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/META-INF/MANIFEST.MF 2009-05-11 21:06:51 UTC (rev 640)
@@ -10,7 +10,7 @@
org.scribble.core,
org.scribble.lang.model,
org.eclipse.core.resources,
- org.scribble.osgi,
+ org.scribble.eclipse,
org.eclipse.jdt.core,
org.junit,
org.scribble.conversation.parser,
@@ -19,7 +19,8 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: www.jboss.org
-Scribble-Extensions: org.jboss.tools.overlord.cdl.bpel.parser.BPELParser,
+Scribble-Extensions: org.jboss.tools.overlord.cdl.bpel.parser.BPELTokenizer,
+ org.jboss.tools.overlord.cdl.bpel.parser.BPELModelParserRule,
org.jboss.tools.overlord.cdl.bpel.model.BPELNotation,
org.jboss.tools.overlord.cdl.bpel.model.change.LanguageToConversationModelChangeRule,
org.jboss.tools.overlord.cdl.bpel.model.change.ConversationModelChangeRule,
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/plugin.xml
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/plugin.xml 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/plugin.xml 2009-05-11 21:06:51 UTC (rev 640)
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
- <extension
- id="org.jboss.tools.overlord.cdl.bpel.extension"
- name="Overlord CDL BPEL model extension"
- point="org.scribble.extension">
- </extension>
<extension point="org.eclipse.ui.popupMenus">
<objectContribution
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/actions/GenerateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/actions/GenerateAction.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/actions/GenerateAction.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -28,7 +28,7 @@
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
-import org.scribble.osgi.util.*;
+import org.scribble.eclipse.util.*;
import org.jboss.tools.overlord.cdl.bpel.dialogs.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -62,7 +62,7 @@
*/
protected void initialize(IFile res) {
ModelReference ref=
- org.scribble.osgi.model.admin.OSGIModelRepository.createReference(res);
+ org.scribble.eclipse.model.admin.OSGIModelRepository.createReference(res);
if (ref != null) {
ModelRepository mrep=(ModelRepository)
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -25,7 +25,8 @@
import org.scribble.export.ExportRule;
import org.scribble.export.ExporterContext;
import org.scribble.export.Formatter;
-import org.scribble.export.stream.DefaultModelStreamExportRule;
+import org.scribble.export.stream.AbstractModelStreamExportRule;
+import org.scribble.export.stream.StreamFormatter;
import org.scribble.extensions.RegistryInfo;
import org.scribble.model.ModelObject;
@@ -34,7 +35,7 @@
* BPELLanguageModel entity.
*/
@RegistryInfo(extension=ExportRule.class,notation=BPELNotation.NOTATION_CODE)
-public class BPELLanguageModelStreamExportRule extends DefaultModelStreamExportRule {
+public class BPELLanguageModelStreamExportRule extends AbstractModelStreamExportRule {
/**
* This method determines whether the exporter rule is appropriate
@@ -60,10 +61,11 @@
public void export(ModelObject modelObject, ExporterContext context)
throws java.io.IOException {
BPELLanguageModel model=(BPELLanguageModel)modelObject;
+ StreamFormatter formatter=(StreamFormatter)context.getFormatter();
try {
String text=XMLUtils.toText(model.getBPELProcess().getDOMElement());
- context.getFormatter().record(text.getBytes());
+ formatter.record(text.getBytes());
} catch(Exception e) {
throw new java.io.IOException("Failed to get BPEL process text");
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -59,7 +59,7 @@
// Initialize the model
ModelReference ref=
- org.scribble.osgi.model.admin.OSGIModelRepository.createReference(res);
+ org.scribble.eclipse.model.admin.OSGIModelRepository.createReference(res);
if (ref != null) {
ModelRepository mrep=(ModelRepository)
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELModelParserRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELModelParserRule.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELModelParserRule.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -0,0 +1,111 @@
+/*
+ * 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.bpel.parser;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.scribble.extensions.RegistryInfo;
+import org.scribble.model.Model;
+import org.scribble.model.admin.ModelListener;
+import org.scribble.parser.ParserContext;
+import org.scribble.parser.ParserRule;
+import org.scribble.parser.Token;
+import org.jboss.tools.overlord.cdl.bpel.model.BPELNotation;
+import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel;
+
+/**
+ * This class provides the model parser for the BPEL notation.
+ *
+ */
+(a)RegistryInfo(extension=ParserRule.class,notation=BPELNotation.NOTATION_CODE)
+public class BPELModelParserRule extends org.scribble.conversation.parser.ConversationModelParserRule {
+
+ /**
+ * The default constructor.
+ */
+ public BPELModelParserRule() {
+ //super(ParserRuleType.File);
+ }
+
+ /**
+ * This method determines whether the parser rules is
+ * appropriate to return a model object of the required
+ * type.
+ *
+ * @param type The required type
+ * @return Whether the parser rule returns a
+ * model object of the required type
+ */
+ public boolean isSupported(Class<?> type) {
+ return(type.isAssignableFrom(Model.class));
+ }
+
+ /**
+ * This method parses the description to obtain
+ * a model object of the appropriate type.
+ *
+ * @param context The context
+ * @param l The listener
+ * @return The model object
+ */
+ public Object parse(ParserContext context, ModelListener l) {
+ DefaultBPELLanguageModel ret=null;
+
+ Token t=context.nextToken();
+
+ if (t != null && t.getObject() instanceof String) {
+ try {
+ String str=(String)t.getObject();
+
+ // Transform the text representation to DOM
+ DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance();
+ fact.setNamespaceAware(true);
+
+ DocumentBuilder builder=fact.newDocumentBuilder();
+
+ // Need to load original input stream and then
+ // provide a second input stream, as some input stream
+ // implementations don't support 'reset' operation,
+ // and therefore this was the only way to extract the
+ // content and also provide the stream to the XML
+ // document builder.
+ java.io.ByteArrayInputStream bais=
+ new java.io.ByteArrayInputStream(str.getBytes());
+
+ org.w3c.dom.Document doc=builder.parse(bais);
+
+ // Identify the model associated with the
+ // changed resource
+ ret = new DefaultBPELLanguageModel(context.getSource(),
+ doc.getDocumentElement(), str);
+
+ } catch(Exception e) {
+ logger.log(Level.SEVERE,
+ "Failed to load model", e);
+ }
+ }
+
+ return(ret);
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.bpel.parser");
+}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELParser.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELParser.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELParser.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -1,88 +0,0 @@
-/*
- * 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.bpel.parser;
-
-import java.io.InputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.scribble.model.*;
-import org.scribble.model.admin.ModelListener;
-import org.apache.log4j.Logger;
-import org.jboss.tools.overlord.cdl.bpel.model.*;
-import org.scribble.extensions.*;
-import org.scribble.parser.Parser;
-
-/**
- * This BPEL implementation of the Parser interface.
- *
- * @author gary
- */
-(a)RegistryInfo(extension=Parser.class,notation=BPELNotation.NOTATION_CODE)
-public class BPELParser extends org.scribble.conversation.parser.ConversationParser {
-
- /**
- * This method parses the source located using the supplied
- * scribble reference, to return a model. If any
- * errors are detected, they will be reported to the parser
- * listener.
- *
- * @param ref The scribble source reference
- * @param is The input stream
- * @param l The model listener
- * @return The model, or null if not found
- */
- public Model parse(ModelReference ref, InputStream is,
- ModelListener l) {
- DefaultBPELLanguageModel ret=null;
-
- try {
- // Transform the text representation to DOM
- DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance();
- fact.setNamespaceAware(true);
-
- DocumentBuilder builder=fact.newDocumentBuilder();
-
- byte[] b=new byte[is.available()];
- is.read(b);
-
- // Need to load original input stream and then
- // provide a second input stream, as some input stream
- // implementations don't support 'reset' operation,
- // and therefore this was the only way to extract the
- // content and also provide the stream to the XML
- // document builder.
- java.io.ByteArrayInputStream bais=new java.io.ByteArrayInputStream(b);
-
- org.w3c.dom.Document doc=builder.parse(bais);
-
- // Identify the model associated with the
- // changed resource
- ret = new DefaultBPELLanguageModel(ref, doc.getDocumentElement(),
- new String(b));
-
- } catch(Exception e) {
- logger.error("Failed to load model", e);
- }
-
- return(ret);
- }
-
- private static Logger logger = Logger.getLogger(BPELParser.class);
-}
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELTokenizer.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELTokenizer.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELTokenizer.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -0,0 +1,59 @@
+/*
+ * 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.bpel.parser;
+
+import org.jboss.tools.overlord.cdl.bpel.model.BPELNotation;
+import org.scribble.extensions.RegistryInfo;
+import org.scribble.model.ModelReference;
+import org.scribble.parser.*;
+
+/**
+ * This is the BPEL based implementation of the tokenizer
+ * interface.
+ */
+(a)RegistryInfo(extension=Tokenizer.class,notation=BPELNotation.NOTATION_CODE)
+public class BPELTokenizer extends DefaultTokenizer {
+
+ /**
+ * The default constructor.
+ */
+ public BPELTokenizer() {
+ }
+
+ /**
+ * This method obtains a list of tokens based on the
+ * contents of the input stream.
+ *
+ * @param ref The model reference for the input source
+ * @param is The input stream
+ * @return The list of tokens
+ * @throws java.io.IOException Failed to derive
+ */
+ public java.util.List<Token> getTokens(ModelReference ref,
+ java.io.InputStream is) throws java.io.IOException {
+ java.util.List<Token> ret=new java.util.Vector<Token>();
+
+ byte[] b=new byte[is.available()];
+ is.read(b);
+
+ Token t=new Token(new String(b));
+ ret.add(t);
+
+ return(ret);
+ }
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -88,7 +88,7 @@
result.addError(this,
new Throwable("Unable to locate resource: "+filename));
} else {
- org.scribble.parser.Parser p=new org.scribble.conversation.parser.ConversationParser();
+ org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser();
org.scribble.model.ModelReference ref=
new org.scribble.model.ModelReference(ConversationNotation.NOTATION_CODE);
org.scribble.model.admin.ModelListener l=
@@ -233,7 +233,7 @@
result.addError(this,
new Throwable("Unable to locate resource: "+filename));
} else {
- org.scribble.parser.Parser p=new org.pi4soa.scribble.cdm.parser.CDMParser();
+ org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser();
org.scribble.model.ModelReference ref=
new org.scribble.model.ModelReference(CDMNotation.NOTATION_CODE);
org.scribble.model.admin.ModelListener l=
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/META-INF/MANIFEST.MF
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/META-INF/MANIFEST.MF 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/META-INF/MANIFEST.MF 2009-05-11 21:06:51 UTC (rev 640)
@@ -10,7 +10,7 @@
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jdt.core,
- org.scribble.osgi,
+ org.scribble.eclipse,
org.scribble.conversation.model,
org.scribble.lang.model,
org.scribble.core,
@@ -21,7 +21,8 @@
org.eclipse.ui.editors,
org.scribble.conversation.parser,
org.junit
-Scribble-Extensions: org.jboss.tools.overlord.cdl.runtime.jbossesb.parser.JBossESBParser,
+Scribble-Extensions: org.jboss.tools.overlord.cdl.runtime.jbossesb.parser.JBossESBTokenizer,
+ org.jboss.tools.overlord.cdl.runtime.jbossesb.parser.JBossESBModelParserRule,
org.jboss.tools.overlord.cdl.runtime.jbossesb.model.JBossESBNotation,
org.jboss.tools.overlord.cdl.runtime.jbossesb.editor.JBossESBConfigEditorManager,
org.jboss.tools.overlord.cdl.runtime.jbossesb.validation.ESBLanguageModelValidationRule,
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/plugin.xml
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/plugin.xml 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/plugin.xml 2009-05-11 21:06:51 UTC (rev 640)
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
- <extension
- id="org.jboss.tools.overlord.cdl.runtime.jbossesb.extension"
- name="Overlord CDL Runtime JBossESB model extension"
- point="org.scribble.extension">
- </extension>
<extension point="org.eclipse.ui.popupMenus">
<objectContribution
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/actions/GenerateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/actions/GenerateAction.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/actions/GenerateAction.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -29,7 +29,7 @@
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
-import org.scribble.osgi.util.*;
+import org.scribble.eclipse.util.*;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.dialogs.*;
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-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -66,7 +66,7 @@
*/
protected void initialize(IFile res) {
ModelReference ref=
- org.scribble.osgi.model.admin.OSGIModelRepository.createReference(res);
+ org.scribble.eclipse.model.admin.OSGIModelRepository.createReference(res);
if (ref != null) {
ModelRepository mrep=(ModelRepository)
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -45,10 +45,10 @@
java.util.Map<String,Object> props) {
String uri=null;
org.eclipse.core.resources.IFile file=
- org.scribble.osgi.model.admin.OSGIModelRepository.getFile(mref);
+ org.scribble.eclipse.model.admin.OSGIModelRepository.getFile(mref);
if (file == null || file.exists() == false) {
- file = org.scribble.osgi.model.admin.OSGIModelRepository.getGlobalFile(mref);
+ file = org.scribble.eclipse.model.admin.OSGIModelRepository.getGlobalFile(mref);
}
if (file != null && file.exists()) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -34,7 +34,7 @@
* ESBLanguageModel entity.
*/
@RegistryInfo(extension=ExportRule.class,notation=JBossESBNotation.NOTATION_CODE)
-public class ESBLanguageModelStreamExportRule extends DefaultModelStreamExportRule {
+public class ESBLanguageModelStreamExportRule extends AbstractModelStreamExportRule {
/**
* This method determines whether the exporter rule is appropriate
@@ -60,11 +60,12 @@
public void export(ModelObject modelObject, ExporterContext context)
throws java.io.IOException {
ESBLanguageModel model=(ESBLanguageModel)modelObject;
+ StreamFormatter formatter=(StreamFormatter)context.getFormatter();
try {
String text=getText(model.getESBConfiguration());
- context.getFormatter().record(text.getBytes());
+ formatter.record(text.getBytes());
} catch(Exception e) {
throw new java.io.IOException("Failed to get ESB configuration text");
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-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -78,7 +78,7 @@
// Initialize the model
ModelReference ref=
- org.scribble.osgi.model.admin.OSGIModelRepository.createReference(res);
+ org.scribble.eclipse.model.admin.OSGIModelRepository.createReference(res);
if (ref != null) {
ModelRepository mrep=(ModelRepository)
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ClasspathUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ClasspathUtil.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ClasspathUtil.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -18,7 +18,7 @@
package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
import org.scribble.model.*;
-import org.scribble.osgi.model.admin.OSGIModelRepository;
+import org.scribble.eclipse.model.admin.OSGIModelRepository;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBModelParserRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBModelParserRule.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBModelParserRule.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -0,0 +1,111 @@
+/*
+ * 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.parser;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.scribble.extensions.RegistryInfo;
+import org.scribble.model.Model;
+import org.scribble.model.admin.ModelListener;
+import org.scribble.parser.ParserContext;
+import org.scribble.parser.ParserRule;
+import org.scribble.parser.Token;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBLanguageModel;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.JBossESBNotation;
+
+/**
+ * This class provides the model parser for the JBossESB notation.
+ *
+ */
+(a)RegistryInfo(extension=ParserRule.class,notation=JBossESBNotation.NOTATION_CODE)
+public class JBossESBModelParserRule extends org.scribble.conversation.parser.ConversationModelParserRule {
+
+ /**
+ * The default constructor.
+ */
+ public JBossESBModelParserRule() {
+ //super(ParserRuleType.File);
+ }
+
+ /**
+ * This method determines whether the parser rules is
+ * appropriate to return a model object of the required
+ * type.
+ *
+ * @param type The required type
+ * @return Whether the parser rule returns a
+ * model object of the required type
+ */
+ public boolean isSupported(Class<?> type) {
+ return(type.isAssignableFrom(Model.class));
+ }
+
+ /**
+ * This method parses the description to obtain
+ * a model object of the appropriate type.
+ *
+ * @param context The context
+ * @param l The listener
+ * @return The model object
+ */
+ public Object parse(ParserContext context, ModelListener l) {
+ DefaultESBLanguageModel ret=null;
+
+ Token t=context.nextToken();
+
+ if (t != null && t.getObject() instanceof String) {
+ try {
+ String str=(String)t.getObject();
+
+ // Transform the text representation to DOM
+ DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance();
+ fact.setNamespaceAware(true);
+
+ DocumentBuilder builder=fact.newDocumentBuilder();
+
+ // Need to load original input stream and then
+ // provide a second input stream, as some input stream
+ // implementations don't support 'reset' operation,
+ // and therefore this was the only way to extract the
+ // content and also provide the stream to the XML
+ // document builder.
+ java.io.ByteArrayInputStream bais=
+ new java.io.ByteArrayInputStream(str.getBytes());
+
+ org.w3c.dom.Document doc=builder.parse(bais);
+
+ // Identify the model associated with the
+ // changed resource
+ ret = new DefaultESBLanguageModel(context.getSource(),
+ doc.getDocumentElement(), str);
+
+ } catch(Exception e) {
+ logger.log(Level.SEVERE,
+ "Failed to load model", e);
+ }
+ }
+
+ return(ret);
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.parser");
+}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -1,91 +0,0 @@
-/*
- * 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.parser;
-
-import java.io.InputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.scribble.model.*;
-import org.scribble.model.admin.ModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.scribble.extensions.*;
-import org.scribble.parser.Parser;
-
-/**
- * This JBossESB implementation of the Parser interface.
- *
- * @author gary
- */
-(a)RegistryInfo(extension=Parser.class,notation=JBossESBNotation.NOTATION_CODE)
-public class JBossESBParser extends org.scribble.conversation.parser.ConversationParser {
-
- /**
- * This method parses the source located using the supplied
- * scribble reference, to return a model. If any
- * errors are detected, they will be reported to the parser
- * listener.
- *
- * @param ref The scribble source reference
- * @param is The input stream
- * @param l The model listener
- * @return The model, or null if not found
- */
- public Model parse(ModelReference ref, InputStream is,
- ModelListener l) {
- DefaultESBLanguageModel ret=null;
-
- try {
- // Transform the text representation to DOM
- DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance();
- fact.setNamespaceAware(true);
-
- DocumentBuilder builder=fact.newDocumentBuilder();
-
- byte[] b=new byte[is.available()];
- is.read(b);
-
- // Need to load original input stream and then
- // provide a second input stream, as some input stream
- // implementations don't support 'reset' operation,
- // and therefore this was the only way to extract the
- // content and also provide the stream to the XML
- // document builder.
- java.io.ByteArrayInputStream bais=
- new java.io.ByteArrayInputStream(b);
-
- org.w3c.dom.Document doc=builder.parse(bais);
-
- // Identify the model associated with the
- // changed resource
- ret = new DefaultESBLanguageModel(ref, doc.getDocumentElement(),
- new String(b));
-
- } catch(Exception e) {
- logger.log(Level.SEVERE,
- "Failed to load model", e);
- }
-
- return(ret);
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.parser");
-}
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBTokenizer.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBTokenizer.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBTokenizer.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -0,0 +1,59 @@
+/*
+ * 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.parser;
+
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.JBossESBNotation;
+import org.scribble.extensions.RegistryInfo;
+import org.scribble.model.ModelReference;
+import org.scribble.parser.*;
+
+/**
+ * This is the JBossESB based implementation of the tokenizer
+ * interface.
+ */
+(a)RegistryInfo(extension=Tokenizer.class,notation=JBossESBNotation.NOTATION_CODE)
+public class JBossESBTokenizer extends DefaultTokenizer {
+
+ /**
+ * The default constructor.
+ */
+ public JBossESBTokenizer() {
+ }
+
+ /**
+ * This method obtains a list of tokens based on the
+ * contents of the input stream.
+ *
+ * @param ref The model reference for the input source
+ * @param is The input stream
+ * @return The list of tokens
+ * @throws java.io.IOException Failed to derive
+ */
+ public java.util.List<Token> getTokens(ModelReference ref,
+ java.io.InputStream is) throws java.io.IOException {
+ java.util.List<Token> ret=new java.util.Vector<Token>();
+
+ byte[] b=new byte[is.available()];
+ is.read(b);
+
+ Token t=new Token(new String(b));
+ ret.add(t);
+
+ return(ret);
+ }
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java 2009-05-05 10:43:37 UTC (rev 639)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java 2009-05-11 21:06:51 UTC (rev 640)
@@ -72,7 +72,7 @@
result.addError(this,
new Throwable("Unable to locate resource: "+filename));
} else {
- org.scribble.parser.Parser p=new org.scribble.conversation.parser.ConversationParser();
+ org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser();
org.scribble.model.ModelReference ref=
new org.scribble.model.ModelReference(ConversationNotation.NOTATION_CODE);
org.scribble.model.admin.DefaultModelListener l=
15 years, 1 month
- 1
- 0
Overlord SVN: r639 - cdl/tags.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-05 06:43:37 -0400 (Tue, 05 May 2009)
New Revision: 639
Added:
cdl/tags/1.0-M2/
Log:
2nd try for 1.0-M2 release.
Copied: cdl/tags/1.0-M2 (from rev 638, cdl/trunk)
15 years, 1 month
- 1
- 0
Overlord SVN: r638 - cdl/tags.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-05 06:40:48 -0400 (Tue, 05 May 2009)
New Revision: 638
Removed:
cdl/tags/1.0-M2/
Log:
Remove the obsolete 1.0-M2 tag.
15 years, 1 month
- 1
- 0
Overlord SVN: r637 - in cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main: resources/META-INF and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-05 06:39:08 -0400 (Tue, 05 May 2009)
New Revision: 637
Added:
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/ResetMemoryStoreAction.java
Modified:
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryStore.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml
Log:
Fix the stateless broker example. (so that it can be running mulitple times)
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryStore.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryStore.java 2009-05-05 08:22:26 UTC (rev 636)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryStore.java 2009-05-05 10:39:08 UTC (rev 637)
@@ -38,5 +38,9 @@
public static int getCounter() {
return counter;
}
+
+ public static void reset() {
+ counter = 0;
+ }
}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/ResetMemoryStoreAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/ResetMemoryStoreAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/ResetMemoryStoreAction.java 2009-05-05 10:39:08 UTC (rev 637)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., 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.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+public class ResetMemoryStoreAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(ResetMemoryStoreAction.class);
+
+ private ConfigTree config;
+
+ public ResetMemoryStoreAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+ MemoryStore.reset();
+ logger.info("Reseting the memory store counter to 0");
+ return(message);
+ }
+
+}
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java 2009-05-05 08:22:26 UTC (rev 636)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java 2009-05-05 10:39:08 UTC (rev 637)
@@ -43,11 +43,9 @@
public Message process(Message message) throws Exception {
Node node = XMLUtils.getNode((String)message.getBody().get());
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
- String supplier = (String) message.getProperties().getProperty("supplierDesc");
- String quoteValue = (String)message.getProperties().getProperty("quoteValue");
- message.getBody().add("<orderConfirmed id=\"" + idValue +"\" supplierDesc=\""
- + supplier+"\" quoteValue=\"" + quoteValue + "\"></orderConfirmed>");
+ message.getBody().add("<orderConfirmed id=\"" + idValue +"\" supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\" quoteValue=\"10\">" +
+ "</orderConfirmed>");
logger.info(message.getBody().get());
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java 2009-05-05 08:22:26 UTC (rev 636)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java 2009-05-05 10:39:08 UTC (rev 637)
@@ -48,7 +48,7 @@
message.getBody().add("<requestForQuote id=\"" + idValue +"\" supplierDesc=\"" + serviceDescription+ "\" ></requestForQuote>");
- logger.info("Set 'requestForQuote' : "+message);
+ logger.info("Set 'requestForQuote' : " + message.getBody().get());
return message;
}
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-05-05 08:22:26 UTC (rev 636)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-05-05 10:39:08 UTC (rev 637)
@@ -82,6 +82,8 @@
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.MemoryEPRStorage" />
</action>
+ <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.ResetMemoryStoreAction" name="resetMemoryStore" process="process">
+ </action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.IfAction" name="ESBBrokerProcess_Broker__1_action_2" process="process">
<property name="paths">
<if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__2" decision-class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SendReqForQuoteDecision"/>
15 years, 1 month
- 1
- 0
Overlord SVN: r636 - in cdl/trunk: samples/jbossesb/brokerage/broker/stateful/src/main/resources/META-INF and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-05 04:22:26 -0400 (Tue, 05 May 2009)
New Revision: 636
Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ConversationAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ReceiveMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/RetrieveSessionAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/resources/META-INF/jboss-esb.xml
Log:
Fix SendMessageAction issue bug.
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ConversationAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ConversationAction.java 2009-05-04 16:07:35 UTC (rev 635)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ConversationAction.java 2009-05-05 08:22:26 UTC (rev 636)
@@ -57,11 +57,11 @@
private ConfigTree config;
- private Set<ScheduleItem> scheduleItems = new HashSet<ScheduleItem>();
+ private Set<ScheduleItem> scheduleItems;
- protected boolean unscheduledServiceItem = false;
+ protected boolean hasUnscheduledService;
- protected boolean isCreateSessionAction = false;
+ protected boolean isCreateSessionAction;
protected Session session;
@@ -105,6 +105,9 @@
* @throws Exception
*/
public final Message process(Message message) throws Exception {
+ scheduleItems = new HashSet<ScheduleItem>();
+ hasUnscheduledService = false;
+ isCreateSessionAction = false;
hibernateSession = HibernateUtil.currentSession();
Transaction transaction = hibernateSession.beginTransaction();
@@ -113,7 +116,7 @@
if (session != null && isFirstOrLastConversationAction(message, true)) {
logger.debug("This is first conversation action of message: [" + message.getBody().get() + "].");
unschedule(session, message);
- unscheduledServiceItem = true;
+ hasUnscheduledService = true;
}
handle(message);
@@ -143,6 +146,7 @@
transaction.commit();
} catch (Exception e) {
transaction.rollback();
+ logger.error(e.getMessage(), e);
throw new Exception("Error in process message: " + e, e);
} finally {
HibernateUtil.closeSession();
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ReceiveMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ReceiveMessageAction.java 2009-05-05 08:22:26 UTC (rev 636)
@@ -77,12 +77,14 @@
if (requiredMType.equals(mesgMType)) {
java.util.List<Identity> ids=getIdentities(message, serviceName);
- session=getSession(message, ids);
+ if (session == null){
+ session=getSession(message, ids);
+ }
session.assimulateIdentities(ids);
logger.info("MESSAGE TYPE [ "+ mesgMType +" ] RECEIVED.");
- if (unscheduledServiceItem == false && isFirstOrLastConversationAction(message, true)) {
+ if (hasUnscheduledService == false && isFirstOrLastConversationAction(message, true)) {
String category=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
String name=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
unscheduleService(session, category, name);
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/RetrieveSessionAction.java 2009-05-04 16:07:35 UTC (rev 635)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/RetrieveSessionAction.java 2009-05-05 08:22:26 UTC (rev 636)
@@ -63,15 +63,21 @@
}
public Message handle(Message message) throws Exception{
+ logger.debug("Entering the RetrieveSessionAction");
+
String serviceDescriptionName = getConfig().getAttribute(ActionProperties.SERVICE_DESCRIPTION_NAME);
List<Identity> ids = getIdentities(message, serviceDescriptionName);
-
- session= getSession(message, ids);
+ if (session == null) {
+ session= getSession(message, ids);
+ }
+
String serviceName=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
String serviceCategory=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
- unscheduleService(session, serviceCategory, serviceName);
+ if (!hasUnscheduledService) {
+ unscheduleService(session, serviceCategory, serviceName);
+ }
logger.debug("Finished retrieving session action.");
return(message);
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java 2009-05-05 08:22:26 UTC (rev 636)
@@ -199,6 +199,8 @@
@Override
protected void sendAsyncMessage(Message message) throws Exception {
+ super.sendAsyncMessage(message);
+
if (serviceInvoker != null) {
serviceInvoker.deliverAsync(this.sendMessage);
} else if (courier != null) {
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/resources/META-INF/jboss-esb.xml 2009-05-04 16:07:35 UTC (rev 635)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/resources/META-INF/jboss-esb.xml 2009-05-05 08:22:26 UTC (rev 636)
@@ -326,7 +326,8 @@
<actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateful.actions.RetrieveSessionAction"
process="process" name="s10-1">
- <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" />
+ <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" />
+ <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}Broker" />
<property name="identities" >
<identity type="primary" >
<token name="id" locator="//@id" />
15 years, 1 month
- 1
- 0
Overlord SVN: r635 - in cdl/trunk: runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions and 7 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-04 12:07:35 -0400 (Mon, 04 May 2009)
New Revision: 635
Added:
cdl/trunk/runtime/jbossesb-assembly/src/test/resources/overlord-cdl-jbossesb.mysql.cfg.xml
Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/Session.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/SessionManager.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ConversationAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/IfAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ParallelAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/PerformAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ReceiveMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/RetrieveSessionAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ScheduleStateAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SwitchAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/WhenAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/WhileAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java
cdl/trunk/samples/pom.xml
Log:
[SOAG-73] fix race condition.
* Just render out the Message Body instead of its object.
* Add the mysql conf file for testing against mysql.
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/Session.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/Session.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/Session.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -48,8 +48,6 @@
import org.hibernate.annotations.MapKey;
import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper;
import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.client.ServiceInvoker;
-import org.jboss.soa.esb.message.Message;
/**
* A Session represents the encapsulation of the current status of execution of an associated choreography instance,
@@ -197,104 +195,7 @@
return null;
}
-
- public void schedule(String category, String name, Message message) throws Exception {
-
- ScheduleItem si=new ScheduleItem(category, name);
- si.setSession(this);
-
- logger.debug("Scheduling: " + si + " by thread of " + Thread.currentThread().getName());
-
- synchronized(joinStates) {
- JoinState joinState = getJoinStateByScheduleItem(si);
- if (joinState != null) {
- joinState.join();
- SessionManager.updateObject(joinState);
- logger.debug("Join State is: " + joinState);
- if (joinState.getSpawnPath() <= 0) {
- joinStates.remove(joinState);
- SessionManager.removeObject(joinState);
-
- logger.info("Deliver the Join State of: " + joinState);
-
- ServiceInvoker invoker= new ServiceInvoker(category, name);
- invoker.deliverAsync(message);
- } else {
- logger.info("Don't join yet: "+ joinState);
- return;
- }
- }
- }
-
- synchronized(scheduleItems) {
- // Check if already exists
- if (scheduleItems.contains(si)) {
- throw new Exception("Schedule already contains item for " + si);
- }
-
- scheduleItems.add(si);
- SessionManager.saveObject(si);
-
- logger.debug("Finished scheduling "+si +"' by thread of " + Thread.currentThread().getName());
- }
-
- }
- public void unschedule(String category, String name) throws Exception {
-
- logger.debug("Unscheduling: '"+category+"/"+name+"' by thread of " + Thread.currentThread().getName() );
-
- synchronized(joinStates) {
- if (isScheduleItemInJoinState(category, name)) {
- //FIXME, it should throw exception, but need to use the pemissitic lock in database.
- logger.error("Unable to enact join state, coverging paths have still not completed");
- //throw new Exception("Unable to enact join state, converging paths have still not completed");
- }
- }
-
- synchronized(scheduleItems) {
- ScheduleItem si = getScheduleItem(category, name);
- if (si.getId() == 0) {
- throw new Exception("The scheduleItem of " + si + " is not existed !");
- }
-
- scheduleItems.remove(si);
- SessionManager.removeObject(si);
- logger.debug("Finished unscheduling: " + si +"' by thread of " + Thread.currentThread().getName());
- }
- }
-
- protected boolean isScheduleItemInJoinState(String category, String name) {
- for(JoinState joinState : joinStates) {
- if (name.equals(joinState.getName()) && category.equals(joinState.getCategory())) {
- return true;
- }
- }
- return false;
- }
-
-
- protected synchronized JoinState getJoinStateByScheduleItem(ScheduleItem si) {
- for(JoinState joinState : joinStates) {
- if (si.getName().equals(joinState.getName()) && si.getCategory().equals(joinState.getCategory())) {
- return joinState;
- }
- }
- return null;
- }
-
- protected ScheduleItem getScheduleItem(String category, String name) {
- for(ScheduleItem si : scheduleItems) {
- if (category.equals(si.getCategory()) && name.equals(si.getName())) {
- si.setSession(this);
- return si;
- }
- }
- ScheduleItem item = new ScheduleItem(category, name);
- item.setSession(this);
- return item;
- }
-
public void join(String category, String name, int count) throws Exception {
JoinState joinState=new JoinState(category, name, count);
joinState.setSession(this);
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/SessionManager.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/SessionManager.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/SessionManager.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -25,6 +25,8 @@
import java.util.Map;
import org.apache.log4j.Logger;
+import org.hibernate.LockMode;
+import org.hibernate.Query;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.jbossesb.ClassLoaderUtil;
import org.jboss.soa.overlord.jbossesb.stateful.actions.MessageProperties;
@@ -114,10 +116,7 @@
}
if (sessionKey != null) {
- org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
- Session session = (Session) hibernateSession.load(Session.class, Long.valueOf(sessionKey));
- injectParentReference(session);
- return session;
+ return getSessionByKey(sessionKey);
}
for (Identity id : ids) {
@@ -128,6 +127,15 @@
return null;
}
+
+ private static Session getSessionByKey(String sessionKey) {
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ Query query = hibernateSession.createQuery("from Session s where s.id=" + sessionKey);
+ query.setLockMode("s", LockMode.UPGRADE);
+ Session session = (Session) query.uniqueResult();
+ injectParentReference(session);
+ return session;
+ }
public static Object saveObject(Object obj) throws Exception {
org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
@@ -189,14 +197,13 @@
return null;
}
- Session session = theID.getSession();
- injectParentReference(session);
+ Session session = getSessionByKey(String.valueOf(theID.getSession().getId()));
logger.debug("Get Session of " + session + " by using identity of " + id);
return session;
}
-
+
private static void injectParentReference(Session session) {
String parentProperty = session.getProperties().get(Session.PARENT_REFERENCE_KEY);
if (parentProperty!= null && session.getParent() != null) {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ConversationAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ConversationAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ConversationAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -36,6 +36,7 @@
import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.jboss.soa.overlord.jbossesb.stateful.Identity;
import org.jboss.soa.overlord.jbossesb.stateful.IdentityType;
+import org.jboss.soa.overlord.jbossesb.stateful.JoinState;
import org.jboss.soa.overlord.jbossesb.stateful.ScheduleItem;
import org.jboss.soa.overlord.jbossesb.stateful.Session;
import org.jboss.soa.overlord.jbossesb.stateful.SessionManager;
@@ -64,6 +65,8 @@
protected Session session;
+ protected org.hibernate.Session hibernateSession;
+
public ConversationAction(ConfigTree config) {
this.config = config;
}
@@ -103,13 +106,13 @@
*/
public final Message process(Message message) throws Exception {
- org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ hibernateSession = HibernateUtil.currentSession();
Transaction transaction = hibernateSession.beginTransaction();
try {
session = getSession(message);
if (session != null && isFirstOrLastConversationAction(message, true)) {
logger.debug("This is first conversation action of message: [" + message.getBody().get() + "].");
- unschedule(message);
+ unschedule(session, message);
unscheduledServiceItem = true;
}
@@ -250,6 +253,7 @@
}
protected void sendAsyncMessage(Message message) throws Exception {
+ logger.debug("Has [" + scheduleItems.size() + "] message to deliver");
for(ScheduleItem si : scheduleItems) {
ServiceInvoker invoker = new ServiceInvoker(si.getCategory(), si.getName());
logger.debug("Deliver message [" + message.getBody() + "] to [" + si.getCategory() + "/" + si.getName() + "]");
@@ -301,10 +305,10 @@
return(ret);
}
- private void unschedule(Message message) throws Exception {
+ private void unschedule(Session session, Message message) throws Exception {
String serviceCategory=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
String serviceName=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
- session.unschedule(serviceCategory, serviceName);
+ unscheduleService(session,serviceCategory, serviceName);
}
private ConfigTree getFirstOrLastConversationAction(boolean isFirst) throws ClassNotFoundException {
@@ -350,4 +354,110 @@
private Session getSession(Message message) throws Exception {
return getSession(message, null);
}
+
+
+ /**
+ * Schedule an item.
+ * @param session
+ * @param category
+ * @param name
+ * @param message
+ * @throws Exception
+ */
+ protected void scheduleService(Session session, String category, String name, Message message)
+ throws Exception{
+ ScheduleItem si=new ScheduleItem(category, name);
+ si.setSession(session);
+
+ logger.debug("Scheduling: " + si + " by thread of " + Thread.currentThread().getName());
+ List<JoinState> joinStates = session.getJoinStates();
+
+ synchronized(joinStates) {
+ JoinState joinState = getJoinStateByScheduleItem(si, joinStates);
+ if (joinState != null) {
+ joinState.join();
+ SessionManager.updateObject(joinState);
+ logger.debug("Join State is: " + joinState);
+ if (joinState.getSpawnPath() <= 0) {
+ joinStates.remove(joinState);
+ SessionManager.removeObject(joinState);
+
+ logger.info("Deliver the Join State of: " + joinState);
+
+ addScheduleItemToDeliver(category, name);
+ } else {
+ logger.info("Don't join yet: "+ joinState);
+ return;
+ }
+ }
+ }
+
+ List<ScheduleItem> scheduleItems = session.getScheduleItems();
+ synchronized(scheduleItems) {
+ // Check if already exists
+ if (scheduleItems.contains(si)) {
+ throw new Exception("Schedule already contains item for " + si);
+ }
+
+ scheduleItems.add(si);
+ SessionManager.saveObject(si);
+
+ logger.debug("Finished scheduling "+si +"' by thread of " + Thread.currentThread().getName());
+ }
+ }
+
+ protected void unscheduleService(Session session, String category, String name)
+ throws Exception{
+ logger.debug("Unscheduling: '"+category+"/"+name+"' by thread of " + Thread.currentThread().getName() );
+
+ List<JoinState> joinStates = session.getJoinStates();
+ synchronized(joinStates) {
+ if (isScheduleItemInJoinState(category, name, joinStates)) {
+ logger.error("Unable to enact join state, coverging paths have still not completed");
+ throw new Exception("Unable to enact join state, converging paths have still not completed");
+ }
+ }
+
+ List<ScheduleItem> scheduleItems = session.getScheduleItems();
+ synchronized(scheduleItems) {
+ ScheduleItem si = getScheduleItem(category, name, scheduleItems);
+ si.setSession(session);
+ if (si.getId() == 0) {
+ throw new Exception("The scheduleItem of " + si + " is not existed !");
+ }
+
+ scheduleItems.remove(si);
+ SessionManager.removeObject(si);
+ logger.debug("Finished unscheduling: " + si +"' by thread of " + Thread.currentThread().getName());
+ }
+ }
+
+
+ private JoinState getJoinStateByScheduleItem(ScheduleItem si, List<JoinState> joinStates) {
+ for(JoinState joinState : joinStates) {
+ if (si.getName().equals(joinState.getName()) && si.getCategory().equals(joinState.getCategory())) {
+ return joinState;
+ }
+ }
+ return null;
+ }
+
+ private boolean isScheduleItemInJoinState(String category, String name, List<JoinState> joinStates) {
+ for(JoinState joinState : joinStates) {
+ if (name.equals(joinState.getName()) && category.equals(joinState.getCategory())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private ScheduleItem getScheduleItem(String category, String name, List<ScheduleItem> scheduleItems) {
+ for(ScheduleItem si : scheduleItems) {
+ if (category.equals(si.getCategory()) && name.equals(si.getName())) {
+ return si;
+ }
+ }
+ ScheduleItem item = new ScheduleItem(category, name);
+ return item;
+ }
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/IfAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/IfAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/IfAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -90,13 +90,13 @@
if (flag) {
String category = ifConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = ifConfig.getAttribute(ActionProperties.SERVICE_NAME);
- session.schedule(category, name, message);
+ scheduleService(session, category, name, message);
addScheduleItemToDeliver(category, name);
logger.info("Scheduled items of [" + category + "/" + name + "].");
} else if (elseConfig != null){
String category = elseConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = elseConfig.getAttribute(ActionProperties.SERVICE_NAME);
- session.schedule(category, name, message);
+ scheduleService(session, category, name, message);
addScheduleItemToDeliver(category, name);
logger.info("Scheduled items of [" + category + "/" + name + "].");
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ParallelAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ParallelAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ParallelAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -104,7 +104,7 @@
String immediate=children[i].getAttribute("immediate","false");
// Schedule service
- session.schedule(category, name, message);
+ scheduleService(session, category, name, message);
if ("true".equalsIgnoreCase(immediate)){
addScheduleItemToDeliver(category, name);
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/PerformAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/PerformAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/PerformAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -108,14 +108,14 @@
message.getProperties().setProperty(MessageProperties.SESSION_PROPERTIES, properties);
}
- session.schedule(serviceCategory, serviceName, message);
+ scheduleService(session, serviceCategory, serviceName, message);
addScheduleItemToDeliver(serviceCategory, serviceName);
String returnServiceCategory = getConfig().getAttribute(RETURN_SERVICE_CATEGORY);
String returnServiceName = getConfig().getAttribute(RETURN_SERVICE_NAME);
if (returnServiceCategory != null && returnServiceName != null) {
- session.schedule(returnServiceCategory, returnServiceName, message);
+ scheduleService(session, returnServiceCategory, returnServiceName, message);
}
return message;
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ReceiveMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ReceiveMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -85,7 +85,7 @@
if (unscheduledServiceItem == false && isFirstOrLastConversationAction(message, true)) {
String category=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
String name=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
- session.unschedule(category, name);
+ unscheduleService(session, category, name);
logger.debug("Finished unscheduling of [" + category + "/" + name + "]");
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/RetrieveSessionAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/RetrieveSessionAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -70,7 +70,7 @@
String serviceName=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
String serviceCategory=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
- session.unschedule(serviceCategory, serviceName);
+ unscheduleService(session, serviceCategory, serviceName);
logger.debug("Finished retrieving session action.");
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ScheduleStateAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/ScheduleStateAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -63,7 +63,7 @@
String serviceCategory=getConfig().getAttribute(ActionProperties.SERVICE_CATEGORY_PROPERTY);
String immediate=getConfig().getAttribute(IMMEDIATE);
- session.schedule(serviceCategory, serviceName, message);
+ scheduleService(session, serviceCategory, serviceName, message);
if ("true".equalsIgnoreCase(immediate)) {
addScheduleItemToDeliver(serviceCategory, serviceName);
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -150,6 +150,7 @@
// Send message
sendMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
sendMessage.getBody().add(message.getBody().get());
+ sendMessage.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true");
if ((serviceCategory != null && serviceName != null)
|| (categoryExpression != null && nameExpression != null)) {
@@ -160,7 +161,7 @@
sendMessage.getHeader().getCall().setReplyTo(lepr);
// Schedule response action pipeline
- session.schedule(respServiceCategory, respServiceName, message);
+ scheduleService(session, respServiceCategory, respServiceName, message);
}
if (serviceCategory == null && serviceName == null) {
@@ -206,7 +207,7 @@
} else {
throw new Exception ("Neither ServiceInvoker nor Courier can be found to deliver message");
}
- logger.info("Message of '"+ sendMessage+"' has been sent.");
+ logger.info("Message of '"+ sendMessage.getBody().get()+"' has been sent.");
}
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SwitchAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SwitchAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SwitchAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -93,7 +93,7 @@
}
if (selected) {
- session.schedule(category, name, message);
+ scheduleService(session, category, name, message);
addScheduleItemToDeliver(category, name);
logger.info("Scheduled service of [" + category + "/" + name + "] immediately");
break;
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/WhenAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/WhenAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/WhenAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -77,7 +77,7 @@
if (res instanceof Boolean) {
Boolean ret = (Boolean)res;
if (ret.booleanValue()) {
- session.schedule(category, name, message);
+ scheduleService(session, category, name, message);
addScheduleItemToDeliver(category, name);
logger.info("Scheduled item of [" + category + '/' + name + "]");
break;
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/WhileAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/WhileAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/WhileAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -94,13 +94,13 @@
if (flag.booleanValue()) {
String category = whileConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = whileConfig.getAttribute(ActionProperties.SERVICE_NAME);
- session.schedule(category, name, message);
+ scheduleService(session, category, name, message);
addScheduleItemToDeliver(category, name);
logger.info("Scheduled items of [" + category + "/" + name + "].");
} else {
String category = exitConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = exitConfig.getAttribute(ActionProperties.SERVICE_NAME);
- session.schedule(category, name, message);
+ scheduleService(session, category, name, message);
addScheduleItemToDeliver(category, name);
logger.info("Scheduled items of [" + category + "/" + name + "].");
}
Added: cdl/trunk/runtime/jbossesb-assembly/src/test/resources/overlord-cdl-jbossesb.mysql.cfg.xml
===================================================================
--- cdl/trunk/runtime/jbossesb-assembly/src/test/resources/overlord-cdl-jbossesb.mysql.cfg.xml (rev 0)
+++ cdl/trunk/runtime/jbossesb-assembly/src/test/resources/overlord-cdl-jbossesb.mysql.cfg.xml 2009-05-04 16:07:35 UTC (rev 635)
@@ -0,0 +1,66 @@
+<!DOCTYPE hibernate-configuration SYSTEM
+"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2008, JBoss Inc., 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.
+
+ (C) 2008,
+ @author JBoss Inc.
+-->
+<hibernate-configuration>
+ <session-factory>
+ <property name="hibernate.connection.driver_class">
+ com.mysql.jdbc.Driver
+ </property>
+ <property name="hibernate.connection.url">
+ jdbc:mysql://localhost:3306/cdlDB
+ </property>
+ <property name="hibernate.connection.username">
+ root
+ </property>
+ <property name="hibernate.connection.password">
+ </property>
+
+ <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
+
+ <!-- DataSource properties (begin) === -->
+ <!-- property name="hibernate.connection.datasource">java:/cdlDS</property-->
+ <!-- ==== DataSource properties (end) -->
+
+
+ <!-- Use the C3P0 connection pool provider -->
+ <property name="hibernate.c3p0.min_size">5</property>
+ <property name="hibernate.c3p0.max_size">20</property>
+ <property name="hibernate.c3p0.timeout">300</property>
+ <property name="hibernate.c3p0.max_statements">50</property>
+ <property name="hibernate.c3p0.idle_test_period">3000</property>
+
+ <property name="current_session_context_class">thread</property>
+ <property name="hibernate.connection.isolation">4</property>
+
+ <!-- Show and print nice SQL on stdout -->
+ <property name="show_sql">false</property>
+ <property name="format_sql">true</property>
+
+ <!-- List of annotationed classes (Internal conversation class)-->
+ <mapping class="org.jboss.soa.overlord.jbossesb.stateful.Session" />
+ <mapping class="org.jboss.soa.overlord.jbossesb.stateful.ScheduleItem"/>
+ <mapping class="org.jboss.soa.overlord.jbossesb.stateful.JoinState"/>
+ <mapping class="org.jboss.soa.overlord.jbossesb.stateful.Identity"/>
+ <mapping class="org.jboss.soa.overlord.jbossesb.stateful.EPRWrapper"/>
+
+ </session-factory>
+</hibernate-configuration>
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -48,7 +48,7 @@
message.getBody().add("<requestForQuote id=\"" + idValue +"\" supplierDesc=\"" + serviceDescription+ "\" ></requestForQuote>");
- logger.info("Set 'requestForQuote' : "+message);
+ logger.info("Set 'requestForQuote' : "+message.getBody().get());
return message;
}
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -42,7 +42,7 @@
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
message.getBody().add("<CreditCheckInvalid id=\"" + idValue +"\"></CreditCheckInvalid>");
- logger.info("Updated credit message: "+message);
+ logger.info("Updated credit message: " + message.getBody().get());
return(message);
}
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -42,7 +42,7 @@
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
message.getBody().add("<CreditCheckInvalid id=\"" + idValue +"\"></CreditCheckInvalid>");
- logger.info("Updated credit message: "+message);
+ logger.info("Updated credit message: " + message.getBody().get());
return(message);
}
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -46,7 +46,7 @@
message.getBody().add("<BuyFailed id=\"" + idValue +"\"></BuyFailed>");
- logger.info("Updated buy message: "+message);
+ logger.info("Updated buy message: "+message.getBody().get());
return(message);
}
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -42,7 +42,7 @@
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
message.getBody().add("<BuyConfirmed id=\"" + idValue +"\"></BuyConfirmed>");
- logger.info("Updated buy message: "+message);
+ logger.info("Updated buy message: "+message.getBody().get());
return(message);
}
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -42,7 +42,7 @@
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>");
- logger.info("Updated credit check request message: "+message);
+ logger.info("Updated credit check request message: "+message.getBody().get());
return(message);
}
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -46,7 +46,7 @@
message.getBody().add("<BuyFailed id=\"" + idValue +"\"></BuyFailed>");
- logger.info("Updated buy message: "+message);
+ logger.info("Updated buy message: " + message.getBody().get());
return(message);
}
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -42,7 +42,7 @@
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
message.getBody().add("<BuyConfirmed id=\"" + idValue +"\"></BuyConfirmed>");
- logger.info("Updated buy message: "+message);
+ logger.info("Updated buy message: " + message.getBody().get());
return(message);
}
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java 2009-05-04 16:07:35 UTC (rev 635)
@@ -42,7 +42,7 @@
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>");
- logger.info("Updated credit check request message: "+message);
+ logger.info("Updated credit check request message: " + message.getBody().get());
return(message);
}
Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml 2009-05-02 05:23:35 UTC (rev 634)
+++ cdl/trunk/samples/pom.xml 2009-05-04 16:07:35 UTC (rev 635)
@@ -16,7 +16,7 @@
<properties>
<deploy.dir>/var/local/jboss-4.2.2.GA/server/default/deploy</deploy.dir>
- <cdl.jbossesb.version>1.0-SNAPSHOT</cdl.jbossesb.version>
+ <cdl.jbossesb.version>1.0-M2</cdl.jbossesb.version>
</properties>
15 years, 1 month
- 1
- 0
Overlord SVN: r634 - cdl/tags.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-02 01:23:35 -0400 (Sat, 02 May 2009)
New Revision: 634
Added:
cdl/tags/1.0-M2/
Log:
tag 1.0-M2.
Copied: cdl/tags/1.0-M2 (from rev 633, cdl/trunk)
15 years, 1 month
- 1
- 0
Overlord SVN: r633 - in cdl/trunk/distribution: src/main/assembly and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-02 01:15:25 -0400 (Sat, 02 May 2009)
New Revision: 633
Added:
cdl/trunk/distribution/src/main/assembly/docs.xml
cdl/trunk/distribution/src/main/assembly/src.xml
Modified:
cdl/trunk/distribution/pom.xml
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
Log:
* update the distro build.
Modified: cdl/trunk/distribution/pom.xml
===================================================================
--- cdl/trunk/distribution/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
+++ cdl/trunk/distribution/pom.xml 2009-05-02 05:15:25 UTC (rev 633)
@@ -57,7 +57,6 @@
</dependencies>
<build>
- <finalName>overlord-cdl-${project.version}</finalName>
<resources>
<resource>
<directory>src/main/java</directory>
@@ -67,25 +66,66 @@
</resource>
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <executions>
+ <execution>
+ <id>docs</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>overlord-cdl-${project.version}-docs</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/docs.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <executions>
+ <execution>
+ <id>src</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>overlord-cdl-${project.version}-src</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>overlord-cdl-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-05-01 16:41:33 UTC (rev 632)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-05-02 05:15:25 UTC (rev 633)
@@ -20,7 +20,7 @@
-->
<assembly>
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
- <id></id>
+ <id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
<formats>
<format>zip</format>
Added: cdl/trunk/distribution/src/main/assembly/docs.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/docs.xml (rev 0)
+++ cdl/trunk/distribution/src/main/assembly/docs.xml 2009-05-02 05:15:25 UTC (rev 633)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., 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.
+ *
+ * (C) 2008
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>docs</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/userguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/samplesguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/gettingstartedguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../runtime/jbossesb/target/javadoc</directory>
+ <outputDirectory>docs/jbossesb-javadoc</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
Added: cdl/trunk/distribution/src/main/assembly/src.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/src.xml (rev 0)
+++ cdl/trunk/distribution/src/main/assembly/src.xml 2009-05-02 05:15:25 UTC (rev 633)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., 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.
+ *
+ * (C) 2008
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>src</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>src</outputDirectory>
+ <excludes>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
Modified: cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2009-05-01 16:41:33 UTC (rev 632)
+++ cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2009-05-02 05:15:25 UTC (rev 633)
@@ -1,18 +1,18 @@
-Overlord CDL 1.0-M2
-===================
-
-See the README.txt for more information about the Overlord CDL release.
-
-This is the second release of the CDL capabilities within the Overlord
-"SOA Governance" project. Additional information will be made available
-on the Overlord website (http://www.jboss.org/overlord/). Free free to post
-questions to the User forum, or raise issues against the SOAG component
-in Jira issue tracker.
-
-Please note: The "conversation aware ESB actions" mechanism should be
-considered an alpha version only, and subject to change in future
-releases. Its inclusion within this release is intended to enable the
-community to experiment with the approach and hopefully provide feedback
+Overlord CDL 1.0-M2
+===================
+
+See the README.txt for more information about the Overlord CDL release.
+
+This is the second release of the CDL capabilities within the Overlord
+"SOA Governance" project. Additional information will be made available
+on the Overlord website (http://www.jboss.org/overlord/). Free free to post
+questions to the User forum, or raise issues against the SOAG component
+in Jira issue tracker.
+
+Please note: The "conversation aware ESB actions" mechanism should be
+considered an alpha version only, and subject to change in future
+releases. Its inclusion within this release is intended to enable the
+community to experiment with the approach and hopefully provide feedback
that can be used to guide the direction of this capability.
This "conversation aware" mechanism in M1 required state information to be
@@ -30,11 +30,29 @@
The same examples are available in both stateful and stateless approaches,
to enable comparison between the jboss-esb.xml definitions for each service.
-Feedback on both approaches would be appreciated.
-
-Overlord-CDL Development Team
-
-------------------------------------------------------------------------
-
-The current list of outstanding problems or tasks can be obtained from
+Feedback on both approaches would be appreciated.
+
+Overlord CDL 1.0-M1
+===================
+
+See the README.txt for more information about the Overlord CDL release.
+
+This is the initial release of the CDL capabilities within the Overlord
+"SOA Governance" project. Additional information will be made available
+on the Overlord website (http://www.jboss.org/overlord/). Free free to post
+questions to the User forum, or raise issues against the SOAG component
+in Jira issue tracker.
+
+Please note: The "conversation aware ESB actions" mechanism should be
+considered an alpha version only, and subject to change in future
+releases. Its inclusion within this release is intended to enable the
+community to experiment with the approach and hopefully provide feedback
+that can be used to guide the direction of this capability.
+
+
+Overlord-CDL Development Team
+
+------------------------------------------------------------------------
+
+The current list of outstanding problems or tasks can be obtained from
the Overlord JIRA system at: https://jira.jboss.org/jira/browse/SOAG
15 years, 1 month
- 1
- 0
Overlord SVN: r632 - in cdl/trunk: distribution and 21 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-01 12:41:33 -0400 (Fri, 01 May 2009)
New Revision: 632
Modified:
cdl/trunk/Developer.txt
cdl/trunk/distribution/pom.xml
cdl/trunk/distribution/src/main/release/version.properties
cdl/trunk/docs/docbook/gettingstartedguide/pom.xml
cdl/trunk/docs/docbook/pom.xml
cdl/trunk/docs/docbook/samplesguide/pom.xml
cdl/trunk/docs/docbook/userguide/pom.xml
cdl/trunk/pom.xml
cdl/trunk/runtime/jbossesb-assembly/pom.xml
cdl/trunk/runtime/jbossesb/pom.xml
cdl/trunk/runtime/pom.xml
cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/pom.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/pom.xml
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java
cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml
cdl/trunk/samples/jbossesb/common/creditAgency/stateless/pom.xml
cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml
cdl/trunk/samples/jbossesb/purchasing/store/stateless/pom.xml
cdl/trunk/samples/pom.xml
cdl/trunk/validator/jbossesb-assembly/pom.xml
cdl/trunk/validator/jbossesb/pom.xml
cdl/trunk/validator/pom.xml
Log:
update the version to 1.0-M2, prepare for M2 release.
Modified: cdl/trunk/Developer.txt
===================================================================
--- cdl/trunk/Developer.txt 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/Developer.txt 2009-05-01 16:41:33 UTC (rev 632)
@@ -3,7 +3,7 @@
---------------------------
0. Checked you have installed the Maven 2.0.9 or above.
Otherwise, you can download it from http://maven.apache.org
-1. Download the JBossESB 4.4 from http://www.jboss.org/jbossesb/downloads/
+1. Download the JBossESB 4.5 from http://www.jboss.org/jbossesb/downloads/
2. Run the following command to install the required libraries into local maven repository.
ant -f install.xml
Modified: cdl/trunk/distribution/pom.xml
===================================================================
--- cdl/trunk/distribution/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/distribution/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -23,7 +23,7 @@
<artifactId>distribution</artifactId>
<packaging>pom</packaging>
<name>Overlord::CDL::Distribution</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<url>http://www.jboss.org/soag</url>
<properties>
Modified: cdl/trunk/distribution/src/main/release/version.properties
===================================================================
--- cdl/trunk/distribution/src/main/release/version.properties 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/distribution/src/main/release/version.properties 2009-05-01 16:41:33 UTC (rev 632)
@@ -1 +1 @@
-cdl.version=1.0-SNAPSHOT
+cdl.version=1.0-M2
Modified: cdl/trunk/docs/docbook/gettingstartedguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/gettingstartedguide/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/docs/docbook/gettingstartedguide/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.overlord.cdl.docs</groupId>
<artifactId>gettingstartedguide</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jdocbook</packaging>
<name>Overlord::CDL::Docs::gettingstartedguide</name>
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>docs</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
Modified: cdl/trunk/docs/docbook/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/docs/docbook/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -6,7 +6,7 @@
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>docs</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>pom</packaging>
<name>Overlord::CDL::Docs</name>
Modified: cdl/trunk/docs/docbook/samplesguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/docs/docbook/samplesguide/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.overlord.cdl.docs</groupId>
<artifactId>samplesguide</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jdocbook</packaging>
<name>Overlord::CDL::Docs::samplesguide</name>
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>docs</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
Modified: cdl/trunk/docs/docbook/userguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/docs/docbook/userguide/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.overlord.cdl.docs</groupId>
<artifactId>userguide</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jdocbook</packaging>
<name>Overlord::CDL::Docs::userguide</name>
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>docs</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
Modified: cdl/trunk/pom.xml
===================================================================
--- cdl/trunk/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord</groupId>
<artifactId>cdl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>pom</packaging>
<name>Overlord::CDL</name>
<url>http://www.jboss.org/overlord</url>
Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/runtime/jbossesb/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
<artifactId>cdl-runtime-jbossesb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jar</packaging>
<name>Overlord::CDL::Runtime::JBossESB</name>
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>runtime</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<properties>
Modified: cdl/trunk/runtime/jbossesb-assembly/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb-assembly/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/runtime/jbossesb-assembly/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
<artifactId>cdl-jbossesb-assembly</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Runtime::JBossESB-Assembly</name>
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>runtime</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<properties>
Modified: cdl/trunk/runtime/pom.xml
===================================================================
--- cdl/trunk/runtime/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/runtime/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>runtime</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<name>Overlord::CDL::Runtime</name>
<parent>
<groupId>org.jboss.soa.overlord</groupId>
<artifactId>cdl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<modules>
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
<artifactId>jbossesb-stateful-broker</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Samples::Stateful::Broker</name>
<url>http://www.jboss.org/overlord</url>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
<artifactId>jbossesb-stateless-broker</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Samples::Stateless::Broker</name>
<url>http://www.jboss.org/overlord</url>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
<artifactId>jbossesb-stateful-supplier</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Samples::Stateful::Supplier</name>
<url>http://www.jboss.org/overlord</url>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
<artifactId>jbossesb-stateless-supplier</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Samples::Stateless::Supplier</name>
<url>http://www.jboss.org/overlord</url>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java 2009-05-01 16:41:33 UTC (rev 632)
@@ -57,7 +57,7 @@
try {
System.out.println("=========================================");
System.out.println("Request: "+mesg.getBody().get());
- Message reply=storeInvoker.deliverSync(mesg, 2);
+ Message reply=storeInvoker.deliverSync(mesg, 20000);
if (reply != null) {
System.out.println("Reply: "+reply.getBody().get());
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
<artifactId>jbossesb-stateful-creditAgency</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Samples::Stateful::CreditAgency</name>
<url>http://www.jboss.org/overlord</url>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/stateless/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/stateless/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/stateless/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
<artifactId>jbossesb-stateless-creditAgency</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Samples::Stateless::CreditAgency</name>
<url>http://www.jboss.org/overlord</url>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
<artifactId>jbossesb-stateful-purchasing</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Samples::Stateful::Purchasing</name>
<url>http://www.jboss.org/soag</url>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateless/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateless/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateless/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
<artifactId>jbossesb-stateless-purchasing</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Samples::Stateless::Purchasing</name>
<url>http://www.jboss.org/soag</url>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/samples/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>samples</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<name>Overlord::CDL::Samples</name>
<parent>
<groupId>org.jboss.soa.overlord</groupId>
<artifactId>cdl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<properties>
@@ -22,9 +22,13 @@
<modules>
<module>jbossesb/purchasing/store/stateful</module>
+ <module>jbossesb/purchasing/store/stateless</module>
<module>jbossesb/common/creditAgency/stateful</module>
+ <module>jbossesb/common/creditAgency/stateless</module>
<module>jbossesb/brokerage/broker/stateful</module>
+ <module>jbossesb/brokerage/broker/stateless</module>
<module>jbossesb/brokerage/supplier/stateful</module>
+ <module>jbossesb/brokerage/supplier/stateless</module>
</modules>
<build>
Modified: cdl/trunk/validator/jbossesb/pom.xml
===================================================================
--- cdl/trunk/validator/jbossesb/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/validator/jbossesb/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.validator</groupId>
<artifactId>cdl-validator-jbossesb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jar</packaging>
<name>Overlord::CDL::Validator::JBossESB</name>
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>validator</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/validator/jbossesb-assembly/pom.xml
===================================================================
--- cdl/trunk/validator/jbossesb-assembly/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/validator/jbossesb-assembly/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.validator</groupId>
<artifactId>cdl-jbossesb-assembly</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<packaging>jboss-esb</packaging>
<name>Overlord::CDL::Validator::JBossESB-Assembly</name>
<parent>
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>validator</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<dependencies>
Modified: cdl/trunk/validator/pom.xml
===================================================================
--- cdl/trunk/validator/pom.xml 2009-05-01 16:13:25 UTC (rev 631)
+++ cdl/trunk/validator/pom.xml 2009-05-01 16:41:33 UTC (rev 632)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.overlord.cdl</groupId>
<artifactId>validator</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
<name>Overlord::CDL::Validator</name>
<parent>
<groupId>org.jboss.soa.overlord</groupId>
<artifactId>cdl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-M2</version>
</parent>
<modules>
15 years, 1 month
- 1
- 0
Overlord SVN: r631 - cdl/trunk/docs/docbook/gettingstartedguide/src/main/module.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-05-01 12:13:25 -0400 (Fri, 01 May 2009)
New Revision: 631
Modified:
cdl/trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml
Log:
added MaxPermSize param requirement to installation section of getting started guide, and more information in the release note
Modified: cdl/trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml
===================================================================
--- cdl/trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2009-05-01 16:09:03 UTC (rev 630)
+++ cdl/trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2009-05-01 16:13:25 UTC (rev 631)
@@ -41,7 +41,16 @@
<orderedlist>
<listitem>
Install JBossAS
- <para> Unpack the JBossAS installation into the required location. </para>
+ <para> Unpack the JBossAS installation into the required location.</para>
+ <para>
+ NOTE: Before running the server, it is advisable to edit the run.sh/bat
+ script in the <filename>bin</filename> folder to add the following parameter to the JAVA_OPTS variable:
+ </para>
+ <para>
+ <code>
+ -XX:MaxPermSize=128M
+ </code>
+ </para>
</listitem>
<listitem>
Install JBossESB
15 years, 1 month
- 1
- 0