Overlord SVN: r191 - cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-07-18 10:18:51 -0400 (Fri, 18 Jul 2008)
New Revision: 191
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java
Log:
SOAG-38 - changes to referenced 'session' classes now result in the jboss-esb.xml being revalidated.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java 2008-07-18 10:40:22 UTC (rev 190)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java 2008-07-18 14:18:51 UTC (rev 191)
@@ -40,6 +40,7 @@
public class DefaultESBLanguageModel extends org.scribble.lang.model.LanguageModel
implements ESBLanguageModel {
+ public static final String JAVA_NOTATION = "java";
private static final String SERVICE_ELEMENT = "service";
private static final String SERVICES_ELEMENT = "services";
@@ -109,6 +110,7 @@
}
// Initialize the conversations
+ java.util.List<String> sessionClasses=new java.util.Vector<String>();
java.util.Iterator<ESBService> serviter=getServices().iterator();
while (serviter.hasNext()) {
@@ -187,7 +189,33 @@
getConversations().add(conv);
}
+
+ //Add session class to list
+ String sessionClass=service.getSessionName();
+
+ if (sessionClass != null &&
+ sessionClasses.contains(sessionClass) == false) {
+ sessionClasses.add(sessionClass);
+ }
}
+
+ // Add dependency on session classes
+ for (int i=0; i < sessionClasses.size(); i++) {
+ String sessionClass=sessionClasses.get(i);
+ int index=sessionClass.lastIndexOf('.');
+ String nspace="";
+ String local=sessionClass;
+
+ if (index != -1) {
+ nspace = sessionClass.substring(0, index);
+ local = sessionClass.substring(index+1);
+
+ dm.recordDependency(getModelReference(),
+ new ModelReference(nspace, local,
+ null, JAVA_NOTATION),
+ DependencyType.Uses);
+ }
+ }
}
if (logger.isLoggable(java.util.logging.Level.FINEST)) {
15 years, 9 months
- 1
- 0
Overlord SVN: r189 - in cdl/trunk/samples/jbossesb: purchasing/src/main/resources/META-INF and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-07-18 06:09:27 -0400 (Fri, 18 Jul 2008)
New Revision: 189
Modified:
cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java
cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml
Log:
* Update the session property value and the Conversation Type value.
Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-18 09:11:58 UTC (rev 188)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-18 10:09:27 UTC (rev 189)
@@ -35,7 +35,7 @@
import org.jboss.soa.overlord.conversation.HibernateObject;
import org.jboss.soa.overlord.jbossesb.actions.Service;
-@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="overlord.cdl.samples.broker@Broker", root=true)
+@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="jboss.overlord.samples.LoanBroker@Broker", root=true)
@Entity
@Table(name="T_BROKER")
public class BrokerMain implements HibernateObject{
Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-07-18 09:11:58 UTC (rev 188)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-07-18 10:09:27 UTC (rev 189)
@@ -317,7 +317,7 @@
</action>
<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
process="process" name="d3">
- <property name="session" value="com.acme.services.broker.PurchaseGoods" />
+ <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" />
<property name="operation" value="checkCredit" />
<property name="messageType" value="CreditCheckResponse" />
<property name="clientEPR" value="broker" />
@@ -342,7 +342,7 @@
</action>
<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
process="process" name="e3">
- <property name="session" value="com.acme.services.broker.PurchaseGoods" />
+ <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" />
<property name="operation" value="checkCredit" />
<property name="messageType" value="CreditCheckInvalid" />
<property name="clientEPR" value="broker" />
15 years, 9 months
- 1
- 0
Overlord SVN: r188 - cdl/trunk/samples/jbossesb/broker/models.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-07-18 05:11:58 -0400 (Fri, 18 Jul 2008)
New Revision: 188
Modified:
cdl/trunk/samples/jbossesb/broker/models/ESBBroker.cdm
Log:
Added conversation type.
Modified: cdl/trunk/samples/jbossesb/broker/models/ESBBroker.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/broker/models/ESBBroker.cdm 2008-07-18 08:15:49 UTC (rev 187)
+++ cdl/trunk/samples/jbossesb/broker/models/ESBBroker.cdm 2008-07-18 09:11:58 UTC (rev 188)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="Cp1252"?>
-<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.1" targetNamespace="http://www.pi4soa.org/ESBBroker">
+<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.2" targetNamespace="http://www.pi4soa.org/ESBBroker">
<typeDefinitions>
<nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.pi4soa.org/ESBBroker"/>
<nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
@@ -14,7 +14,7 @@
<informationTypes description="This is the information type PurchaseDetails" name="PurchaseDetails" elementName="purchaseDetails"/>
<informationTypes description="This is the information type Quote" name="Quote" elementName="quote"/>
<informationTypes description="This is the information type QuoteList" name="QuoteList" elementName="quoteList"/>
- <informationTypes description="This is the information type RequestForQuote" name="RequestForQuote" elementName="rfq"/>
+ <informationTypes description="This is the information type RequestForQuote" name="RequestForQuote" elementName="requestForQuote"/>
<informationTypes description="This is the information type URIType" name="URIType"/>
<tokens description="This is the token URI" name="URI" informationType="//@typeDefinitions/(a)informationTypes.12"/>
<roleTypes description="This is the role type Broker" name="Broker">
@@ -32,10 +32,12 @@
<relationshipTypes description="Relationship between Broker and CreditAgency" name="BrokerToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/>
<relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/>
<relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/(a)roleTypes.1" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/>
- <participantTypes description="This is the participant type BrokerParticipant" name="BrokerParticipant" roleTypes="//@typeDefinitions/(a)roleTypes.0"/>
- <participantTypes description="This is the participant type BuyerParticipant" name="BuyerParticipant" roleTypes="//@typeDefinitions/(a)roleTypes.1"/>
- <participantTypes description="This is the participant type CreditAgencyParticipant" name="CreditAgencyParticipant" roleTypes="//@typeDefinitions/(a)roleTypes.2"/>
- <participantTypes description="This is the participant type SupplierParticipant" name="SupplierParticipant" roleTypes="//@typeDefinitions/(a)roleTypes.3"/>
+ <participantTypes description="This is the participant type Broker" name="Broker" roleTypes="//@typeDefinitions/(a)roleTypes.0">
+ <semanticAnnotations annotation="jboss.overlord.samples.LoanBroker@Broker" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.1"/>
+ <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.2"/>
+ <participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes="//@typeDefinitions/(a)roleTypes.3"/>
<channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.0"/>
<channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.2"/>
<channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.3"/>
15 years, 9 months
- 1
- 0
Overlord SVN: r187 - in sam/trunk: modules/core and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-18 04:15:49 -0400 (Fri, 18 Jul 2008)
New Revision: 187
Added:
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
Removed:
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/esper/
Modified:
sam/trunk/SAM.ipr
sam/trunk/SAM.iws
sam/trunk/modules/core/pom.xml
sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java
sam/trunk/pom.xml
Log:
Start over with a drools event processor
Modified: sam/trunk/SAM.ipr
===================================================================
--- sam/trunk/SAM.ipr 2008-07-18 08:09:04 UTC (rev 186)
+++ sam/trunk/SAM.ipr 2008-07-18 08:15:49 UTC (rev 187)
@@ -291,6 +291,7 @@
</component>
<component name="ProjectModuleManager">
<modules>
+ <module fileurl="file:///home/hbraun/dev/prj/drools/drools-trunk.iml" filepath="/home/hbraun/dev/prj/drools/drools-trunk.iml" />
<module fileurl="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/esper-2.1.0-src.iml" filepath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/esper-2.1.0-src.iml" />
<module fileurl="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/javasim-trunk.iml" filepath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/javasim-trunk.iml" group="javasim" />
<module fileurl="file://$PROJECT_DIR$/sam-trunk.iml" filepath="$PROJECT_DIR$/sam-trunk.iml" />
Modified: sam/trunk/SAM.iws
===================================================================
--- sam/trunk/SAM.iws 2008-07-18 08:09:04 UTC (rev 186)
+++ sam/trunk/SAM.iws 2008-07-18 08:15:49 UTC (rev 187)
@@ -17,12 +17,12 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/chart/internal/jfree/JFreeChartImpl.java" afterPath="" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/internal/BufferView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/internal/BufferView.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/std/SizeView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/std/SizeView.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/chart/internal/jfree/LineChartBuilder.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServiceProviderImpl.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServiceProviderImpl.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServicesContextFactoryDefault.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServicesContextFactoryDefault.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java" afterPath="" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/RegressionLinestView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/RegressionLinestView.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PluginLoader.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PluginLoader.java" />
@@ -30,23 +30,27 @@
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/indicator/jmx/TestJMXLastElementDynamicMBean.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/indicator/jmx/TestJMXLastElementDynamicMBean.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/WeightedAverageView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/WeightedAverageView.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/pattern/PatternContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/pattern/PatternContext.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sam-trunk.iml" afterPath="$PROJECT_DIR$/sam-trunk.iml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/chart/internal/jfree" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/esper" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.ipr" afterPath="$PROJECT_DIR$/SAM.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/CorrelationView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/CorrelationView.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/chart/internal/jfree/PieChartBuilder.java" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/UnivariateStatisticsView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/UnivariateStatisticsView.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/BeanEventAdapter.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/BeanEventAdapter.java" />
- <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/UnivariateStatisticsView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/UnivariateStatisticsView.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/ViewFactoryContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/ViewFactoryContext.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/Configuration.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/Configuration.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/esper/StreamOutputAdapter.java" afterPath="" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationInformation.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationInformation.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/esper/EventAdapter.java" afterPath="" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/EventAdapterService.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/EventAdapterService.java" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/MultiDimStatsView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/MultiDimStatsView.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PlugInEventRepresentationContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PlugInEventRepresentationContext.java" />
- <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/MultiDimStatsView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/MultiDimStatsView.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/chart/internal/jfree/BarChartBuilder.java" afterPath="" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/regression/client/MyTrendSpotterView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/regression/client/MyTrendSpotterView.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/ChartGenerationHandler.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/pom.xml" afterPath="$PROJECT_DIR$/modules/core/pom.xml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/esper/EsperProcessingStatement.java" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/client/TestConfigurationParser.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/client/TestConfigurationParser.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationPluginLoader.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationPluginLoader.java" />
- <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/client/TestConfigurationParser.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/client/TestConfigurationParser.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -164,8 +168,8 @@
<property name="field_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_groupByClasses" value="true" />
<property name="exception_breakpoints_viewId" value="TABLE" />
+ <property name="exception_breakpoints_groupByClasses" value="true" />
<property name="field_breakpoints_viewId" value="TABLE" />
- <property name="exception_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_groupByMethods" value="false" />
</ui_properties>
</component>
@@ -187,7 +191,30 @@
</subPane>
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="EventProcessorFactory.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="30" column="22" selection-start="1219" selection-end="1219" vertical-scroll-proportion="0.22432113">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="DroolsEventProcessorImpl.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="39" column="0" selection-start="1423" selection-end="1423" vertical-scroll-proportion="0.40377805">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -199,7 +226,6 @@
<option name="SORT_ALPHABETICALLY" value="false" />
<option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
</component>
- <component name="HighlightingSettingsPerFile" />
<component name="InspectionManager">
<option name="AUTOSCROLL_TO_SOURCE" value="false" />
<option name="SPLITTER_PROPORTION" value="0.5" />
@@ -236,14 +262,6 @@
<option name="myItemId" value="SAM.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="sam-trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss.test.sam" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -251,70 +269,10 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="sam-trunk" />
+ <option name="myItemId" value="drools-trunk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss.test.sam" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="simulation" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SAM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="sam-trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss.sam" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SAM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="sam-trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss.sam" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="simulation" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SAM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SAM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="javasim" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleGroupNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="javasim-trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="PerforceChangeBrowserSettings">
@@ -400,10 +358,28 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" />
+ <option name="myItemId" value="SAM.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -423,15 +399,15 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -453,37 +429,63 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java" />
+ <option name="myItemId" value="SAM.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org/jboss" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -503,41 +505,37 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org/jboss" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -557,47 +555,47 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="SAM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="sam-trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="SAM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="SAM.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="javasim" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" />
- </PATH_ELEMENT>
</PATH>
</subPane>
</component>
@@ -612,7 +610,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" />
+ <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -643,8 +641,8 @@
<property name="cvs_file_history_flatOrder2" value="2" />
<property name="cvs_file_history_flatOrder3" value="3" />
<property name="cvs_file_history_flatOrder0" value="0" />
+ <property name="cvs_file_history_flatOrder1" value="1" />
<property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
- <property name="cvs_file_history_flatOrder1" value="1" />
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="GenerateAntBuildDialog.backupFiles" value="true" />
</component>
@@ -696,6 +694,13 @@
<option name="Make" value="false" />
</method>
</tempConfiguration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -740,13 +745,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration default="false" name="client" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -871,14 +869,14 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="25" width="1680" height="1000" extended-state="6" />
+ <frame x="-3" y="25" width="1686" height="1003" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5353075" order="1" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5344037" order="1" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39635536" order="3" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
@@ -892,7 +890,7 @@
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29000613" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28755364" order="0" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15757205" order="2" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.69020504" order="2" />
@@ -987,108 +985,117 @@
<option name="myLastEditedConfigurable" value="IDE Profiles" />
</component>
<component name="editorHistoryManager">
- <entry file="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/support/core/SupportInternalEventRouter.java">
+ <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="61" selection-start="306" selection-end="306" vertical-scroll-proportion="0.08972845">
- <folding />
+ <state line="44" column="13" selection-start="1689" selection-end="1689" vertical-scroll-proportion="0.5383707">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/etc/tst.policy">
+ <entry file="file://$PROJECT_DIR$/modules/sim/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="36" column="0" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.42908654">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/fx/src/test/java/org/jboss/test/sam/MapEventMessage.java">
+ <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="34" column="13" selection-start="1340" selection-end="1340" vertical-scroll-proportion="0.08972845">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/fx/src/test/java/org/jboss/test/sam/JFreeChartViewer.java">
+ <entry file="file://$PROJECT_DIR$/modules/fx/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.20188902">
+ <state line="30" column="26" selection-start="917" selection-end="1069" vertical-scroll-proportion="0.5480769">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/fx/src/test/java/org/jboss/test/sam/chart/BarChartRunner.java">
+ <entry file="file://$PROJECT_DIR$/modules/fx/src/main/java/org/jboss/sam/chart/Chart.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="48" selection-start="1743" selection-end="1743" vertical-scroll-proportion="0.40377805">
+ <state line="32" column="17" selection-start="1283" selection-end="1283" vertical-scroll-proportion="0.26918536">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/pom.xml">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="60" column="32" selection-start="1646" selection-end="1767" vertical-scroll-proportion="0.82211536">
+ <state line="34" column="17" selection-start="1514" selection-end="1514" vertical-scroll-proportion="0.3140496">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="28" selection-start="411" selection-end="411" vertical-scroll-proportion="0.0">
+ <state line="43" column="15" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.5159386">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java">
+ <entry file="file:///home/hbraun/dev/prj/drools/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="0" selection-start="2038" selection-end="2038" vertical-scroll-proportion="-0.5478158">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="48" column="13" selection-start="1524" selection-end="1524" vertical-scroll-proportion="0.022432113">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java">
+ <entry file="file:///home/hbraun/dev/prj/drools/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="44" column="13" selection-start="1689" selection-end="1689" vertical-scroll-proportion="0.5383707">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/pom.xml">
+ <entry file="file:///home/hbraun/dev/prj/drools/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="0" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.42908654">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java">
+ <entry file="file:///home/hbraun/dev/prj/drools/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1340" selection-end="1340" vertical-scroll-proportion="0.08972845">
+ <state line="46" column="72" selection-start="1611" selection-end="1611" vertical-scroll-proportion="0.43389422">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/fx/pom.xml">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="26" selection-start="917" selection-end="1069" vertical-scroll-proportion="0.5480769">
+ <state line="39" column="29" selection-start="1457" selection-end="1457" vertical-scroll-proportion="0.7487981">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/fx/src/main/java/org/jboss/sam/chart/Chart.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="17" selection-start="1283" selection-end="1283" vertical-scroll-proportion="0.26918536">
+ <state line="40" column="96" selection-start="1286" selection-end="1286" vertical-scroll-proportion="0.8161058">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="17" selection-start="1514" selection-end="1514" vertical-scroll-proportion="0.3140496">
- <folding />
+ <state line="39" column="0" selection-start="1423" selection-end="1423" vertical-scroll-proportion="0.40377805">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="30" column="22" selection-start="1219" selection-end="1219" vertical-scroll-proportion="0.22432113">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Modified: sam/trunk/modules/core/pom.xml
===================================================================
--- sam/trunk/modules/core/pom.xml 2008-07-18 08:09:04 UTC (rev 186)
+++ sam/trunk/modules/core/pom.xml 2008-07-18 08:15:49 UTC (rev 187)
@@ -25,8 +25,8 @@
<dependencies>
<dependency>
- <groupId>esper</groupId>
- <artifactId>esper</artifactId>
+ <groupId>org.drools</groupId>
+ <artifactId>drools</artifactId>
</dependency>
<dependency>
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java 2008-07-18 08:09:04 UTC (rev 186)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java 2008-07-18 08:15:49 UTC (rev 187)
@@ -21,7 +21,7 @@
*/
package org.jboss.sam;
-import org.jboss.sam.internal.esper.EsperRuntimeImpl;
+import org.jboss.sam.internal.drools.DroolsEventProcessorImpl;
import java.net.URL;
@@ -46,7 +46,7 @@
public EventProcessor createRuntime(String name, URL config)
{
- return new EsperRuntimeImpl(name, config);
+ return new DroolsEventProcessorImpl(name, config);
}
}
}
Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2008-07-18 08:15:49 UTC (rev 187)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.internal.drools;
+
+import org.jboss.sam.EventProcessor;
+import org.jboss.sam.StreamInput;
+import org.jboss.sam.StreamOutput;
+import org.jboss.sam.ProcessingStatement;
+
+import java.util.Iterator;
+import java.net.URL;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DroolsEventProcessorImpl implements EventProcessor
+{
+
+ String name;
+ URL config;
+
+ public DroolsEventProcessorImpl(String name, URL config)
+ {
+ this.name = name;
+ this.config = config;
+ }
+
+ public void addInput(StreamInput streamInput)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void removeInput(String streamName)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addOutput(StreamOutput streamOutput)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void removeOutput(String streamName)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Iterator getStreamInputNames()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Iterator getStreamOutputNames()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public ProcessingStatement registerStatement(String statementName, String epl)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public ProcessingStatement registerBoundStatement(String streamOutputName, String statementName, String epl)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void clearStatement(String statementName)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void clearAllStatements()
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Iterator getStatementNames()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getName()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Object getUnderlying()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: sam/trunk/pom.xml
===================================================================
--- sam/trunk/pom.xml 2008-07-18 08:09:04 UTC (rev 186)
+++ sam/trunk/pom.xml 2008-07-18 08:15:49 UTC (rev 187)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>SAM (Esper impl.)</name>
+ <name>SAM (Drools Fusion impl.)</name>
<groupId>org.jboss.sam</groupId>
<artifactId>sam</artifactId>
<packaging>pom</packaging>
@@ -21,7 +21,7 @@
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
- <esper.version>2.2.0-JBoss-Nightly</esper.version>
+ <drools.version>5.0.0-SNAPSHOT</drools.version>
<junit.version>3.8.2</junit.version>
<commons-logging.version>1.1</commons-logging.version>
<antlr.version>3.0.1</antlr.version>
@@ -35,9 +35,9 @@
<dependencies>
<dependency>
- <groupId>esper</groupId>
- <artifactId>esper</artifactId>
- <version>${esper.version}</version>
+ <groupId>org.drools</groupId>
+ <artifactId>drools</artifactId>
+ <version>${drools.version}</version>
</dependency>
<dependency>
@@ -80,15 +80,7 @@
</dependencyManagement>
<!-- Plugins -->
- <build>
- <resources>
- <resource>
- <targetPath>../etc</targetPath>
- <directory>src/main/etc</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
+ <build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
15 years, 9 months
- 1
- 0
Overlord SVN: r186 - sam/branches.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-18 04:09:04 -0400 (Fri, 18 Jul 2008)
New Revision: 186
Added:
sam/branches/esper-prototype/
Log:
Backup Esper based prototype
Copied: sam/branches/esper-prototype (from rev 185, sam/trunk)
15 years, 9 months
- 1
- 0
Overlord SVN: r185 - sam.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-18 04:08:54 -0400 (Fri, 18 Jul 2008)
New Revision: 185
Added:
sam/branches/
Log:
Branches dir
15 years, 9 months
- 1
- 0
Overlord SVN: r184 - in cdl/trunk: samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker and 6 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-07-18 02:13:24 -0400 (Fri, 18 Jul 2008)
New Revision: 184
Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java
cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java
cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SupplierMain.java
cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java
cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java
cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml
Log:
[SOAG-37] Rename the 'response..' to 'return..' in PerformAction.
* Add some missing session property for tool validation.
* Update conversatioType value to have '@'
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-07-18 06:13:24 UTC (rev 184)
@@ -21,7 +21,7 @@
public class ActionProperties {
- public static final String SESSION_NAME="session";
+ public static final String SESSION_NAME = "session";
public static final String ACTION_NAME = "action";
public static final String ACTION_NODE = "action";
public static final String CLASS_NAME = "class";
@@ -30,25 +30,29 @@
public static final String SERVICE_NAME = "service-name";
//Send and receive action properties
- public static final String OPERATION="operation";
- public static final String MESSAGE_TYPE="messageType";
+ public static final String OPERATION = "operation";
+ public static final String MESSAGE_TYPE = "messageType";
- public static final String CLIENT_EPR="clientEPR";
+ public static final String CLIENT_EPR = "clientEPR";
- public static final String CATEGORY="category"; // request, response, notification
+ public static final String CATEGORY = "category"; // request, response, notification
- public static final String SERVICE_NAME_PROPERTY="serviceName";
- public static final String SERVICE_CATEGORY_PROPERTY="serviceCategory";
+ public static final String SERVICE_NAME_PROPERTY = "serviceName";
+ public static final String SERVICE_CATEGORY_PROPERTY = "serviceCategory";
public static final String SERVICE_DESCRIPTION_NAME = "serviceDescriptionName";
- public static final String RESPONSE_SERVICE_NAME="responseServiceName";
- public static final String RESPONSE_SERVICE_CATEGORY="responseServiceCategory";
+ public static final String RESPONSE_SERVICE_NAME = "responseServiceName";
+ public static final String RESPONSE_SERVICE_CATEGORY = "responseServiceCategory";
+
+ public static final String RETURN_SERVICE_NAME = "returnServiceName";
+ public static final String RETURN_SERVICE_CATEGORY = "returnServiceCategory";
+
public static final String SERVICE_NAME_EXPRESSION = "serviceNameExpression";
public static final String SERVICE_CATEGORY_EXPRESSION = "serviceCategoryExpression";
- public static final String IMMEDIATE="immediate";
+ public static final String IMMEDIATE = "immediate";
- public static final String IDENTITIES="identities";
+ public static final String IDENTITIES = "identities";
public static final String INITIATE = "initiate" ;
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-07-18 06:13:24 UTC (rev 184)
@@ -67,8 +67,8 @@
session.schedule(serviceCategory, serviceName, message);
addScheduleItemToDeliver(serviceCategory, serviceName);
- String responseCategory = getConfig().getAttribute(ActionProperties.RESPONSE_SERVICE_CATEGORY);
- String responseName = getConfig().getAttribute(ActionProperties.RESPONSE_SERVICE_NAME);
+ String responseCategory = getConfig().getAttribute(ActionProperties.RETURN_SERVICE_CATEGORY);
+ String responseName = getConfig().getAttribute(ActionProperties.RETURN_SERVICE_NAME);
if (responseCategory != null && responseName != null) {
session.schedule(responseCategory, responseName, message);
Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-18 06:13:24 UTC (rev 184)
@@ -35,7 +35,7 @@
import org.jboss.soa.overlord.conversation.HibernateObject;
import org.jboss.soa.overlord.jbossesb.actions.Service;
-@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="Broker", root=true)
+@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="overlord.cdl.samples.broker@Broker", root=true)
@Entity
@Table(name="T_BROKER")
public class BrokerMain implements HibernateObject{
Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java 2008-07-18 06:13:24 UTC (rev 184)
@@ -34,7 +34,7 @@
*/
@Entity
@Table(name="T_CREDIT_AGENCY")
-@Service(conversationType="creditAgency", name="{http://www.jboss.org/overlord/loan/}creditAgency", root=true)
+@Service(conversationType="overlord.cdl.samples.broker@creditAgency", name="{http://www.jboss.org/overlord/loan/}creditAgency", root=true)
public class CreditAgency implements HibernateObject {
private static final long serialVersionUID = 2111L;
Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SupplierMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SupplierMain.java 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SupplierMain.java 2008-07-18 06:13:24 UTC (rev 184)
@@ -32,7 +32,7 @@
* @author jeffyu
*
*/
-@Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="Supplier", root=true)
+@Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="overlord.cdl.samples.broker@Supplier", root=true)
@Entity
@Table(name="T_SUPPLIER1_MAIN")
public class SupplierMain implements HibernateObject {
Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-18 06:13:24 UTC (rev 184)
@@ -183,8 +183,8 @@
<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" />
<property name="serviceCategory" value="ESBBroker.BrokerParticipant" />
<property name="serviceName" value="RequestForQuote.main" />
- <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" />
- <property name="responseServiceName" value="ESBBrokerProcess.main.9" />
+ <property name="returnServiceCategory" value="ESBBroker.BrokerParticipant" />
+ <property name="returnServiceName" value="ESBBrokerProcess.main.9" />
<property name="bindDetails" >
<bind from-expression="getCurrentSupplier()"
to-variable="supplier" />
@@ -314,8 +314,8 @@
process="process" name="s7-3">
<property name="serviceCategory" value="ESBBroker.BrokerParticipant" />
<property name="serviceName" value="CompleteTransaction.main" />
- <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" />
- <property name="responseServiceName" value="ESBBrokerProcess.main.8" />
+ <property name="returnServiceCategory" value="ESBBroker.BrokerParticipant" />
+ <property name="returnServiceName" value="ESBBrokerProcess.main.8" />
<property name="bindDetails" >
<bind from-expression="getSelectedQuote()"
to-variable="quote" />
@@ -426,6 +426,7 @@
<actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
process="process" name="s9-1">
+ <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Request4QuoteMain" />
<property name="operation" value="getQuote" />
<property name="messageType" value="quote" />
<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}Broker"/>
@@ -507,8 +508,6 @@
<action class="org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction"
process="process" name="s11-1">
<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" />
- <property name="serviceName" value="CompleteTransaction.main.1" />
- <property name="serviceCategory" value="ESBBroker.BrokerParticipant" />
<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction" />
<property name="identities" >
<identity type="primary" >
@@ -815,6 +814,7 @@
</action>
<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
process="process" name="d3">
+ <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" />
<property name="operation" value="checkCredit" />
<property name="messageType" value="CreditCheckResponse" />
<property name="clientEPR" value="broker" />
@@ -839,6 +839,7 @@
</action>
<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
process="process" name="e3">
+ <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" />
<property name="operation" value="checkCredit" />
<property name="messageType" value="CreditCheckInvalid" />
<property name="clientEPR" value="broker" />
Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-07-18 06:13:24 UTC (rev 184)
@@ -28,7 +28,7 @@
import org.jboss.soa.overlord.conversation.HibernateObject;
import org.jboss.soa.overlord.jbossesb.actions.Service;
-@Service(name="{http://www.jboss.org/overlord/purchase}Broker", conversationType="Broker", root=true)
+@Service(name="{http://www.jboss.org/overlord/purchase}Broker", conversationType="overlord.cdl.samples.purchasing@Broker", root=true)
@Entity
@Table(name = "T_PURCHASE_GOOD")
public class PurchaseGoods implements HibernateObject{
Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-07-18 06:13:24 UTC (rev 184)
@@ -28,7 +28,7 @@
import org.jboss.soa.overlord.conversation.HibernateObject;
import org.jboss.soa.overlord.jbossesb.actions.Service;
-@Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="CreditAgency",root=true)
+@Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="overlord.cdl.samples.purchasing@CreditAgency",root=true)
@Entity
@Table(name="T_CA_PURCHASE")
public class CreditAgencyPurchase implements HibernateObject {
Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-07-17 14:54:11 UTC (rev 183)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-07-18 06:13:24 UTC (rev 184)
@@ -116,8 +116,6 @@
process="process" name="b1">
<property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
- <property name="serviceName" value="CreditResponse" />
- <property name="serviceCategory" value="PurchaseGoods.Broker" />
<property name="identities" >
<identity type="primary" >
<token name="id" locator="//@id" />
@@ -149,6 +147,7 @@
<actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
process="process" name="b4">
+ <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="operation" value="checkCredit" />
<property name="messageType" value="CreditCheckResponse" />
<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
@@ -183,6 +182,7 @@
<actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction"
process="process" name="b7">
+ <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="serviceName" value="ReturnBuyerResponse" />
<property name="serviceCategory" value="PurchaseGoods.Broker" />
<property name="immediate" value="false" />
@@ -199,6 +199,7 @@
<actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction"
process="process" name="b9">
+ <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="serviceName" value="ReturnBuyerResponse" />
<property name="serviceCategory" value="PurchaseGoods.Broker" />
<property name="immediate" value="false" />
@@ -218,6 +219,7 @@
</action>
<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
process="process" name="b12">
+ <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="operation" value="buy" />
<property name="messageType" value="BuyResponse" />
<property name="clientEPR" value="client" />
@@ -239,9 +241,10 @@
<actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
process="process" name="b14">
+ <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="operation" value="checkCredit" />
<property name="messageType" value="CreditCheckInvalid" />
- <property name="ReceiveMessageAction" value="{http://www.jboss.org/overlord/purchase}Broker" />
+ <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
<property name="identities" >
<identity type="primary" >
<token name="id" locator="//@id" />
@@ -254,7 +257,6 @@
<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
process="process" name="b16">
<property name="operation" value="buy" />
- <property name="faultName" value="BuyFailed" />
<property name="messageType" value="BuyFailed" />
<property name="clientEPR" value="client" />
<property name="identities" >
@@ -315,6 +317,7 @@
</action>
<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
process="process" name="d3">
+ <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="operation" value="checkCredit" />
<property name="messageType" value="CreditCheckResponse" />
<property name="clientEPR" value="broker" />
@@ -339,6 +342,7 @@
</action>
<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
process="process" name="e3">
+ <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="operation" value="checkCredit" />
<property name="messageType" value="CreditCheckInvalid" />
<property name="clientEPR" value="broker" />
15 years, 9 months
- 1
- 0
Overlord SVN: r183 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src: test/org/jboss/tools/overlord/jbossesb/model/actions and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-07-17 10:54:11 -0400 (Thu, 17 Jul 2008)
New Revision: 183
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java
Log:
Enhanced validation of 'variable' property on the SetStateAction to accommodate navigation of bean properties expressed as a dot notation. Also validates that the properties are read or writable as appropriate.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-07-17 13:25:20 UTC (rev 182)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-07-17 14:54:11 UTC (rev 183)
@@ -25,12 +25,15 @@
_MUST_DEFINE_SINGLE_WHILE_PATH=While action must have a single 'while' path
_MUST_DEFINE_SINGLE_WHILE_EXIT=While action must have a single 'exit' path
_MUST_INITIATE_ROOT=Must 'initiate' root service descriptor for category '{0}' and name '{1}'
-_NOT_FOUND_VARIABLE=Variable '{0}' could not be found on session type '{1}'
+_NOT_FOUND_VARIABLE=Variable '{0}' could not be found on class '{1}'
+_NOT_FOUND_VARIABLE_PROPERTY=Variable '{0}' contains property '{1}' that could not be found on class '{2}'
_NOT_FOUND_PERFORM_CREATE_SESSION=Perform action can only invoke a service descriptor that starts with a CreateSessionAction
+_NOT_READABLE_PROPERTY=Property '{0}' on class '{1}' is not readable
_NOT_SPECIFIED_CONVERSATION_TYPE=Conversation type must be specified on root service descriptor
_NOT_SPECIFIED_CONVERSATION_TYPE_ROLE=Conversation type '{0}' must specify a role name following the '@' symbol
_NOT_SPECIFIED_PROPERTY=Property '{0}' must be specified
_NOT_SPECIFIED_REQ_RESP_EPR=Send does not contain request service category/name or response client EPR
+_NOT_WRITABLE_PROPERTY=Property '{0}' on class '{1}' is not writable
_MUST_BE_FIRST_ACTION='{0}' action must be first in the service descriptor
_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION=Must specify either a State OR Message based expression
_PARALLEL_MORE_THAN_TWO_PATHS=Parallel action must specify two or more paths
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-07-17 13:25:20 UTC (rev 182)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-07-17 14:54:11 UTC (rev 183)
@@ -87,33 +87,69 @@
// Check that variable defined on session class
Class<?> cls=getService().getSessionClass();
- if (cls != null) {
- try {
- java.beans.BeanInfo bi=java.beans.Introspector.getBeanInfo(cls);
-
- boolean f_found=false;
-
- java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
-
- for (int i=0; f_found==false && pds != null &&
- i < pds.length; i++) {
- if (pds[i].getName().equals(variable)) {
- f_found = true;
+ java.util.StringTokenizer st=new java.util.StringTokenizer(variable, ".");
+
+ while (st.hasMoreTokens()) {
+ String token=st.nextToken();
+
+ if (cls != null) {
+ try {
+ java.beans.BeanInfo bi=java.beans.Introspector.getBeanInfo(cls);
+
+ java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
+ java.beans.PropertyDescriptor pd=null;
+
+ for (int i=0; pd == null && pds != null &&
+ i < pds.length; i++) {
+ if (pds[i].getName().equals(token)) {
+ pd = pds[i];
+ }
}
+
+ if (pd == null) {
+
+ if (variable.equals(token)) {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "_NOT_FOUND_VARIABLE",
+ new String[]{variable, cls.getName()}), null);
+ } else {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "_NOT_FOUND_VARIABLE_PROPERTY",
+ new String[]{variable, token, cls.getName()}), null);
+ }
+ } else if (st.hasMoreTokens()) {
+ // Check property can be read
+ if (pd.getReadMethod() == null) {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "_NOT_READABLE_PROPERTY",
+ new String[]{pd.getName(), cls.getName()}), null);
+ }
+ } else {
+ // Check property can be written
+ if (pd.getWriteMethod() == null) {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "_NOT_WRITABLE_PROPERTY",
+ new String[]{pd.getName(), cls.getName()}), null);
+ }
+ }
+
+ if (pd != null) {
+ cls = pd.getPropertyType();
+ }
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to check if variable '"+
+ variable+"' exists on session class '"+
+ cls+"'", e);
}
-
- if (f_found == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_FOUND_VARIABLE",
- new String[]{variable, cls.getName()}), null);
- }
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to check if variable '"+
- variable+"' exists on session class '"+
- cls+"'", e);
}
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-07-17 14:54:11 UTC (rev 183)
@@ -86,8 +86,8 @@
}
public void testValidateVariableIsClassProperty() {
- String varName="class";
- Class<?> cls=java.lang.Object.class;
+ String varName="writableProperty";
+ Class<?> cls=TestClass2.class;
TestESBService service=new TestESBService();
service.setRoot(true);
@@ -113,9 +113,105 @@
}
}
+ public void testValidateMultiPartVariableIsClassWritableProperty() {
+ String varName="testClass2.writableProperty";
+ Class<?> cls=TestClass1.class;
+
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+ service.setSessionClass(cls);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put(SetStateAction.VARIABLE, varName);
+ props.put(SetStateAction.STATE_EXPRESSION, "");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null,
+ props, null);
+
+ SetStateAction action=new SetStateAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateMultiPartVariableIsClassNotWritableProperty() {
+ String varName="testClass2.readableProperty";
+ Class<?> cls=TestClass1.class;
+
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+ service.setSessionClass(cls);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put(SetStateAction.VARIABLE, varName);
+ props.put(SetStateAction.STATE_EXPRESSION, "");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null,
+ props, null);
+
+ SetStateAction action=new SetStateAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "_NOT_WRITABLE_PROPERTY",
+ new String[]{"readableProperty", TestClass2.class.getName()}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateMultiPartVariableIsClassNotReadableProperty() {
+ String varName="testClass2.writableProperty";
+ Class<?> cls=TestClass3.class;
+
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+ service.setSessionClass(cls);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put(SetStateAction.VARIABLE, varName);
+ props.put(SetStateAction.STATE_EXPRESSION, "");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null,
+ props, null);
+
+ SetStateAction action=new SetStateAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "_NOT_READABLE_PROPERTY",
+ new String[]{"testClass2", TestClass3.class.getName()}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
public void testValidateMissingExpression() {
- String varName="class";
- Class<?> cls=java.lang.Object.class;
+ String varName="writableProperty";
+ Class<?> cls=TestClass2.class;
TestESBService service=new TestESBService();
service.setRoot(true);
@@ -147,8 +243,8 @@
}
public void testValidateBothExpressions() {
- String varName="class";
- Class<?> cls=java.lang.Object.class;
+ String varName="writableProperty";
+ Class<?> cls=TestClass2.class;
TestESBService service=new TestESBService();
service.setRoot(true);
@@ -182,8 +278,8 @@
}
public void testValidateMessageExpression() {
- String varName="class";
- Class<?> cls=java.lang.Object.class;
+ String varName="writableProperty";
+ Class<?> cls=TestClass2.class;
TestESBService service=new TestESBService();
service.setRoot(true);
@@ -228,4 +324,33 @@
fail("Action is not flagged as a 'SessionBased'");
}
}
+
+ public class TestClass1 {
+ public TestClass1() {
+ }
+
+ public TestClass2 getTestClass2() {
+ return(null);
+ }
+ }
+
+ public class TestClass2 {
+ public TestClass2() {
+ }
+
+ public String getReadableProperty() {
+ return(null);
+ }
+
+ public void setWritableProperty(String str) {
+ }
+ }
+
+ public class TestClass3 {
+ public TestClass3() {
+ }
+
+ public void setTestClass2(TestClass2 tc2) {
+ }
+ }
}
15 years, 9 months
- 1
- 0
Overlord SVN: r182 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src: java/org/jboss/tools/overlord/jbossesb/model/actions and 2 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-07-17 09:25:20 -0400 (Thu, 17 Jul 2008)
New Revision: 182
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java
Log:
Fixed validation performance problem. Now checking for unknown properties. Updated PerformAction properties from 'responseService....' to 'returnService....'.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -20,9 +20,17 @@
import java.util.Properties;
import java.util.logging.Logger;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.scribble.conversation.model.*;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.*;
+import org.scribble.osgi.model.OSGIModelRepository;
/**
* This class represents an ESB model.
@@ -290,12 +298,32 @@
return(m_contents);
}
+ /**
+ * This method returns a custom classloader that uses the project's
+ * classpath to locate classes referenced by the ESB config file.
+ *
+ * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
+ *
+ * @return The classloader
+ * @throws Exception Failed to obtain the classloader
+ */
+ public synchronized ClassLoader getModelClassLoader() throws Exception {
+
+ if (m_classLoader == null) {
+ m_classLoader = org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.createClassLoader(getModelReference());
+ }
+
+ return(m_classLoader);
+ }
+
+
private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model");
private ModelReference m_source=null;
private org.w3c.dom.Element m_esbConfig=null;
private String m_contents=null;
private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
+ private ClassLoader m_classLoader=null;
public class InnerModelListener implements ModelListener {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -202,7 +202,8 @@
java.lang.annotation.Annotation ret=null;
try {
- ClassLoader cl=getServiceClassLoader();
+ ClassLoader cl=
+ org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
Class<?> cls=Class.forName(session, true, cl);
@@ -446,7 +447,8 @@
if (session != null) {
try {
- ClassLoader cl=getServiceClassLoader();
+ ClassLoader cl=
+ org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
ret = Class.forName(session, true, cl);
@@ -522,77 +524,6 @@
return(servCount);
}
- /**
- * This method returns a custom classloader that uses the project's
- * classpath to locate classes referenced by the ESB config file.
- *
- * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
- *
- * @return The classloader
- * @throws Exception Failed to obtain the classloader
- */
- public ClassLoader getServiceClassLoader() throws Exception {
- java.net.URLClassLoader classLoader=null;
- IFile file=OSGIModelRepository.getFile(getModel().getModelReference());
-
- if (file != null) {
- IJavaProject javaProject=JavaCore.create(file.getProject());
- java.util.List<java.net.URL> urls=new java.util.Vector<java.net.URL>();
-
- scanProjectForClasspath(javaProject, urls);
-
- java.net.URL[] urlarray=new java.net.URL[urls.size()];
- urls.toArray(urlarray);
-
- classLoader = new java.net.URLClassLoader(urlarray,
- String.class.getClassLoader());
- }
-
- return(classLoader);
- }
-
- protected void scanProjectForClasspath(IJavaProject javaProject,
- java.util.List<java.net.URL> urls) throws Exception {
- IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
-
- IResource outres=ResourcesPlugin.getWorkspace().getRoot().findMember(javaProject.getOutputLocation());
- if (outres != null) {
- urls.add(new java.io.File(outres.getLocation().toPortableString()).toURL());
- }
-
- for (IClasspathEntry entry : entries) {
- if(entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IResource project =
- ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
-
- if (project instanceof IProject) {
- IJavaProject jproj=JavaCore.create((IProject)project);
-
- if (jproj != null) {
- scanProjectForClasspath(jproj, urls);
- }
- }
-
- } else {
-
- IResource res=ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
-
- java.net.URL url=null;
-
- if (res != null) {
- url = new java.io.File(res.getLocation().
- toPortableString()).toURL();
- } else {
- url = entry.getPath().toFile().toURL();
- }
-
- if (url != null && urls.contains(url) == false) {
- urls.add(url);
- }
- }
- }
- }
-
public int hashCode() {
return(m_service.hashCode());
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -159,16 +159,5 @@
* @return The service node position
*/
public int getServicePosition();
-
- /**
- * This method returns a custom classloader that uses the project's
- * classpath to locate classes referenced by the ESB config file.
- *
- * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
- *
- * @return The classloader
- * @throws Exception Failed to obtain the classloader
- */
- public ClassLoader getServiceClassLoader() throws Exception;
-
+
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties 2008-07-17 13:25:20 UTC (rev 182)
@@ -18,5 +18,4 @@
_NOT_FOUND_BUSINESS_OBJECT_TYPE=Business object type '{0}' could not be found
_NOT_FOUND_SERVICE_DESCRIPTOR=Service descriptor for category '{0}' and name '{1}' not found
-_NOT_SPECIFIED_PROPERTY=Property '{0}' must be specified
_NOT_SPECIFIED_SESSION_CLASS=First conversation action must specify a valid session class
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -30,14 +30,16 @@
public abstract class AbstractESBAction extends ModelObject
implements ESBAction {
+ public static final String SERVICE_DESCRIPTION_NAME = "serviceDescriptionName";
+ public static final String IDENTITIES = "identities";
+ public static final String SESSION = "session";
private static final String ACTION_ELEMENT = "action";
- //private static final String SERVICE_ELEMENT = "service";
private static final String VALUE_ATTR = "value";
private static final String NAME_ATTR = "name";
private static final String PROPERTY_ELEMENT = "property";
private static final String CLASS_PROPERTY = "class";
- protected static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
+ protected static final String BUSINESS_OBJECT_TYPE_PROPERTY = SESSION;
/**
* The default constructor.
@@ -117,24 +119,40 @@
*/
public void validate(ModelListener l) {
- String[] mandatory=getMandatoryProperties();
+ java.util.List<String> mandatory=getMandatoryProperties();
- for (int i=0; i < mandatory.length; i++) {
- if (getPropertyValue(mandatory[i]) == null) {
+ for (int i=0; i < mandatory.size(); i++) {
+ if (getPropertyValue(mandatory.get(i)) == null) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
- new String[]{mandatory[i]}), null);
+ new String[]{mandatory.get(i)}), null);
}
}
+ java.util.List<String> propNames=getPropertyNames();
+
+ for (int i=0; i < propNames.size(); i++) {
+ String propName=propNames.get(i);
+
+ if (getOptionalProperties().contains(propName) == false &&
+ getMandatoryProperties().contains(propName) == false) {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "_UNKNOWN_PROPERTY",
+ new String[]{propName}), null);
+ }
+ }
+
String session=getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
if (session != null) {
// Validate that the business object type exists
try {
- ClassLoader cl=getService().getServiceClassLoader();
+ ClassLoader cl=
+ org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getService().getModel());
try {
Class.forName(session, true, cl);
@@ -226,11 +244,25 @@
*
* @return The mandatory property names
*/
- protected String[] getMandatoryProperties() {
- return(new String[0]);
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+ return(ret);
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+ ret.add(SESSION);
+ ret.add(IDENTITIES);
+ ret.add(SERVICE_DESCRIPTION_NAME);
+ return(ret);
+ }
+
+ /**
* This method returns the action's class name.
*
* @return The action's class name
@@ -272,6 +304,29 @@
}
/**
+ * This method returns the list of property names defined for
+ * this action.
+ *
+ * @return The list of property names
+ */
+ public java.util.List<String> getPropertyNames() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+
+ if (m_action != null) {
+ org.w3c.dom.NodeList nl=m_action.getChildNodes();
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(PROPERTY_ELEMENT)) {
+ ret.add(((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR));
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
* This method returns the 'property' child nodes, associated with the
* supplied property name, within the action configuration.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -29,6 +29,9 @@
*/
public class CreateSessionAction extends AbstractESBAction {
+ public static final String ROOT = "root";
+ public static final String CONVERSATION_TYPE = "conversationType";
+
/**
* The constructor for the action.
*
@@ -52,6 +55,19 @@
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(CONVERSATION_TYPE);
+ ret.add(ROOT);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -91,8 +91,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -110,8 +110,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-07-17 13:25:20 UTC (rev 182)
@@ -29,6 +29,7 @@
_NOT_FOUND_PERFORM_CREATE_SESSION=Perform action can only invoke a service descriptor that starts with a CreateSessionAction
_NOT_SPECIFIED_CONVERSATION_TYPE=Conversation type must be specified on root service descriptor
_NOT_SPECIFIED_CONVERSATION_TYPE_ROLE=Conversation type '{0}' must specify a role name following the '@' symbol
+_NOT_SPECIFIED_PROPERTY=Property '{0}' must be specified
_NOT_SPECIFIED_REQ_RESP_EPR=Send does not contain request service category/name or response client EPR
_MUST_BE_FIRST_ACTION='{0}' action must be first in the service descriptor
_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION=Must specify either a State OR Message based expression
@@ -37,6 +38,7 @@
_PATH_SERVICE_DETAILS_MISSING=One or more paths are missing the service cateogry and/or name
_ROUTER_ONE_OR_MORE_PATHS=MessageRouter action must specify one or more routes
_SWITCH_ONE_OR_MORE_PATHS=Switch action must specify atleast one case
+_UNKNOWN_PROPERTY=Property '{0}' is unknown for this action
_WHEN_ONE_OR_MORE_PATHS=When action must specify atleast one entry
_WHEN_PATH_AFTER_JOIN=When path must not be defined after a join
_WHILE_PATH_AFTER_EXIT=While path must not be defined after an exit
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -106,8 +106,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -28,10 +28,11 @@
*/
public class PerformAction extends AbstractESBAction {
- private static final String SERVICE_NAME = "serviceName";
- private static final String SERVICE_CATEGORY = "serviceCategory";
- private static final String JOIN_SERVICE_NAME = "joinServiceName";
- private static final String JOIN_SERVICE_CATEGORY = "joinServiceCategory";
+ public static final String SERVICE_NAME = "serviceName";
+ public static final String SERVICE_CATEGORY = "serviceCategory";
+ public static final String RETURN_SERVICE_NAME = "returnServiceName";
+ public static final String RETURN_SERVICE_CATEGORY = "returnServiceCategory";
+ public static final String BIND_DETAILS = "bindDetails";
/**
* The constructor for the action.
@@ -62,8 +63,8 @@
getLinks().add(new ESBLink(m_category, m_name, m_service, true));
}
- m_joinCategory=getPropertyValue(JOIN_SERVICE_CATEGORY);
- m_joinName=getPropertyValue(JOIN_SERVICE_NAME);
+ m_joinCategory=getPropertyValue(RETURN_SERVICE_CATEGORY);
+ m_joinName=getPropertyValue(RETURN_SERVICE_NAME);
if (m_joinCategory != null && m_joinName != null) {
m_joinService=getService().getModel().getService(m_joinCategory, m_joinName);
@@ -89,11 +90,28 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{SERVICE_CATEGORY, SERVICE_NAME});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(SERVICE_CATEGORY);
+ ret.add(SERVICE_NAME);
+ return(ret);
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(RETURN_SERVICE_NAME);
+ ret.add(RETURN_SERVICE_CATEGORY);
+ ret.add(BIND_DETAILS);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -31,6 +31,7 @@
private static final String IDENTITIES = "identities";
private static final String MESSAGE_TYPE = "messageType";
private static final String OPERATION = "operation";
+ private static final String CLIENT_EPR = "clientEPR";
/**
* The constructor for the action.
@@ -50,11 +51,27 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{MESSAGE_TYPE,IDENTITIES});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(MESSAGE_TYPE);
+ ret.add(IDENTITIES);
+ return(ret);
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(OPERATION);
+ ret.add(CLIENT_EPR);
+ return(ret);
+ }
+
+ /**
* This method converts the ESB action into an equivalent
* behavioural description for conformance checking.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -27,7 +27,7 @@
*/
public class RetrieveSessionAction extends AbstractESBAction {
- private static final String IDENTITIES = "identities";
+ public static final String IDENTITIES = "identities";
/**
* The constructor for the action.
@@ -47,8 +47,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{IDENTITIES});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(IDENTITIES);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -68,11 +68,26 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{SERVICE_CATEGORY, SERVICE_NAME});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(SERVICE_CATEGORY);
+ ret.add(SERVICE_NAME);
+ return(ret);
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(IMMEDIATE);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -87,11 +87,33 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{MESSAGE_TYPE, IDENTITIES});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(MESSAGE_TYPE);
+ ret.add(IDENTITIES);
+ return(ret);
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(OPERATION);
+ ret.add(CLIENT_EPR);
+ ret.add(RESPONSE_SERVICE_NAME);
+ ret.add(RESPONSE_SERVICE_CATEGORY);
+ ret.add(SERVICE_NAME);
+ ret.add(SERVICE_CATEGORY);
+ ret.add(SERVICE_NAME_EXPRESSION);
+ ret.add(SERVICE_CATEGORY_EXPRESSION);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -28,6 +28,7 @@
public class SetMessageAction extends AbstractESBAction {
public static final String STATE_EXPRESSION = "stateExpression";
+ public static final String HEADER_PROPERTY = "headerProperty";
/**
* The constructor for the action.
@@ -47,11 +48,25 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{STATE_EXPRESSION});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(STATE_EXPRESSION);
+ return(ret);
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(HEADER_PROPERTY);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -51,11 +51,26 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{VARIABLE});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(VARIABLE);
+ return(ret);
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(STATE_EXPRESSION);
+ ret.add(MESSAGE_EXPRESSION);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -83,8 +83,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -103,8 +103,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -115,8 +115,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -0,0 +1,109 @@
+/*
+ * 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.jbossesb.model.util;
+
+import org.scribble.model.*;
+import org.scribble.osgi.model.OSGIModelRepository;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.jboss.tools.overlord.jbossesb.model.*;
+
+public class ClasspathUtil {
+
+ public static ClassLoader getClassLoader(ESBLanguageModel model)
+ throws Exception {
+ ClassLoader ret=null;
+
+ if (model instanceof DefaultESBLanguageModel) {
+ ret = ((DefaultESBLanguageModel)model).getModelClassLoader();
+ } else {
+ ret = createClassLoader(model.getModelReference());
+ }
+
+ return(ret);
+ }
+
+ public synchronized static ClassLoader createClassLoader(ModelReference ref)
+ throws Exception {
+ ClassLoader ret=null;
+
+ IFile file=OSGIModelRepository.getFile(ref);
+
+ if (file != null) {
+ IJavaProject javaProject=JavaCore.create(file.getProject());
+ java.util.List<java.net.URL> urls=new java.util.Vector<java.net.URL>();
+
+ scanProjectForClasspath(javaProject, urls);
+
+ java.net.URL[] urlarray=new java.net.URL[urls.size()];
+ urls.toArray(urlarray);
+
+ ret = new java.net.URLClassLoader(urlarray,
+ String.class.getClassLoader());
+ }
+
+ return(ret);
+ }
+
+ protected static void scanProjectForClasspath(IJavaProject javaProject,
+ java.util.List<java.net.URL> urls) throws Exception {
+ IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
+
+ IResource outres=ResourcesPlugin.getWorkspace().getRoot().findMember(javaProject.getOutputLocation());
+ if (outres != null) {
+ urls.add(new java.io.File(outres.getLocation().toPortableString()).toURL());
+ }
+
+ for (IClasspathEntry entry : entries) {
+ if(entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
+ IResource project =
+ ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
+
+ if (project instanceof IProject) {
+ IJavaProject jproj=JavaCore.create((IProject)project);
+
+ if (jproj != null) {
+ scanProjectForClasspath(jproj, urls);
+ }
+ }
+
+ } else {
+
+ IResource res=ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
+
+ java.net.URL url=null;
+
+ if (res != null) {
+ url = new java.io.File(res.getLocation().
+ toPortableString()).toURL();
+ } else {
+ url = entry.getPath().toFile().toURL();
+ }
+
+ if (url != null && urls.contains(url) == false) {
+ urls.add(url);
+ }
+ }
+ }
+ }
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -38,7 +38,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -30,7 +30,7 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceName", "");
+ props.put(PerformAction.SERVICE_NAME, "");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -42,7 +42,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceCategory"}));
@@ -58,7 +58,7 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "");
+ props.put(PerformAction.SERVICE_CATEGORY, "");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -70,7 +70,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceName"}));
@@ -86,8 +86,8 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -116,15 +116,15 @@
}
}
- public void testValidateJoinService() {
+ public void testValidateReturnService() {
TestESBService service=new TestESBService();
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
- props.put("joinServiceCategory", "cat2");
- props.put("joinServiceName", "name2");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.RETURN_SERVICE_CATEGORY, "cat2");
+ props.put(PerformAction.RETURN_SERVICE_NAME, "name2");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -164,10 +164,10 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
- props.put("joinServiceCategory", "cat2");
- props.put("joinServiceName", "name2");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.RETURN_SERVICE_CATEGORY, "cat2");
+ props.put(PerformAction.RETURN_SERVICE_NAME, "name2");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -211,10 +211,10 @@
TestESBService service=new TestESBService();
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
- props.put("joinServiceCategory", "cat2");
- props.put("joinServiceName", "name2");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.RETURN_SERVICE_CATEGORY, "cat2");
+ props.put(PerformAction.RETURN_SERVICE_NAME, "name2");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -281,10 +281,10 @@
TestESBService service=new TestESBService();
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
- props.put("joinServiceCategory", "cat2");
- props.put("joinServiceName", "name2");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.RETURN_SERVICE_CATEGORY, "cat2");
+ props.put(PerformAction.RETURN_SERVICE_NAME, "name2");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -41,7 +41,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"messageType"}));
@@ -69,7 +69,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -92,7 +92,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -41,7 +41,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceCategory"}));
@@ -69,7 +69,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceName"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -46,7 +46,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"messageType"}));
@@ -75,7 +75,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -39,7 +39,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{SetMessageAction.STATE_EXPRESSION}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{SetStateAction.VARIABLE}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
15 years, 9 months
- 1
- 0
Overlord SVN: r180 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model: actions and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-07-16 13:28:58 -0400 (Wed, 16 Jul 2008)
New Revision: 180
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
Log:
Changed classloader so uses external references, as required to access Jars in maven repository. Also fixed mismatch session error, to not report error if the session is not specified.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-16 15:51:52 UTC (rev 179)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-16 17:28:58 UTC (rev 180)
@@ -576,12 +576,19 @@
} else {
IResource res=ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
+
+ java.net.URL url=null;
+
if (res != null) {
- urls.add(new java.io.File(res.getLocation().
- toPortableString()).toURL());
+ url = new java.io.File(res.getLocation().
+ toPortableString()).toURL();
} else {
- logger.finest("Skipping external resource '"+entry.getPath()+"'");
+ url = entry.getPath().toFile().toURL();
}
+
+ if (url != null && urls.contains(url) == false) {
+ urls.add(url);
+ }
}
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-16 15:51:52 UTC (rev 179)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-16 17:28:58 UTC (rev 180)
@@ -169,6 +169,7 @@
}
} else if (getService().getSessionName() != null &&
isPerform() == false && link.isRemote() == false &&
+ link.getService().getSessionName() != null &&
getService().getSessionName().equals(
link.getService().getSessionName()) == false) {
15 years, 9 months
- 1
- 0