August 2008 - overlord-commits - Jboss List Archives

Overlord SVN: r235 - in cdl/trunk: assembly and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2008-08-12 23:27:18 -0400 (Tue, 12 Aug 2008) New Revision: 235 Added: cdl/trunk/assembly/ cdl/trunk/assembly/jbossesb/ cdl/trunk/assembly/pom.xml Removed: cdl/trunk/assembly/jbossesb/ cdl/trunk/assembly/pom.xml cdl/trunk/distribution/assembly/ Modified: cdl/trunk/pom.xml Log: * Restructure the 'assembly' folder. Copied: cdl/trunk/assembly (from rev 225, cdl/trunk/distribution/assembly) Copied: cdl/trunk/assembly/jbossesb (from rev 234, cdl/trunk/distribution/assembly/jbossesb) Deleted: cdl/trunk/assembly/pom.xml =================================================================== --- cdl/trunk/distribution/assembly/pom.xml 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/assembly/pom.xml 2008-08-13 03:27:18 UTC (rev 235) @@ -1,47 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.soa.overlord.cdl</groupId> - <artifactId>assembly</artifactId> - <packaging>pom</packaging> - <version>1.0-SNAPSHOT</version> - <name>Overlord::CDL::Assembly</name> - <url>http://www.jboss.org/soag</url> - - <parent> - <groupId>org.jboss.soa.overlord</groupId> - <artifactId>cdl</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <modules> - <module>jbossesb</module> - </modules> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>2.0-20080130.110241-9</version> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - - <pluginRepositories> - <pluginRepository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots/> - <id>jboss-plugin-snapshots</id> - <name>JBoss Snapshot Plugin Repository</name> - <url>http://snapshots.repository.codehaus.org</url> - </pluginRepository> - </pluginRepositories> - - -</project> - Copied: cdl/trunk/assembly/pom.xml (from rev 234, cdl/trunk/distribution/assembly/pom.xml) =================================================================== --- cdl/trunk/assembly/pom.xml (rev 0) +++ cdl/trunk/assembly/pom.xml 2008-08-13 03:27:18 UTC (rev 235) @@ -0,0 +1,47 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.soa.overlord.cdl</groupId> + <artifactId>assembly</artifactId> + <packaging>pom</packaging> + <version>1.0-SNAPSHOT</version> + <name>Overlord::CDL::Assembly</name> + <url>http://www.jboss.org/soag</url> + + <parent> + <groupId>org.jboss.soa.overlord</groupId> + <artifactId>cdl</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <modules> + <module>jbossesb</module> + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-packaging-maven-plugin</artifactId> + <version>2.0-20080130.110241-9</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + + <pluginRepositories> + <pluginRepository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots/> + <id>jboss-plugin-snapshots</id> + <name>JBoss Snapshot Plugin Repository</name> + <url>http://snapshots.repository.codehaus.org</url> + </pluginRepository> + </pluginRepositories> + + +</project> + Modified: cdl/trunk/pom.xml =================================================================== --- cdl/trunk/pom.xml 2008-08-12 14:16:39 UTC (rev 234) +++ cdl/trunk/pom.xml 2008-08-13 03:27:18 UTC (rev 235) @@ -38,8 +38,7 @@ </developers> <modules> <module>runtime</module> - <module>distribution/assembly</module> - <module>samples</module> + <module>assembly</module> </modules> <properties>

15 years, 9 months

1
0
0 / 0

Overlord SVN: r234 - in sam/trunk/modules: core/src/main/java/org/jboss/sam and 9 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-08-12 10:16:39 -0400 (Tue, 12 Aug 2008) New Revision: 234 Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml Modified: sam/trunk/modules/core/pom.xml sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamOutput.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java 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/stream/InVMStreamInput.java sam/trunk/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java Log: Add intermediary that applies confgurations to an event processor Modified: sam/trunk/modules/core/pom.xml =================================================================== --- sam/trunk/modules/core/pom.xml 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/pom.xml 2008-08-12 14:16:39 UTC (rev 234) @@ -101,7 +101,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>org/jboss/test/sam/database/DatabaseTestCase.java</exclude> +  </excludes> </configuration> </plugin> Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2008-08-12 14:16:39 UTC (rev 234) @@ -108,6 +108,8 @@ String getName(); + void setName(String name); + T getUnderlying(); } Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java 2008-08-12 14:16:39 UTC (rev 234) @@ -52,4 +52,6 @@ * @return */ String getStreamName(); + + void setStreamName(String name); } Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamOutput.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamOutput.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamOutput.java 2008-08-12 14:16:39 UTC (rev 234) @@ -47,4 +47,6 @@ * @return */ String getStreamName(); + + void setStreamName(String name); } Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java 2008-08-12 14:16:39 UTC (rev 234) @@ -0,0 +1,100 @@ +/* + * 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.config; + +import org.jboss.sam.EventProcessor; +import org.jboss.sam.StreamInput; +import org.jboss.sam.StreamOutput; + +/** + * An intermediary to configure {@link org.jboss.sam.EventProcessor}'s + * from configuration descriptors. Allows for interception/modification + * of configuration values. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class Configurator +{ + private ClassLoader loader = Thread.currentThread().getContextClassLoader(); + private ProcessingNodeDef nodeDef; + + public Configurator(ProcessingNodeDef nodeDef, ClassLoader loader) + { + this.nodeDef = nodeDef; + this.loader = loader; + } + + public Configurator(ProcessingNodeDef nodeDef) + { + this.nodeDef = nodeDef; + } + + public void configure(EventProcessor processor) + { + processor.setName( nodeDef.getName() ); + + for(StreamInputDef def : nodeDef.getInputs()) + { + StreamInput input = (StreamInput)newInstance(def.getClazz()); + input.setStreamName(def.getName()); + processor.addInput(input); + } + + for(StreamOutputDef def : nodeDef.getOutputs()) + { + StreamOutput output = (StreamOutput)newInstance(def.getClazz()); + output.setStreamName(def.getName()); + processor.addOutput(output); + } + + for(StatementDef def : nodeDef.getStatements()) + { + if(def.getBoundTo()!=null) + { + processor.registerBoundStatement( + def.getBoundTo(), def.getName(), def.getEpl().getExpression() + ); + } + else + { + processor.registerStatement( + def.getName(), def.getEpl().getExpression() + ); + } + } + } + + private Object newInstance(String clazz) + { + Object obj = null; + try + { + obj = loader.loadClass( clazz ).newInstance(); + } + catch (Exception e) + { + throw new RuntimeException("Failed to load class: " + clazz, e); + } + + return obj; + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java 2008-08-12 14:16:39 UTC (rev 234) @@ -80,5 +80,5 @@ public void setBoundTo(String boundTo) { this.boundTo = boundTo; - } + } } Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java 2008-08-12 14:16:39 UTC (rev 234) @@ -31,12 +31,16 @@ public String unmarshal(String expr) throws Exception { - if(expr.indexOf("<![CDATA[") ==-1) - throw new IllegalArgumentException("EPLDef.expression does not contain CDATA section"); + String result = expr; - return expr.substring( - expr.indexOf("<![CDATA[")+1, expr.indexOf("]]") - ); + if(expr.indexOf("<![CDATA[") !=-1) // seems that JAXB strips it by default + { + result = expr.substring( + expr.indexOf("<![CDATA[")+1, expr.indexOf("]]") + ); + } + + return result; } public String marshal(String expr) throws Exception Modified: 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 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2008-08-12 14:16:39 UTC (rev 234) @@ -31,6 +31,8 @@ import org.drools.lang.descr.PackageDescr; import org.drools.spi.GlobalResolver; import org.jboss.sam.*; +import org.jboss.sam.config.ConfigFactory; +import org.jboss.sam.config.Configurator; import java.io.*; import java.net.URL; @@ -66,17 +68,28 @@ try { + this.ruleBase = RuleBaseFactory.newRuleBase( RuleBase.RETEOO, null ); this.session = ruleBase.newStatefulSession(); this.session.setGlobalResolver(this); + // parse config + if(config!=null) applyConfiguration(config); + } catch (Exception e) { throw new RuntimeException("Failed to initialize event processor", e); } } + private void applyConfiguration(URL config) throws Exception + { + ConfigFactory cfgFactory = ConfigFactory.newInstance(); + Configurator cfg = new Configurator( cfgFactory.unmarshall(config) ); + cfg.configure(this); + } + public Object resolveGlobal(String key) { Object global = null; @@ -217,11 +230,18 @@ clearStatement(stmtNames.next()); } } + public String getName() { return this.name; } + + public void setName(String name) + { + this.name = name; + } + public RuleBase getUnderlying() { return this.ruleBase; Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java 2008-08-12 14:16:39 UTC (rev 234) @@ -34,6 +34,11 @@ private String streamName; InVMStreamRegistry channelRegistry; + + public InVMStreamInput() + { + this.channelRegistry = InVMStreamRegistry.getInstance(); + } public InVMStreamInput(String name) { @@ -63,6 +68,12 @@ return this.streamName; } + + public void setStreamName(String name) + { + this.streamName = name; + } + public void registerCallback(StreamInputCallback listener) { channelRegistry.getChannelCallbacks(streamName).add(listener); Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java =================================================================== --- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java 2008-08-12 14:16:39 UTC (rev 234) @@ -82,8 +82,14 @@ public String getStreamName() { return this.streamName; - } + } + + public void setStreamName(String name) + { + this.streamName = name; + } + public void write(EventMessage[] args) { update(args, new EventMessage[]{}); Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java =================================================================== --- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java 2008-08-12 14:16:39 UTC (rev 234) @@ -93,6 +93,7 @@ assertEquals(1, pnd.getStatements().size()); assertEquals(1, pnd.getInputs().size()); assertEquals(1, pnd.getOutputs().size()); - assertEquals(0, pnd.getProps().size()); + assertEquals(0, pnd.getProps().size()); + assertNotNull("EPL is null", pnd.getStatements().get(0).getEpl().getExpression()); } } Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java =================================================================== --- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2008-08-12 14:16:39 UTC (rev 234) @@ -37,7 +37,7 @@ public void setUp() throws Exception { // Runtime - createProcessorWithDefaultIO("DataBaseTestCase", "database/esper-cfg.xml"); + createProcessorWithDefaultIO("DataBaseTestCase", "database/sam-cfg.xml"); // InMemory Database db = createDatabase(); @@ -75,7 +75,7 @@ public void testTriggeredSQLQuery() throws Exception { // setup - String epl = "select symbol, price from Query.win:length(1) as query," + + /*String epl = "select symbol, price from Query.win:length(1) as query," + " sql:SamTestDB ['SELECT symbol, price FROM quotes WHERE symbol like (${query.criteria})']"; eventProcessor.registerBoundStatement("InVM","TriggerSQL", epl); @@ -91,7 +91,7 @@ for(EventMessage event : eventMessages) { System.out.println("symbol/price -> " + event.getProperty("symbol") + "/" + event.getProperty("price")); - } + } */ } public void testEsperPullAPI() throws Exception Added: sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml =================================================================== --- sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml (rev 0) +++ sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml 2008-08-12 14:16:39 UTC (rev 234) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<ns2:processingNode name="DatabaseTestCase" + domain="http://org.jboss.sam/test/database" + xmlns:ns2="http://org.jboss.sam/08/2008/"> + <config/> + <inputs> + <input name="VMInput" clazz="org.jboss.sam.internal.stream.InVMStreamInput"/> + </inputs> + <outputs> + <output name="VMOutput" clazz="org.jboss.test.sam.BufferedStreamOutput"/> + </outputs> + <statements> + <statement name="ExampleStatement"> + <epl lang="drl"><![CDATA[ +package org.jboss.test.sam.drools; + +import org.jboss.test.sam.drools.StockTick; +global org.jboss.sam.internal.drools.DroolsAdapter Drools; + +rule "Check event" +when + $st: StockTick(symbol == "ACME") +then + Drools.getListener("InVM").update($st); +end +]]></epl> + </statement> + </statements> +</ns2:processingNode> \ No newline at end of file Property changes on: sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java =================================================================== --- sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java 2008-08-12 13:07:17 UTC (rev 233) +++ sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java 2008-08-12 14:16:39 UTC (rev 234) @@ -92,6 +92,12 @@ return this.streamName; } + + public void setStreamName(String name) + { + this.streamName = name; + } + public void write(EventMessage[] events) { if(null==this.context)

15 years, 9 months

1
0
0 / 0

Overlord SVN: r233 - in sam/trunk: modules/core and 1 other directory.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-08-12 09:07:17 -0400 (Tue, 12 Aug 2008) New Revision: 233 Modified: sam/trunk/modules/core/pom.xml sam/trunk/pom.xml Log: Move test excludes to modules Modified: sam/trunk/modules/core/pom.xml =================================================================== --- sam/trunk/modules/core/pom.xml 2008-08-12 12:57:49 UTC (rev 232) +++ sam/trunk/modules/core/pom.xml 2008-08-12 13:07:17 UTC (rev 233) @@ -64,7 +64,7 @@ <artifactId>javasim</artifactId> </dependency> - <dependency> + <dependency> <groupId>janino</groupId> <artifactId>janino</artifactId> </dependency> @@ -76,14 +76,14 @@ <dependency> <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <artifactId>jaxb-impl</artifactId> </dependency> <dependency> <groupId>org.mvel</groupId> <artifactId>mvel</artifactId> </dependency> - + </dependencies>  @@ -96,6 +96,16 @@ </resource> </resources> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jboss/test/sam/database/DatabaseTestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> </build> <profiles> Modified: sam/trunk/pom.xml =================================================================== --- sam/trunk/pom.xml 2008-08-12 12:57:49 UTC (rev 232) +++ sam/trunk/pom.xml 2008-08-12 13:07:17 UTC (rev 233) @@ -156,10 +156,7 @@ <configuration>   - <argLine>${surefire.jvm.args}</argLine> - <excludes> - <exclude>org/jboss/test/sam/database/DatabaseTestCase.java</exclude> - </excludes> + <argLine>${surefire.jvm.args}</argLine> </configuration> </plugin> <plugin>

15 years, 9 months

1
0
0 / 0

Overlord SVN: r232 - in sam/trunk: modules/sim and 1 other directory.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-08-12 08:57:49 -0400 (Tue, 12 Aug 2008) New Revision: 232 Modified: sam/trunk/modules/sim/pom.xml sam/trunk/pom.xml Log: Exclude broken simulation samples and re-enable the sim module Modified: sam/trunk/modules/sim/pom.xml =================================================================== --- sam/trunk/modules/sim/pom.xml 2008-08-12 12:41:40 UTC (rev 231) +++ sam/trunk/modules/sim/pom.xml 2008-08-12 12:57:49 UTC (rev 232) @@ -6,7 +6,7 @@ <groupId>org.jboss.sam</groupId> <artifactId>sim</artifactId> <packaging>jar</packaging> - +  <parent> <groupId>org.jboss.sam</groupId> @@ -34,10 +34,10 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - + <dependency> <groupId>javasim</groupId> - <artifactId>javasim</artifactId> + <artifactId>javasim</artifactId> </dependency> </dependencies> @@ -51,7 +51,21 @@ <filtering>true</filtering> </resource> </resources> - + + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jboss/test/sam/samples/pattern/PatternTestCase.java</exclude> + <exclude>org/jboss/test/sam/samples/aggregation/FilteringTestCase.java</exclude> + <exclude>org/jboss/test/sam/samples/falloff/FalloffTestCase.java</exclude> + <exclude>org/jboss/test/sam/samples/aggregation/AggregationTestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> <profiles> Modified: sam/trunk/pom.xml =================================================================== --- sam/trunk/pom.xml 2008-08-12 12:41:40 UTC (rev 231) +++ sam/trunk/pom.xml 2008-08-12 12:57:49 UTC (rev 232) @@ -12,7 +12,7 @@ <modules> <module>modules/core</module> <module>modules/fx</module> -  + <module>modules/sim</module> </modules>

15 years, 9 months

1
0
0 / 0

Overlord SVN: r231 - in sam/trunk: modules/core and 5 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-08-12 08:41:40 -0400 (Tue, 12 Aug 2008) New Revision: 231 Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ExpressionConverter.java sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/NoCharacterEscapeHandler.java sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java Modified: sam/trunk/SAM.ipr sam/trunk/SAM.iws sam/trunk/modules/core/pom.xml sam/trunk/pom.xml sam/trunk/sam-trunk.iml Log: Added simple configuration mechanism Modified: sam/trunk/SAM.ipr =================================================================== --- sam/trunk/SAM.ipr 2008-08-12 12:41:06 UTC (rev 230) +++ sam/trunk/SAM.ipr 2008-08-12 12:41:40 UTC (rev 231) @@ -292,8 +292,9 @@ <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/env/gwt-linux-1.5.0/samples/gwt-samples.iml" filepath="/home/hbraun/dev/env/gwt-linux-1.5.0/samples/gwt-samples.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:///home/hbraun/dev/prj/jbpm/jbpm3/trunk/jbpm3-trunk.iml" filepath="/home/hbraun/dev/prj/jbpm/jbpm3/trunk/jbpm3-trunk.iml" /> + <module fileurl="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/jbossbpm-jbpm3.iml" filepath="/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/jbossbpm-jbpm3.iml" /> <module fileurl="file://$PROJECT_DIR$/sam-trunk.iml" filepath="$PROJECT_DIR$/sam-trunk.iml" /> </modules> </component> Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-08-12 12:41:06 UTC (rev 230) +++ sam/trunk/SAM.iws 2008-08-12 12:41:40 UTC (rev 231) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4" relativePaths="false"> - <component name="BookmarkManager" /> + <component name="BookmarkManager"> + <editor_bookmark url="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/identity/pom.xml" line="39" /> + </component> <component name="ChangeBrowserSettings"> <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> @@ -17,67 +19,30 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/viz/esper-cfg.xml" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/resources/adapter/invm/esper-cfg.xml" afterPath="$PROJECT_DIR$/modules/sim/src/test/resources/adapter/invm/esper-cfg.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/drools" /> + <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="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="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" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/StatementContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/StatementContext.java" /> + <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.ipr" afterPath="$PROJECT_DIR$/SAM.ipr" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sam-trunk.iml" afterPath="$PROJECT_DIR$/sam-trunk.iml" /> - <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="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="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/StockTick.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="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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/stream/invm" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/simulation/esper-cfg.xml" 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="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="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/drools/forward.drl" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/viz" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java" /> - <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsAdapter.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/esper-cfg.xml" afterPath="" /> - <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/test/resources/samples/esper-default-cfg.xml" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/ObjectMessageAdaptor.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter/invm/InVMStreamTestCase.java" afterPath="" /> - <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="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="/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" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/samples/pattern" afterPath="" /> - <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="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/simulation" afterPath="" /> - <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.ipr" afterPath="$PROJECT_DIR$/SAM.ipr" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/UpdateListener.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/esper-cfg.xml" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/drools/simple.drl" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter/invm/InVMAdapterTestCase.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/stream" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/samples/pattern/esper-cfg.xml" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/drools/aggregate.drl" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/pom.xml" afterPath="$PROJECT_DIR$/modules/core/pom.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/samples" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter/invm/Alert.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter/invm/Alert.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/ObjectMessageAdaptor.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/ObjectMessageAdaptor.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" /> </list> @@ -151,7 +116,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <breakpoint url="file:///home/hbraun/dev/prj/drools/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java" line="219" class="org.drools.rule.builder.dialect.java.JavaDialect" package="org.drools.rule.builder.dialect.java"> + <breakpoint url="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java" line="73" class="org.jbpm.db.hibernate.HibernateHelper" package="org.jbpm.db.hibernate"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -164,7 +129,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java" line="42" class="org.jboss.test.sam.drools.ApiTestCase" package="org.jboss.test.sam.drools"> + <breakpoint url="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/DeployProcessActionListener.java" line="36" class="org.jbpm.jsf.core.action.DeployProcessActionListener" package="org.jbpm.jsf.core.action"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -177,7 +142,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" line="117" class="org.jboss.sam.internal.drools.DroolsEventProcessorImpl" package="org.jboss.sam.internal.drools"> + <breakpoint url="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/JbpmContext.java" line="565" class="org.jbpm.JbpmContext" package="org.jbpm"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -190,6 +155,19 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessesActionListener.java" line="32" class="org.jbpm.jsf.core.action.ListProcessesActionListener" package="org.jbpm.jsf.core.action"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -245,12 +223,19 @@ </component> <component name="ErrorTreeViewConfiguration"> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="HIDE_WARNINGS" value="false" /> + <option name="HIDE_WARNINGS" value="true" /> </component> <component name="FavoritesManager"> <favorites_list name="JBPM3-BI"> <favorite_root url="org.jbpm.svc.save.SaveLogsOperation" module="jbpm3-trunk" type="class" klass="com.intellij.ide.favoritesTreeView.smartPointerPsiNodes.ClassSmartPointerNode" /> <favorite_root url="org.jbpm.logging.exe.LoggingInstance" module="jbpm3-trunk" type="class" klass="com.intellij.ide.favoritesTreeView.smartPointerPsiNodes.ClassSmartPointerNode" /> + <favorite_root url="file:///home/hbraun/dev/prj/jbpm/jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/log/NodeLog.java" type="psiFile" klass="com.intellij.ide.projectView.impl.nodes.PsiFileNode" /> + <favorite_root url="file:///home/hbraun/dev/prj/jbpm/jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/log/ProcessInstanceCreateLog.java" type="psiFile" klass="com.intellij.ide.projectView.impl.nodes.PsiFileNode" /> + <favorite_root url="org.jbpm.graph.log.ProcessInstanceEndLog" module="jbpm3-trunk" type="class" klass="com.intellij.ide.favoritesTreeView.smartPointerPsiNodes.ClassSmartPointerNode" /> + <favorite_root url="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/log/NodeLog.java" type="psiFile" klass="com.intellij.ide.projectView.impl.nodes.PsiFileNode" /> + <favorite_root url="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/log/ProcessInstanceEndLog.java" type="psiFile" klass="com.intellij.ide.projectView.impl.nodes.PsiFileNode" /> + <favorite_root url="org.jbpm.graph.log.ProcessInstanceCreateLog" module="jbossbpm-jbpm3" type="class" klass="com.intellij.ide.favoritesTreeView.smartPointerPsiNodes.ClassSmartPointerNode" /> + <favorite_root url="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/logging/db/DbLoggingService.java" type="psiFile" klass="com.intellij.ide.projectView.impl.nodes.PsiFileNode" /> </favorites_list> <favorites_list name="Drools-Samples"> <favorite_root url="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java" type="psiFile" klass="com.intellij.ide.projectView.impl.nodes.PsiFileNode" /> @@ -294,51 +279,44 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="DatabaseTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java"> + <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="29" selection-start="1305" selection-end="1321" vertical-scroll-proportion="0.22836539"> + <state line="8" column="17" selection-start="400" selection-end="400" vertical-scroll-proportion="0.1794569"> <folding /> </state> </provider> </entry> </file> <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="142" column="71" selection-start="4876" selection-end="4876" vertical-scroll-proportion="0.33293268"> + <state line="11" column="27" selection-start="333" selection-end="333" vertical-scroll-proportion="-0.3653846"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="InVMAdapterTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter/invm/InVMAdapterTestCase.java"> + <file leaf-file-name="Application.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/Application.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="24" selection-start="1320" selection-end="1320" vertical-scroll-proportion="0.26918536"> - <folding /> + <state line="31" column="86" selection-start="1023" selection-end="1023" vertical-scroll-proportion="0.6953955"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="SamTestSetup.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java"> + <file leaf-file-name="SampleImageBundle.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/SampleImageBundle.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="47" selection-start="2758" selection-end="2758" vertical-scroll-proportion="0.60212517"> + <state line="27" column="17" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.1570248"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="test.drl" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/test.drl"> - <provider selected="true" editor-type-id="text-editor"> - <state line="7" column="41" selection-start="0" selection-end="245" vertical-scroll-proportion="0.1570248"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -384,7 +362,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jbpm3-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -394,60 +372,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jbpm3-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org.jbpm" /> - <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="jbpm3-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org.jbpm" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="logging" /> - <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="jbpm3-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org.jbpm" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="logging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="log" /> - <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="drools-trunk" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> @@ -501,10 +425,6 @@ <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> <PATH> <PATH_ELEMENT> @@ -512,13 +432,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <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> <PATH> <PATH_ELEMENT> @@ -526,17 +442,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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> <PATH> <PATH_ELEMENT> @@ -544,19 +456,19 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -566,33 +478,25 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl" /> <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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/identity" /> <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/test" /> - <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/test/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -600,37 +504,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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_ELEMENT> - <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/core/src/test" /> - <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/test/resources" /> - <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/test/resources/samples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -638,37 +522,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console" /> <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" /> - <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/test" /> - <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/test/resources" /> - <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/test/resources/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -676,41 +544,25 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console" /> <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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war" /> <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/test" /> - <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/test/resources" /> - <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/test/resources/adapter" /> - <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/test/resources/adapter/invm" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -718,49 +570,33 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console" /> <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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war" /> <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/test" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src" /> <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/test/java" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/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/test/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/test/java/org/jboss/test" /> - <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/test/java/org/jboss/test/sam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -768,107 +604,57 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console" /> <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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war" /> <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/test" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src" /> <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/test/java" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/java/org" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/java/org/jboss" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/java/org/jboss/test" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/java/org/jboss/test/sam" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm" /> <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/test/java/org/jboss/test/sam/drools" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/samples" /> <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="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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/samples/airticket" /> <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_ELEMENT> - <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/core/src/test" /> - <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/test/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/test/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/test/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/test/java/org/jboss/test" /> - <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/test/java/org/jboss/test/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/test/java/org/jboss/test/sam/database" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -876,57 +662,53 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console" /> <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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war" /> <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/test" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src" /> <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/test/java" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/java/org" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/java/org/jboss" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/java/org/jboss/test" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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/test/java/org/jboss/test/sam" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm" /> <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/test/java/org/jboss/test/sam/adapter" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console" /> <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/test/java/org/jboss/test/sam/adapter/invm" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -934,316 +716,58 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> + <option name="myItemId" value="jbossbpm-jbpm3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console" /> <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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war" /> <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/test" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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" /> - </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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/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" /> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm" /> <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="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="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console" /> <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:/home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client" /> <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_ELEMENT> - <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/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> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </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="drools-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </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="drools-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/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="drools-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk" /> - <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="drools-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler" /> - <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="drools-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/test" /> - <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="drools-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/test/java/org" /> - <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="drools-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/main" /> - <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="drools-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/drools/trunk/drools-compiler/src/main/java/org/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -1257,7 +781,7 @@ <showLibraryContents /> <hideEmptyPackages ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" /> + <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -1284,7 +808,7 @@ <property name="GoToClass.includeLibraries" value="false" /> <property name="cvs_file_history_flatWidth1" value="396" /> <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="RunManagerConfig.compileBeforeRunning" value="false" /> + <property name="RunManagerConfig.compileBeforeRunning" value="true" /> <property name="cvs_file_history_flatOrder2" value="2" /> <property name="cvs_file_history_flatOrder3" value="3" /> <property name="cvs_file_history_flatOrder0" value="0" /> @@ -1298,21 +822,22 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> + <recent name="org.jboss.bpm.console.client" /> <recent name="" /> </key> <key name="IntroduceConstantDialog.RECENTS_KEY"> <recent name="" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.bpm.console" /> <recent name="" /> <recent name="org.jboss.sam.sim" /> <recent name="org.jboss.test.sam" /> <recent name="org.jboss.sam.chart" /> - <recent name="org.jboss.sam.chart.internal" /> </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.client"> + <component name="RunManager" selected="GWT Configuration.SampleApp"> <tempConfiguration default="false" name="ApiTestCase" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <pattern value="org.jboss.test.sam.drools.*" /> <module name="sam-trunk" /> @@ -1341,19 +866,6 @@ <option name="Make" value="false" /> </method> </tempConfiguration> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="" /> - <method> - <option name="Make" value="true" /> - </method> - </configuration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -1373,17 +885,18 @@ <option name="Make" value="false" /> </method> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -1392,22 +905,36 @@ <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" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="5005" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="false" /> - </RunnerSettings> - <ConfigurationWrapper RunnerId="Debug" /> + <configuration default="true" type="GWT.ConfigurationType" factoryName="GWT Configuration"> + <module name="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="RUN_PAGE" value="" /> <method> <option name="Make" value="true" /> </method> </configuration> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> + <configuration default="false" name="SampleApp" type="GWT.ConfigurationType" factoryName="GWT Configuration"> + <module name="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="RUN_PAGE" value="sampleApp.SampleApp/SampleApp.html" /> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Run" /> + <method> + <option name="Make" value="true" /> + </method> + </configuration> <configuration default="false" name="PatternTestCase.testDetectLightSwitchFailure" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <pattern value="org.jboss.test.sam.samples.pattern.*" /> <module name="sam-trunk" /> @@ -1436,6 +963,38 @@ <option name="Make" value="false" /> </method> </configuration> + <configuration default="false" name="client" 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" /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="5005" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="false" /> + </RunnerSettings> + <ConfigurationWrapper RunnerId="Debug" /> + <method> + <option name="Make" value="true" /> + </method> + </configuration> + <configuration default="false" name="server" 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="8787" /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="8787" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="false" /> + </RunnerSettings> + <ConfigurationWrapper RunnerId="Debug" /> + <method> + <option name="Make" value="true" /> + </method> + </configuration> <configuration name="<template>" type="WebApp" default="true" selected="false"> <Host>localhost</Host> <Port>5050</Port> @@ -1523,8 +1082,8 @@ <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.53872436" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52164006" order="1" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3952164" 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" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32914287" order="8" /> @@ -1537,7 +1096,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.324954" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24954017" order="0" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20784795" 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" /> @@ -1624,118 +1183,123 @@ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> - <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.26602086" version="1"> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.26602086,0.5" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="M2 Dep: org.drools:drools-compiler:jar:5.0.0.20080716.092257-204:compile" /> + <option name="myLastEditedConfigurable" value="jbossbpm-jbpm3" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667" version="1"> <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java"> + <entry file="file:///home/hbraun/dev/env/gwt-linux-1.5.0/samples/DynaTable/src/com/google/gwt/sample/dynatable/public/DynaTable.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="13" selection-start="1183" selection-end="1183" vertical-scroll-proportion="0.04583836"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> </entry> - <entry file="jar:///usr/lib/jdk/32/jdk1.5.0_13/src.zip!/java/lang/Exception.java"> + <entry file="file:///home/hbraun/dev/env/gwt-linux-1.5.0/samples/Showcase/src/com/google/gwt/sample/showcase/public/Showcase.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="19" column="13" selection-start="495" selection-end="495" vertical-scroll-proportion="0.32086852"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/UpdateListener.java"> + <entry file="file:///home/hbraun/dev/env/gwt-linux-1.5.0/samples/Showcase/src/com/google/gwt/sample/showcase/Showcase.gwt.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="17" selection-start="1144" selection-end="1144" vertical-scroll-proportion="0.13751508"> + <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/core/src/main/java/org/jboss/sam/internal/drools/DroolsAdapter.java"> + <entry file="file:///home/hbraun/dev/env/gwt-linux-1.5.0/samples/Hello/www/com.google.gwt.sample.hello.Hello/hosted.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="58" column="61" selection-start="2175" selection-end="2175" vertical-scroll-proportion="0.7708082"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <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="89" column="23" selection-start="2596" selection-end="2596" vertical-scroll-proportion="0.33293125"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java"> + <entry file="file:///home/hbraun/dev/env/gwt-linux-1.5.0/samples/Hello/www/com.google.gwt.sample.hello.Hello/Hello.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="143" column="32" selection-start="4451" selection-end="4451" vertical-scroll-proportion="0.65621233"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/aggregate.drl"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/identity/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="9" column="7" selection-start="224" selection-end="224" vertical-scroll-proportion="0.20188902"> + <state line="18" column="45" selection-start="1083" selection-end="1083" vertical-scroll-proportion="0.40377805"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/forward.drl"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/profiles.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="10" column="46" selection-start="307" selection-end="307" vertical-scroll-proportion="0.22432113"> + <state line="24" column="24" selection-start="637" selection-end="993" vertical-scroll-proportion="0.5383707"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/profiles.xml.example"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="29" selection-start="1305" selection-end="1321" vertical-scroll-proportion="0.22836539"> + <state line="24" column="15" selection-start="993" selection-end="993" vertical-scroll-proportion="0.5383707"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="142" column="71" selection-start="4876" selection-end="4876" vertical-scroll-proportion="0.33293268"> + <state line="160" column="27" selection-start="5966" selection-end="6308" vertical-scroll-proportion="0.8233173"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/simple.drl"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/jpdl/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="9" column="43" selection-start="0" selection-end="252" vertical-scroll-proportion="0.20188902"> + <state line="28" column="17" selection-start="1138" selection-end="1333" vertical-scroll-proportion="0.6280992"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="32" selection-start="1709" selection-end="1709" vertical-scroll-proportion="0.3270366"> + <state line="8" column="17" selection-start="400" selection-end="400" vertical-scroll-proportion="0.1794569"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter/invm/InVMAdapterTestCase.java"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="24" selection-start="1320" selection-end="1320" vertical-scroll-proportion="0.26918536"> + <state line="11" column="27" selection-start="333" selection-end="333" vertical-scroll-proportion="-0.3653846"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/SampleImageBundle.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="47" selection-start="2758" selection-end="2758" vertical-scroll-proportion="0.60212517"> + <state line="27" column="17" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.1570248"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/test.drl"> + <entry file="file:///home/hbraun/dev/prj/jbpm/jbossbpm/impl/jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/Application.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="7" column="41" selection-start="0" selection-end="245" vertical-scroll-proportion="0.1570248"> - <folding /> + <state line="31" column="86" selection-start="1023" selection-end="1023" vertical-scroll-proportion="0.6953955"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> Modified: sam/trunk/modules/core/pom.xml =================================================================== --- sam/trunk/modules/core/pom.xml 2008-08-12 12:41:06 UTC (rev 230) +++ sam/trunk/modules/core/pom.xml 2008-08-12 12:41:40 UTC (rev 231) @@ -70,6 +70,16 @@ </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + + <dependency> <groupId>org.mvel</groupId> <artifactId>mvel</artifactId> </dependency> Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,118 @@ +/* + * 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.config; + +import com.sun.xml.bind.marshaller.CharacterEscapeHandler; +import org.jboss.sam.config.internal.NoCharacterEscapeHandler; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; + +/** + * Marshall/Unmarshall processing node definitions. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ConfigFactory +{ + public static ConfigFactory newInstance() + { + return new ConfigFactory(); + } + + public ProcessingNodeDef unmarshall(URL configFile) + { + try + { + return unmarshall(configFile.openStream()); + + } catch (IOException e) + { + throw new RuntimeException("Failed to unmarshall " + configFile , e); + } + } + + public ProcessingNodeDef unmarshall(InputStream inputStream) + { + ProcessingNodeDef pnd = null; + + try + { + JAXBContext jaxb = JAXBContext.newInstance(ProcessingNodeDef.class); + Unmarshaller unmarshaller = jaxb.createUnmarshaller(); + pnd = (ProcessingNodeDef) unmarshaller.unmarshal(inputStream); + + } catch (Exception e) + { + throw new RuntimeException("Failed to unmarshall configuration" , e); + } + finally + { + if(inputStream!=null) + try + { + inputStream.close(); + } catch (IOException e) + { + // + } + } + + return pnd; + + } + + public void marshall(ProcessingNodeDef pnd, OutputStream out) + { + try + { + JAXBContext jaxb = JAXBContext.newInstance(ProcessingNodeDef.class); + Marshaller marshaller = jaxb.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + // encoding needs to be different to UTF-8, otherwise the custom encode will not be used + marshaller.setProperty(Marshaller.JAXB_ENCODING, "ISO-8859-1"); + marshaller.setProperty( CharacterEscapeHandler.class.getName(), new NoCharacterEscapeHandler()); + marshaller.marshal(pnd, out); + } catch (JAXBException e) + { + throw new RuntimeException("Failed to marshall " + pnd, e); + } + finally + { + if(out!=null) + try + { + out.close(); + } catch (IOException e) + { + // + } + } + } + +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,71 @@ +/* + * 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.config; + +import org.jboss.sam.config.internal.EPLValueAdapter; + +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@XmlType(name = "eplType") +public class EPLDef +{ + private String lang; + private String expression; + + public EPLDef() + { + } + + public EPLDef(String lang) + { + this.lang = lang; + } + + @XmlAttribute(required = true) + public String getLang() + { + return lang; + } + + public void setLang(String lang) + { + this.lang = lang; + } + + @XmlValue + @XmlJavaTypeAdapter(EPLValueAdapter.class) + public String getExpression() + { + return expression; + } + + public void setExpression(String expression) + { + this.expression = expression; + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,134 @@ +/* + * 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.config; + +import javax.xml.bind.annotation.*; +import java.net.URI; +import java.util.List; +import java.util.ArrayList; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@XmlRootElement(name = "processingNode", namespace = "http://org.jboss.sam/08/2008/") +@XmlType( + name = "processingNodeType", + namespace = "http://org.jboss.sam/08/2008/", + propOrder = { + "props", "inputs", "outputs", "statements" + } +) +public class ProcessingNodeDef +{ + + private String name; + private URI domain; + + private List<StatementDef> statements = new ArrayList<StatementDef>(); + + private List<StreamInputDef> inputs = new ArrayList<StreamInputDef>(); + + private List<StreamOutputDef> outputs = new ArrayList<StreamOutputDef>(); + + private List<PropertyDef> props = new ArrayList<PropertyDef>(); + + + public ProcessingNodeDef() + { + } + + public ProcessingNodeDef(String name, URI domain) + { + this.name = name; + this.domain = domain; + } + + @XmlAttribute + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + @XmlAttribute + public URI getDomain() + { + return domain; + } + + public void setDomain(URI domain) + { + this.domain = domain; + } + + @XmlElementWrapper(name = "statements") + @XmlElement(name="statement") + public List<StatementDef> getStatements() + { + return statements; + } + + public void setStatements(List<StatementDef> statements) + { + this.statements = statements; + } + + @XmlElementWrapper(name = "inputs") + @XmlElement(name="input") + public List<StreamInputDef> getInputs() + { + return inputs; + } + + public void setInputs(List<StreamInputDef> inputs) + { + this.inputs = inputs; + } + + @XmlElementWrapper(name = "outputs") + @XmlElement(name="output") + public List<StreamOutputDef> getOutputs() + { + return outputs; + } + + public void setOutputs(List<StreamOutputDef> outputs) + { + this.outputs = outputs; + } + + @XmlElementWrapper(name = "properties") + @XmlElement(name="property") + public List<PropertyDef> getProps() + { + return props; + } + + public void setProps(List<PropertyDef> props) + { + this.props = props; + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,58 @@ +/* + * 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.config; + +import javax.xml.bind.annotation.XmlType; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@XmlType(name = "propertyDefType") +public class PropertyDef +{ + private String name; + private String value; + + public PropertyDef() + { + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,84 @@ +/* + * 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.config; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@XmlType(name = "statementDefType") + +public class StatementDef +{ + private String name; + private EPLDef epl; + private String boundTo; + + public StatementDef() + { + } + + public StatementDef(String name) + { + this.name = name; + } + + public StatementDef(String name, String boundTo) + { + this.name = name; + this.boundTo = boundTo; + } + + @XmlAttribute(required = true) + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public EPLDef getEpl() + { + return epl; + } + + public void setEpl(EPLDef epl) + { + this.epl = epl; + } + + @XmlAttribute(required = false) + public String getBoundTo() + { + return boundTo; + } + + public void setBoundTo(String boundTo) + { + this.boundTo = boundTo; + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,67 @@ +/* + * 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.config; + +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAttribute; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@XmlType(name = "inputDefType") +public class StreamInputDef +{ + private String name; + private String clazz; + + public StreamInputDef() + { + } + + public StreamInputDef(String name, String clazz) + { + this.name = name; + this.clazz = clazz; + } + + @XmlAttribute(required = true) + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + @XmlAttribute(required = true) + public String getClazz() + { + return clazz; + } + + public void setClazz(String clazz) + { + this.clazz = clazz; + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,67 @@ +/* + * 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.config; + +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAttribute; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@XmlType(name = "outputDefType") +public class StreamOutputDef +{ + private String name; + private String clazz; + + public StreamOutputDef() + { + } + + public StreamOutputDef(String name, String clazz) + { + this.name = name; + this.clazz = clazz; + } + + @XmlAttribute(required = true) + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + @XmlAttribute(required = true) + public String getClazz() + { + return clazz; + } + + public void setClazz(String clazz) + { + this.clazz = clazz; + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,54 @@ +/* + * 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.config.internal; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class EPLValueAdapter extends XmlAdapter<String, String> +{ + + public String unmarshal(String expr) throws Exception + { + if(expr.indexOf("<![CDATA[") ==-1) + throw new IllegalArgumentException("EPLDef.expression does not contain CDATA section"); + + return expr.substring( + expr.indexOf("<![CDATA[")+1, expr.indexOf("]]") + ); + } + + public String marshal(String expr) throws Exception + { + if(expr.indexOf("<![CDATA[") !=-1) + throw new IllegalArgumentException("EPLDef.expression may not contain CDATA section"); + + StringBuffer sb = new StringBuffer(); + sb.append("<![CDATA[").append("\n"); + sb.append(expr).append("\n"); + sb.append("]]>"); + + return sb.toString(); + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ExpressionConverter.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ExpressionConverter.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ExpressionConverter.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,68 @@ +/* + * 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.config.internal; + +import javax.xml.bind.DatatypeConverter; + +public class ExpressionConverter +{ + /** + * Convert an expression from an XML file into an internal representation. JAXB will + * probably have already stripped off the CDATA encapsulation. As a result, this method + * simply invokes the JAXB type conversion for strings but does not take any other action. + * + * @param text an XML-compliant expression + * @return a pure string expression + */ + public static String parse(String text) { + String result = DatatypeConverter.parseString(text); + return result; + } + + /** + * Convert an expression from its internal representation to an XML-compliant version. + * This method will simply surround the string in a CDATA block and return the result. + * + * @param text a pure string expression + * @return the expression encapsulated within a CDATA block + */ + public static String print(String text) { + StringBuffer sb = new StringBuffer(text.length() + 20); //should add the length of the CDATA tags + 8 EOLs to be safe + sb.append("<![CDATA["); + sb.append(wrapLines(text, 80)); + sb.append("]]>"); + return DatatypeConverter.printString(sb.toString()); + } + + /** + * Provides line-wrapping for long text strings. EOL indicators are inserted at + * word boundaries once a specified line-length has been exceeded. + * + * @param text the string to be wrapped + * @param lineLength the maximum number of characters that should be included in a single line + * @return the new string with appropriate EOL insertions + */ + private static String wrapLines(String text, int lineLength) { + //wrap logic, watchout for quoted strings!!!! + return text; + } +} Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ExpressionConverter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/NoCharacterEscapeHandler.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/NoCharacterEscapeHandler.java (rev 0) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/NoCharacterEscapeHandler.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,71 @@ +/* + * 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.config.internal; + +import com.sun.xml.bind.marshaller.CharacterEscapeHandler; + +import java.io.IOException; +import java.io.Writer; + +public class NoCharacterEscapeHandler implements CharacterEscapeHandler +{ + /** + * Escape characters inside the buffer and send the output to the writer. + * + * @param buf buffer of characters to be encoded + * @param start the index position of the first character that should be encoded + * @param len the number of characters that should be encoded + * @param isAttValue true, if the buffer represents an XML tag attribute + * @param out the output stream + * + * @throws java.io.IOException if the writing process fails + */ + public void escape(char[] buf, int start, int len, boolean isAttValue, Writer out) throws IOException + { + for (int i = start; i < start + len; i++) { + char ch = buf[i]; + if (isAttValue) { + // isAttValue is set to true when the marshaller is processing + // attribute values. Inside attribute values, there are more + // things you need to escape, usually. + if (ch == '&') { + out.write("&"); + } else if (ch == '>') { + out.write(">"); + } else if (ch == '<') { + out.write(""); + } else if (ch == '\'') { + out.write("'"); + } else if (ch > 0x7F) { + // escape everything above ASCII to XXXX; + out.write("&#x"); + out.write(Integer.toHexString(ch)); + out.write(";"); + } else { + out.write(ch); + } + } else { + out.write(ch); + } + } + } +} \ No newline at end of file Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/NoCharacterEscapeHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java =================================================================== --- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java (rev 0) +++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java 2008-08-12 12:41:40 UTC (rev 231) @@ -0,0 +1,98 @@ +/* + * 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.test.sam.config; + +import junit.framework.TestCase; +import org.jboss.sam.config.*; +import org.jboss.sam.internal.stream.InVMStreamInput; +import org.jboss.test.sam.BufferedStreamOutput; + +import java.io.ByteArrayOutputStream; +import java.io.ByteArrayInputStream; +import java.net.URI; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ConfigParserTestCase extends TestCase +{ + private static byte[] XML_CONFIG = null; + + private ConfigFactory cfgFactory; + + protected void setUp() throws Exception + { + this.cfgFactory = ConfigFactory.newInstance(); + } + + public void testMarshalling() throws Exception + { + ProcessingNodeDef pnd = new ProcessingNodeDef("BPMEventProcessor", new URI("http://org.jboss.bpm/console")); + + // define stream input and outputs + pnd.getInputs().add( new StreamInputDef("VMInput", InVMStreamInput.class.getName()) ); + pnd.getOutputs().add( new StreamOutputDef("VMOutput", BufferedStreamOutput.class.getName()) ); + + // construct an EPL + EPLDef epl = new EPLDef("drl"); + epl.setExpression( + "package org.jboss.test.sam.drools;\n" + + "\n" + + "import org.jboss.test.sam.drools.StockTick;\n" + + "global org.jboss.sam.internal.drools.DroolsAdapter Drools;\n" + + "\n" + + "rule \"Check event\"\n" + + "when\n" + + " $st: StockTick(symbol == \"ACME\")\n" + + "then\n" + + " Drools.getListener(\"VMOutput\").update($st);\n" + + "end" + ); + + // add statements + StatementDef stmtmDef = new StatementDef("ExampleStatement"); + stmtmDef.setEpl(epl); + + pnd.getStatements().add(stmtmDef); + + // marshall it + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + cfgFactory.marshall(pnd, bout); + + // use in unmarshall test + this.XML_CONFIG = bout.toByteArray(); + } + + public void testUnmarshalling() throws Exception + { + System.out.println("Config:\n" + new String(XML_CONFIG)); + + ProcessingNodeDef pnd = cfgFactory.unmarshall( new ByteArrayInputStream(XML_CONFIG)); + + assertNotNull("ProcessingNodeDef not unmarshalled", pnd); + assertEquals("BPMEventProcessor", pnd.getName()); + assertEquals(1, pnd.getStatements().size()); + assertEquals(1, pnd.getInputs().size()); + assertEquals(1, pnd.getOutputs().size()); + assertEquals(0, pnd.getProps().size()); + } +} Property changes on: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: sam/trunk/pom.xml =================================================================== --- sam/trunk/pom.xml 2008-08-12 12:41:06 UTC (rev 230) +++ sam/trunk/pom.xml 2008-08-12 12:41:40 UTC (rev 231) @@ -28,6 +28,8 @@ <jfree.version>1.0.0</jfree.version> <hsqldb.version>1.8.0.7</hsqldb.version> <javasim.version>2.0-hbraun</javasim.version> + <jaxb.api.version>2.1</jaxb.api.version> + <jaxb.impl.version>2.1.6</jaxb.impl.version> <janino.version>2.5.10</janino.version> <mvel.version>2.0-dp4</mvel.version> </properties> @@ -73,6 +75,22 @@ </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.api.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.impl.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>${jaxb.impl.version}</version> + </dependency> + + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb.version}</version> Modified: sam/trunk/sam-trunk.iml =================================================================== --- sam/trunk/sam-trunk.iml 2008-08-12 12:41:06 UTC (rev 230) +++ sam/trunk/sam-trunk.iml 2008-08-12 12:41:40 UTC (rev 231) @@ -46,17 +46,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.sam:core:jar:1.0.0.SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/jboss/sam/core/1.0.0.SNAPSHOT/core-1.0.0.SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/jboss/sam/core/1.0.0.SNAPSHOT/core-1.0.0.SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: jfree:jcommon:jar:1.0.0:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../.m2/repository/jfree/jcommon/1.0.0/jcommon-1.0.0.jar!/" /> @@ -120,32 +109,68 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: janino:janino:jar:2.3.2:compile"> + <library name="M2 Dep: org.eclipse.jdt:core:jar:3.2.3.v_686_R32x:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/janino/janino/2.3.2/janino-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.jdt:core:jar:3.2.3.v_686_R32x:compile"> + <library name="M2 Dep: org.mvel:mvel:jar:2.0-dp4:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/mvel/mvel/2.0-dp4/mvel-2.0-dp4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.mvel:mvel:jar:2.0-dp4:compile"> + <library name="M2 Dep: janino:janino:jar:2.5.10:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/mvel/mvel/2.0-dp4/mvel-2.0-dp4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/janino/janino/2.5.10/janino-2.5.10.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration">

15 years, 9 months

1
0
0 / 0

Overlord SVN: r230 - sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-08-12 08:41:06 -0400 (Tue, 12 Aug 2008) New Revision: 230 Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/ObjectMessageAdaptor.java Log: Fix property accessor Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/ObjectMessageAdaptor.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/ObjectMessageAdaptor.java 2008-08-12 11:23:21 UTC (rev 229) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/ObjectMessageAdaptor.java 2008-08-12 12:41:06 UTC (rev 230) @@ -47,7 +47,7 @@ { Object returnValue = null; String methodName = "get" + name.substring(0,1).toUpperCase() - + name.substring(1, name.length()).toLowerCase(); + + name.substring(1, name.length()); try {

15 years, 9 months

1
0
0 / 0

Overlord SVN: r229 - in cdl/trunk: runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation and 25 other directories.

by overlord-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2008-08-12 07:23:21 -0400 (Tue, 12 Aug 2008) New Revision: 229 Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/QuoteManager.java cdl/trunk/samples/jbossesb/database/ cdl/trunk/samples/jbossesb/database/build.xml cdl/trunk/samples/jbossesb/supplier/ cdl/trunk/samples/jbossesb/supplier/pom.xml cdl/trunk/samples/jbossesb/supplier/src/ cdl/trunk/samples/jbossesb/supplier/src/main/ cdl/trunk/samples/jbossesb/supplier/src/main/java/ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java cdl/trunk/samples/jbossesb/supplier/src/main/resources/ cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/ cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/deployment.xml cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/jboss-esb.xml cdl/trunk/samples/jbossesb/supplier/src/main/resources/jbmq-queue-service.xml cdl/trunk/samples/jbossesb/supplier/src/main/resources/log4j.xml Removed: cdl/trunk/samples/jbossesb/broker/build.xml cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/ cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml Modified: cdl/trunk/distribution/assembly/jbossesb/src/main/resources/cdl-ds.xml cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 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/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java cdl/trunk/samples/jbossesb/README.txt cdl/trunk/samples/jbossesb/broker/pom.xml 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/CompleteTransactionMain.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/jboss-esb.xml cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml Log: * [SOAG-29] continuing separating esb artifacts. * Update the 'CreditInformation' to 'creditInformation' according to the cdl model file. Modified: cdl/trunk/distribution/assembly/jbossesb/src/main/resources/cdl-ds.xml =================================================================== --- cdl/trunk/distribution/assembly/jbossesb/src/main/resources/cdl-ds.xml 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/distribution/assembly/jbossesb/src/main/resources/cdl-ds.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -21,6 +21,7 @@ <jndi-name>cdlDS</jndi-name> <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}cdlDB;MVCC=TRUE</connection-url> <driver-class>org.h2.Driver</driver-class> +  <user-name>sa</user-name> <password/> <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java 2008-08-12 11:23:21 UTC (rev 229) @@ -330,6 +330,14 @@ } public Object getBusinessObject() { + ByteArrayInputStream bais = new ByteArrayInputStream(serializedObject); + try { + ObjectInputStream in = new ObjectInputStream(bais); + businessObject = in.readObject(); + in.close(); + } catch (Exception e) { + throw new RuntimeException("Error in reading Object", e); + } return businessObject; } @@ -387,21 +395,13 @@ public void setSerializedObject(byte[] serializedObject) { this.serializedObject = serializedObject; - - ByteArrayInputStream bais = new ByteArrayInputStream(serializedObject); - try { - ObjectInputStream in = new ObjectInputStream(bais); - this.businessObject = in.readObject(); - in.close(); - } catch (Exception e) { - throw new RuntimeException("Error in reading Object", e); - } } public String toString() { StringBuffer sbuffer = new StringBuffer(); sbuffer.append("[ Session id: " + id); sbuffer.append(" serviceName: " + serviceName); + sbuffer.append(" business state object: " + businessObject); sbuffer.append("]"); return sbuffer.toString(); } Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-08-12 11:23:21 UTC (rev 229) @@ -48,8 +48,7 @@ Session conversationSession = new Session(); conversationSession.setPojoClass(sessionName); - conversationSession.setStatus(SessionStatus.Active); - + conversationSession.setStatus(SessionStatus.Active); conversationSession.setBusinessObject(businessState); Service service = pojoclass.getAnnotation(Service.class); @@ -82,9 +81,8 @@ conversationSession.setPojoClass(sessionName); conversationSession.setStatus(SessionStatus.Active); conversationSession.setBusinessObject(businessState); - conversationSession.setParent(parentSession); + conversationSession.setParent(parentSession); - Service service = pojoclass.getAnnotation(Service.class); if (service != null) { conversationSession.setServiceName(service.name()); @@ -180,7 +178,7 @@ return null; } - Session session = (Session)hibernateSession.load(Session.class, theID.getSession().getId()); + Session session = theID.getSession(); logger.debug("Get Session of " + session + " by using identity of " + id); return session; 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-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-08-12 11:23:21 UTC (rev 229) @@ -40,6 +40,7 @@ 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 PARENT_PROPERTY = "parentProperty"; public static final String RESPONSE_SERVICE_NAME = "responseServiceName"; public static final String RESPONSE_SERVICE_CATEGORY = "responseServiceCategory"; 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-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-08-12 11:23:21 UTC (rev 229) @@ -62,6 +62,12 @@ } } +/* String parentProperty = getConfig().getAttribute(ActionProperties.PARENT_PROPERTY); + if (parentProperty != null && !"".equals(parentProperty.trim())) { + bindingVal.put(parentProperty, session.getBusinessObject()); + logger.info("Setting parent business state class to sub-session thru property of " + parentProperty); + }*/ + message.getProperties().setProperty(MessageProperties.BOUND_VARIABLE_KEY, bindingVal); session.schedule(serviceCategory, serviceName, message); Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java 2008-08-12 11:23:21 UTC (rev 229) @@ -24,7 +24,6 @@ import org.jboss.soa.esb.message.Message; import org.jboss.soa.overlord.conversation.Session; import org.jboss.soa.overlord.conversation.SessionManager; -import org.jboss.soa.overlord.jbossesb.util.ClassLoaderUtil; import org.jboss.soa.overlord.jbossesb.util.XMLUtils; import org.mvel.MVEL; import org.w3c.dom.Element; @@ -47,35 +46,35 @@ String variable = getConfig().getAttribute("variable"); String stateExpression = getConfig().getAttribute("stateExpression"); String messageExpression = getConfig().getAttribute("messageExpression"); + String parentProperty = getConfig().getAttribute(ActionProperties.PARENT_PROPERTY); Session session = getSession(message); Object bstate = session.getBusinessObject(); logger.info("Set value to the variable of " + variable); - while (variable.startsWith("parent.")) { - variable = variable.substring(7); - session = session.getParent(); -/* if (session.getPojoID() != 0) { - Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass()); - Object pojo = SessionManager.getObject(session.getPojoID(), pojoClass); - session.setBusinessObject(pojo); - }*/ - } - if (stateExpression != null) { Object result = MVEL.eval(stateExpression, bstate); - MVEL.setProperty(session.getBusinessObject(), variable, result); - logger.info("The Variable is: " + variable + "; stateExpression is: " + stateExpression); + MVEL.setProperty(bstate, variable, result); + logger.info("populated from stateExpression of: " + stateExpression); } else if (messageExpression != null) { String xmlBody = (String) message.getBody().get(); Element element = (Element) XMLUtils.getNode(xmlBody); String result = XMLUtils.executeXpath(element, messageExpression); - MVEL.setProperty(session.getBusinessObject(), variable, result); - logger.info("The Variable is: " + variable + "; messageExpression is: " + messageExpression); + MVEL.setProperty(bstate, variable, result); + logger.info("populated from messageExpression of: " + messageExpression); + } else if (parentProperty != null){ + Session parentSession = session.getParent(); + MVEL.setProperty(bstate, parentProperty, parentSession.getBusinessObject()); + MVEL.eval(variable, bstate); + Object updatedObject = MVEL.eval(parentProperty, bstate); + parentSession.setBusinessObject(updatedObject); + SessionManager.updateObject(parentSession); + logger.info("populated to parentProperty of: " + parentProperty); } - - SessionManager.updateObject(bstate); + session.setBusinessObject(bstate); + SessionManager.updateObject(session); + return message; } Modified: cdl/trunk/samples/jbossesb/README.txt =================================================================== --- cdl/trunk/samples/jbossesb/README.txt 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/README.txt 2008-08-12 11:23:21 UTC (rev 229) @@ -14,6 +14,7 @@ - broker - purchasing - creditAgency +- supplier Settings required to edit before running: ======================================== Deleted: cdl/trunk/samples/jbossesb/broker/build.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/build.xml 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/build.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -1,38 +0,0 @@ -<project name="broker" default="startdb" basedir="."> - <property name="M2_REPO" value="/opt/m2/repo" /> - <property name="database.dir" value="${basedir}/database" /> - - <path id="database.classpath"> - <fileset dir="${M2_REPO}" > - <include name="hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar" /> - </fileset> - </path> - -  - <target name="startdb" description="Run HSQL database server with clean DB"> -  - <delete dir="${database.dir}"/> - <java classname="org.hsqldb.Server" - fork="yes" - classpathref="database.classpath" - failonerror="true"> - <arg value="-database.0"/> - <arg value="file:${database.dir}/db"/> - </java> - </target> - -  - <target name="dbmanager" description="Start HSQL DB manager"> - <java - classname="org.hsqldb.util.DatabaseManagerSwing" - fork="yes" - classpathref="database.classpath" - failonerror="true"> - <arg value="-url"/> - <arg value="jdbc:hsqldb:hsql://localhost/"/> - <arg value="-driver"/> - <arg value="org.hsqldb.jdbcDriver"/> - </java> - </target> - -</project> Modified: cdl/trunk/samples/jbossesb/broker/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/pom.xml 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/pom.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -20,32 +20,14 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.soa.overlord.cdl</groupId> <artifactId>runtime-jbossesb</artifactId> <version>1.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>${hibernate-commons-annotations}</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-tools</artifactId> - <version>${hibernate-tools-version}</version> <scope>provided</scope> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>${hsqldb-version}</version> </dependency> - </dependencies> <build> @@ -55,34 +37,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> -  - <execution> - <id>schemaexport</id> - <phase>compile</phase> - <configuration> - <tasks> - <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" - classpathref="maven.compile.classpath"/> - <hibernatetool destdir="."> - <classpath> - <pathelement path="maven.compile.classpath" /> - </classpath> - <annotationconfiguration configurationfile="target/classes/hibernate.cfg.xml" /> - <hbm2ddl - create="true" - drop="true" - export="true" - outputfilename="broker-ddl.sql" - delimiter=";" - format="true"/> - </hibernatetool> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> -  <execution> <id>deploy</id> @@ -101,15 +55,6 @@ </plugin> </plugins> </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - + </project> 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-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-08-12 11:23:21 UTC (rev 229) @@ -19,64 +19,34 @@ */ package org.jboss.soa.overlord.samples.jbossesb.loan.broker; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import org.apache.log4j.Logger; -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="jboss.overlord.samples.LoanBroker@Broker", root=true) -@Entity -@Table(name="T_BROKER") -public class BrokerMain implements HibernateObject{ +public class BrokerMain implements Serializable, QuoteManager{ private static final long serialVersionUID = 11114L; private static Logger logger = Logger.getLogger(BrokerMain.class); - @Id @GeneratedValue - @Column(name="ID") - private long id; - - @OneToMany(cascade={CascadeType.ALL}) - @JoinColumn(name="broker_ID") private List<Supplier> suppliers = new ArrayList<Supplier>(); - @OneToMany - @JoinColumn(name="quote_ID") private List<Quote> quotes = new ArrayList<Quote>(); - @Column(name="supplier_index") private int supplierIndex = 0; - @Column(name="selected_quote") private String selectedQuoteValue ; - @Column(name="selected_supplier") private String selectedSupplierDesc;; public BrokerMain() { initSuppliers(); } - - public long getId() { - return this.id; - } - public void setId(long id) { - this.id = id; - } - public List<Supplier> getSuppliers() { return suppliers; } @@ -111,7 +81,6 @@ supplier.setServiceCategory("ESBBroker.Suppliers"); supplier.setServiceName("supplier" + i + ".main"); supplier.setServiceDescription("{http://www.jboss.org/overlord/loanBroker}Supplier" + i); - supplier.setBroker(this); suppliers.add(supplier); } } @@ -131,12 +100,6 @@ public void setQuotes(List<Quote> quotes) { this.quotes = quotes; } - - public void setQuote(Quote quote) { - this.quotes.add(quote); - logger.info("add the quote value : " + quote); - } - public String getSelectedQuoteValue() { return selectedQuoteValue; Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2008-08-12 11:23:21 UTC (rev 229) @@ -19,49 +19,22 @@ */ package org.jboss.soa.overlord.samples.jbossesb.loan.broker; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import java.io.Serializable; -import org.jboss.soa.overlord.conversation.HibernateObject; import org.jboss.soa.overlord.jbossesb.actions.Service; -@Entity -@Table(name="T_COMPLETE_TRANSACTION") @Service(name="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction", conversationType="CompleteTransaction", root=false) -public class CompleteTransactionMain implements HibernateObject { +public class CompleteTransactionMain implements Serializable { private static final long serialVersionUID = 111313L; - @Id @GeneratedValue - @Column(name="ID") - private long id; - - @OneToOne(cascade={CascadeType.ALL}) - @JoinColumn(name="Confirmation_ID") private Confirmation confirmation = new Confirmation(); - @OneToOne - @JoinColumn(name="quote_ID") private Quote quote; - @OneToOne - @JoinColumn(name="complete_supplier_ID") private Supplier supplier; - public long getId() { - return this.id; - } - - public void setId(long id) { - this.id = id; - } - + public Supplier getSupplier() { return supplier; } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java 2008-08-12 11:23:21 UTC (rev 229) @@ -19,38 +19,18 @@ */ package org.jboss.soa.overlord.samples.jbossesb.loan.broker; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import java.io.Serializable; -import org.jboss.soa.overlord.conversation.HibernateObject; /** * @author jeffyu * */ -@Entity -@Table(name="T_CONFIRMATION") -public class Confirmation implements HibernateObject { +public class Confirmation implements Serializable{ + + private static final long serialVersionUID = 5205407509866157971L; - private static final long serialVersionUID = 115L; - - @Id @GeneratedValue - @Column(name="ID") - private long id; - - @Column(name="DETAIL") private String detail; - - public long getId() { - return this.id; - } - - public void setId(long id) { - this.id = id; - } public String getDetail() { return detail; Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java 2008-08-12 11:23:21 UTC (rev 229) @@ -19,38 +19,18 @@ */ package org.jboss.soa.overlord.samples.jbossesb.loan.broker; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import java.io.Serializable; -import org.jboss.soa.overlord.conversation.HibernateObject; -@Entity -@Table(name="T_QUOTE") -public class Quote implements HibernateObject { - - private static final long serialVersionUID = 12333L; - @Id @GeneratedValue - @Column(name="ID") - private long id; +public class Quote implements Serializable { - @Column(name="VALUE") + private static final long serialVersionUID = 3234324947672128469L; + private String value; - @Column(name="SERVICE_DESC") private String serviceDescription; - - public long getId() { - return this.id; - } - public void setId(long id) { - this.id = id; - } - public String getServiceDescription() { return serviceDescription; } Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/QuoteManager.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/QuoteManager.java (rev 0) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/QuoteManager.java 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008, + */ +package org.jboss.soa.overlord.samples.jbossesb.loan.broker; + +import java.util.List; + +/** + * @author jeffyu + * + */ +public interface QuoteManager { + + List<Quote> getQuotes(); + +} Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java 2008-08-12 11:23:21 UTC (rev 229) @@ -19,47 +19,21 @@ */ package org.jboss.soa.overlord.samples.jbossesb.loan.broker; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import java.io.Serializable; -import org.jboss.soa.overlord.conversation.HibernateObject; - /** * @author jeffyu * */ -@Entity -@Table(name="T_REQUEST_QUOTE") -public class Request4QuoteMain implements HibernateObject { +public class Request4QuoteMain implements Serializable { private static final long serialVersionUID = -6269132071760540966L; - @Id @GeneratedValue - @Column(name="ID") - private long id; - - @OneToOne - @JoinColumn(name="supplier_ID") private Supplier supplier; - @OneToOne(fetch = FetchType.EAGER ,cascade={CascadeType.ALL}) - @JoinColumn(name="quote_ID") - private Quote quote = new Quote(); + private QuoteManager quoteManager; - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } + private Quote quote = new Quote(); public Supplier getSupplier() { return supplier; @@ -77,5 +51,17 @@ this.quote = quote; } + public void addToQuoteManager() { + quoteManager.getQuotes().add(quote); + } + public QuoteManager getQuoteManager() { + return quoteManager; + } + + public void setQuoteManager(QuoteManager quoteManager) { + this.quoteManager = quoteManager; + } + + } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java 2008-08-12 11:23:21 UTC (rev 229) @@ -40,7 +40,7 @@ Node node = XMLUtils.getNode((String)message.getBody().get()); String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); - message.getBody().add("<creditInformation id=\"" + idValue +"\"></creditInformation>"); + message.getBody().add("<CreditInformation id=\"" + idValue +"\"></CreditInformation>"); logger.info("Updated credit check request message: "+message.getBody().get()); Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java 2008-08-12 11:23:21 UTC (rev 229) @@ -19,50 +19,21 @@ */ package org.jboss.soa.overlord.samples.jbossesb.loan.broker; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import java.io.Serializable; -import org.jboss.soa.overlord.conversation.HibernateObject; /** * @author jeffyu * */ -@Entity -@Table(name="T_SUPPLIER") -public class Supplier implements HibernateObject { +public class Supplier implements Serializable{ - private static final long serialVersionUID = 14L; - - @Id @GeneratedValue - @Column(name="ID") - private long id; - - @Column(name="SERVICE_CATEGORY") private String serviceCategory; - @Column(name="SERVICE_NAME") private String serviceName; - @Column(name="SERVICE_DESCRIPTION") private String serviceDescription; - @ManyToOne - @JoinColumn(name="BROKER_ID") - private BrokerMain broker; - - public long getId() { - return this.id; - } - - public void setId(long id) { - this.id = id; - } public String getServiceCategory() { return serviceCategory; @@ -80,14 +51,6 @@ this.serviceName = serviceName; } - public BrokerMain getBroker() { - return broker; - } - - public void setBroker(BrokerMain broker) { - this.broker = broker; - } - public String getServiceDescription() { return serviceDescription; } Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -1,4 +1,5 @@ <jbossesb-deployment> + <depends>jboss.esb:deployment=cdl-jbossesb.esb</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker_reply</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker1</depends> @@ -18,10 +19,4 @@ <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker15</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker16</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker17</depends> - <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency</depends> - <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency1</depends> - <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency2</depends> - <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1</depends> - <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11</depends> - <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12</depends> </jbossesb-deployment> 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-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -60,24 +60,6 @@ <jms-bus busid="BrokerService17"> <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-broker17"/> </jms-bus> - <jms-bus busid="SupplierService1"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier1" /> - </jms-bus> - <jms-bus busid="SupplierService11"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier11" /> - </jms-bus> - <jms-bus busid="SupplierService12"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier12" /> - </jms-bus> - <jms-bus busid="CAService"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency" /> - </jms-bus> - <jms-bus busid="CAService1"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency1" /> - </jms-bus> - <jms-bus busid="CAService2"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency2" /> - </jms-bus> </jms-provider> </providers> @@ -415,8 +397,7 @@ </action> </actions> </service> - - + <service category="ESBBroker.BrokerParticipant" name="RequestForQuote.main.1" description=""> <listeners> <jms-listener name="BrokerServiceListener11" @@ -450,8 +431,8 @@ </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SetStateAction" process="process" name="s9-4"> - <property name="variable" value="parent.quote" /> - <property name="stateExpression" value="quote" /> + <property name="variable" value="addToQuoteManager()" /> + <property name="parentProperty" value="quoteManager" /> </action> </actions> </service> @@ -485,8 +466,8 @@ process="process" name="s10-4"> <property name="operation" value="checkCredit" /> <property name="messageType" value="creditInformation" /> - <property name="serviceName" value="CreditAgency.Main" /> - <property name="serviceCategory" value="ESBBroker.CreditAgency" /> + <property name="serviceName" value="CreditAgency.main" /> + <property name="serviceCategory" value="PurchaseGoods.CreditAgency" /> <property name="responseServiceName" value="CompleteTransaction.main.1" /> <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" /> <property name="identities" > @@ -655,202 +636,6 @@ </action> </actions> </service> - - <service category="ESBBroker.Suppliers" name="Supplier1.main" description=""> - <listeners> - <jms-listener name="SupplierServiceListener1" - busidref="SupplierService1" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.MessageRouterAction" - process="process" name="su-1"> - <property name="paths"> - <route service-category="ESBBroker.Suppliers" - service-name="Supplier1.main.1" - initiate="true"> - <identity type="primary" > - <token name="id" locator="//@id" /> - <token name="supplierDesc" locator="//@supplierDesc" /> - </identity> - <message type="requestForQuote" /> - </route> - <route service-category="ESBBroker.Suppliers" - service-name="Supplier1.main.2" - initiate="true"> - <identity type="primary" > - <token name="id" locator="//@id" /> - <token name="supplierDesc" locator="//@supplierDesc" /> - </identity> - <message type="orderConfirmed" /> - </route> - </property> - </action> - </actions> - </service> - - <service category="ESBBroker.Suppliers" name="Supplier1.main.1" description=""> - <listeners> - <jms-listener name="SupplierServiceListener11" - busidref="SupplierService11" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" - process="process" name="su11-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" /> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" - process="process" name="su11-2"> - <property name="messageType" value="requestForQuote" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - <token name="supplierDesc" locator="//@supplierDesc" /> - </identity> - </property> - </action> - <action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetQuoteMessageAction" name="su11-3"> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="su11-4"> - <property name="messageType" value="quote" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - <token name="supplierDesc" locator="//@supplierDesc" /> - </identity> - </property> - </action> - </actions> - </service> - - <service category="ESBBroker.Suppliers" name="Supplier1.main.2" description=""> - <listeners> - <jms-listener name="SupplierServiceListener12" - busidref="SupplierService12" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" - process="process" name="su12-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" /> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" - process="process" name="su12-2"> - <property name="messageType" value="orderConfirmed" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - <token name="supplierDesc" locator="//@supplierDesc" /> - </identity> - </property> - </action> - <action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetOrderConfirmResponseAction" name="su12-3"> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="su12-4"> - <property name="messageType" value="bookingReference" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - <token name="supplierDesc" locator="//@supplierDesc" /> - </identity> - </property> - </action> - </actions> - </service> - <service category="ESBBroker.CreditAgency" name="CreditAgency.Main" description=""> - <listeners> - <jms-listener name="CAListener" - busidref="CAService" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" - process="process" name="c1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" /> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" - process="process" name="c2"> - <property name="operation" value="checkCredit" /> - <property name="messageType" value="creditInformation" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - </identity> - </property> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.IfAction" - process="process" name="c3"> - <property name="paths"> - <if decision-method="isCreditValid" - service-category="ESBBroker.CreditAgency" - service-name="CreditAgency.decision1" - immediate="true" /> - <else service-category="ESBBroker.CreditAgency" - service-name="CreditAgency.decision2" - immediate="true" /> - </property> - </action> - </actions> - </service> - - <service category="ESBBroker.CreditAgency" name="CreditAgency.decision1" description=""> - <listeners> - <jms-listener name="CAListener1" - busidref="CAService1" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.SetCreditCheckResponseMessageAction" - process="process" name="d2"> - </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="creditValid" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - </identity> - </property> - </action> - </actions> - </service> - - <service category="ESBBroker.CreditAgency" name="CreditAgency.decision2" description=""> - <listeners> - <jms-listener name="CAListener2" - busidref="CAService2" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.SetCreditCheckInvalidMessageAction" - process="process" name="e2"> - </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" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - </identity> - </property> - </action> - </actions> - </service> - </services> </jbossesb> Deleted: cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -1,71 +0,0 @@ -<!DOCTYPE hibernate-configuration SYSTEM -"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> - <property name="hibernate.connection.driver_class"> - org.hsqldb.jdbcDriver - </property> - <property name="hibernate.connection.url"> - jdbc:hsqldb:hsql://localhost - </property> - <property name="hibernate.connection.username"> - sa - </property> - <property name="hibernate.dialect"> - org.hibernate.dialect.HSQLDialect - </property> - -  - <property name="hibernate.c3p0.min_size">5</property> - <property name="hibernate.c3p0.max_size">20</property> - <property name="hibernate.c3p0.timeout">300</property> - <property name="hibernate.c3p0.max_statements">50</property> - <property name="hibernate.c3p0.idle_test_period">3000</property> - - <property name="current_session_context_class">thread</property> - <property name="hibernate.connection.isolation">4</property> - -  - <property name="show_sql">false</property> - <property name="format_sql">true</property> - -  - <mapping class="org.jboss.soa.overlord.conversation.Session" /> - <mapping class="org.jboss.soa.overlord.conversation.ScheduleItem"/> - <mapping class="org.jboss.soa.overlord.conversation.JoinState"/> - <mapping class="org.jboss.soa.overlord.conversation.Identity"/> - <mapping class="org.jboss.soa.overlord.conversation.EPRWrapper"/> - -  - <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Supplier" /> - <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> - <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> - <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Confirmation" /> - <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Quote" /> - <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Request4QuoteMain" /> - - <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" /> - <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" /> - - </session-factory> -</hibernate-configuration> Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -116,43 +116,5 @@ jboss.mq:service=DestinationManager </depends> </mbean> -<mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency"> - <depends optional-attribute-name="DestinationManager"> - jboss.mq:service=DestinationManager - </depends> -</mbean> -<mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency1"> - <depends optional-attribute-name="DestinationManager"> - jboss.mq:service=DestinationManager - </depends> -</mbean> -<mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency2"> - <depends optional-attribute-name="DestinationManager"> - jboss.mq:service=DestinationManager - </depends> -</mbean> -<mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1"> - <depends optional-attribute-name="DestinationManager"> - jboss.mq:service=DestinationManager - </depends> -</mbean> - -<mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11"> - <depends optional-attribute-name="DestinationManager"> - jboss.mq:service=DestinationManager - </depends> -</mbean> -<mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12"> - <depends optional-attribute-name="DestinationManager"> - jboss.mq:service=DestinationManager - </depends> -</mbean> - </server> Modified: cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java 2008-08-12 11:23:21 UTC (rev 229) @@ -40,7 +40,7 @@ Node node = XMLUtils.getNode((String)message.getBody().get()); String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); - message.getBody().add("<CreditInvalid id=\"" + idValue +"\"></CreditInvalid>"); + message.getBody().add("<creditInvalid id=\"" + idValue +"\"></creditInvalid>"); logger.info("Updated credit message: "+message); Modified: cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java 2008-08-12 11:23:21 UTC (rev 229) @@ -40,7 +40,7 @@ Node node = XMLUtils.getNode((String)message.getBody().get()); String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); - message.getBody().add("<CreditValid id=\"" + idValue +"\"></CreditValid>"); + message.getBody().add("<creditValid id=\"" + idValue +"\"></creditValid>"); logger.info("Updated credit message: "+message.getBody().get() +"' by thread of " + Thread.currentThread().getName()); Modified: cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -52,7 +52,7 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="c2"> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditInformation" /> + <property name="messageType" value="creditInformation" /> <property name="clientEPR" value="broker" /> <property name="identities" > <identity type="primary" > @@ -89,7 +89,7 @@ process="process" name="d3"> <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" /> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditValid" /> + <property name="messageType" value="creditValid" /> <property name="clientEPR" value="broker" /> <property name="identities" > <identity type="primary" > @@ -114,7 +114,7 @@ process="process" name="e3"> <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" /> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditInvalid" /> + <property name="messageType" value="creditInvalid" /> <property name="clientEPR" value="broker" /> <property name="identities" > <identity type="primary" > Added: cdl/trunk/samples/jbossesb/database/build.xml =================================================================== --- cdl/trunk/samples/jbossesb/database/build.xml (rev 0) +++ cdl/trunk/samples/jbossesb/database/build.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,38 @@ +<project name="broker" default="startdb" basedir="."> + <property name="M2_REPO" value="/opt/m2/repo" /> + <property name="database.dir" value="${basedir}/data" /> + + <path id="database.classpath"> + <fileset dir="${M2_REPO}" > + <include name="hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar" /> + </fileset> + </path> + +  + <target name="startdb" description="Run HSQL database server with clean DB"> +  + <delete dir="${database.dir}"/> + <java classname="org.hsqldb.Server" + fork="yes" + classpathref="database.classpath" + failonerror="true"> + <arg value="-database.0"/> + <arg value="file:${database.dir}/db"/> + </java> + </target> + +  + <target name="dbmanager" description="Start HSQL DB manager"> + <java + classname="org.hsqldb.util.DatabaseManagerSwing" + fork="yes" + classpathref="database.classpath" + failonerror="true"> + <arg value="-url"/> + <arg value="jdbc:hsqldb:hsql://localhost/"/> + <arg value="-driver"/> + <arg value="org.hsqldb.jdbcDriver"/> + </java> + </target> + +</project> Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java 2008-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java 2008-08-12 11:23:21 UTC (rev 229) @@ -40,7 +40,7 @@ Node node = XMLUtils.getNode((String)message.getBody().get()); String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); - message.getBody().add("<CreditInformation id=\"" + idValue +"\"></CreditInformation>"); + message.getBody().add("<creditInformation id=\"" + idValue +"\"></creditInformation>"); logger.info("Updated credit check request message: "+message); 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-08-08 19:01:37 UTC (rev 228) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -82,7 +82,7 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="a4"> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditInformation" /> + <property name="messageType" value="creditInformation" /> <property name="serviceName" value="CreditAgency.main" /> <property name="serviceCategory" value="PurchaseGoods.CreditAgency" /> <property name="responseServiceName" value="CreditResponse" /> @@ -118,11 +118,11 @@ <property name="paths"> <case service-category="PurchaseGoods.Broker" service-name="CreditResponse1" > - <message type="CreditValid" /> + <message type="creditValid" /> </case> <case service-category="PurchaseGoods.Broker" service-name="CreditResponse2" > - <message type="CreditInvalid" /> + <message type="creditInvalid" /> </case> </property> </action> @@ -140,7 +140,7 @@ process="process" name="b4"> <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditValid" /> + <property name="messageType" value="creditValid" /> <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" /> <property name="identities" > <identity type="primary" > @@ -234,7 +234,7 @@ process="process" name="b14"> <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditInvalid" /> + <property name="messageType" value="creditInvalid" /> <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" /> <property name="identities" > <identity type="primary" > Added: cdl/trunk/samples/jbossesb/supplier/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/supplier/pom.xml (rev 0) +++ cdl/trunk/samples/jbossesb/supplier/pom.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,60 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.soa.overlord.cdl.samples</groupId> + <artifactId>jbossesb-supplier</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jboss-esb</packaging> + <name>Overlord::CDL::Samples::Supplier</name> + <url>http://www.jboss.org/overlord</url> + + <parent> + <groupId>org.jboss.soa.overlord.cdl</groupId> + <artifactId>samples</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.soa.overlord.cdl</groupId> + <artifactId>runtime-jbossesb</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + </dependencies> + + <build> + <finalName>supplier</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> +  + <execution> + <id>deploy</id> + <phase>install</phase> + <configuration> + <tasks> + <copy file="target/supplier.esb" todir="${deploy.dir}" overwrite="true" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + Added: cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java =================================================================== --- cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java (rev 0) +++ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,43 @@ +package org.jboss.soa.overlord.samples.jbossesb.supplier; + + +import org.apache.log4j.Logger; +import org.jboss.soa.esb.actions.AbstractActionLifecycle; +import org.jboss.soa.esb.helpers.ConfigTree; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.overlord.jbossesb.util.XMLUtils; +import org.w3c.dom.Node; + +/** + * @author jeffyu + * + */ +public class SetOrderConfirmResponseAction extends AbstractActionLifecycle { + + private Logger logger = Logger.getLogger(SetOrderConfirmResponseAction.class); + + private ConfigTree config; + + public SetOrderConfirmResponseAction(ConfigTree config) { + this.config = config; + } + + public Message process(Message message) throws Exception { + Node node = XMLUtils.getNode((String)message.getBody().get()); + + String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); + String quoteValue = node.getAttributes().getNamedItem("quoteValue").getNodeValue(); + + String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1"; + String confirmation = "The quote of " + quoteValue + " has been confirmed."; + + String body = "<bookingReference id=\"" + idValue + "\" supplierDesc = \"" + + supplierDesc+ "\">"+confirmation +"</bookingReference>"; + + message.getBody().add(body); + + logger.info("set 'bookingReference' of [" + body + "]"); + return message; + } + +} Added: cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java (rev 0) +++ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,40 @@ +package org.jboss.soa.overlord.samples.jbossesb.supplier; + + +import org.apache.log4j.Logger; +import org.jboss.soa.esb.actions.AbstractActionLifecycle; +import org.jboss.soa.esb.helpers.ConfigTree; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.overlord.jbossesb.util.XMLUtils; +import org.w3c.dom.Node; + +/** + * @author jeffyu + * + */ +public class SetQuoteMessageAction extends AbstractActionLifecycle { + + private Logger logger = Logger.getLogger(SetQuoteMessageAction.class); + + private ConfigTree config; + + public SetQuoteMessageAction(ConfigTree config) { + this.config = config; + } + + public Message process(Message message) throws Exception { + Node node = XMLUtils.getNode((String)message.getBody().get()); + + String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); + String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1"; + + String body = "<quote id=\"" + idValue + "\" supplierDesc = \"" + + supplierDesc+ "\">10</quote>"; + + message.getBody().add(body); + + logger.info("set 'quote' of [" + body + "]"); + return message; + } + +} Added: cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java =================================================================== --- cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java (rev 0) +++ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,28 @@ +package org.jboss.soa.overlord.samples.jbossesb.supplier; + +import java.io.Serializable; + +import org.jboss.soa.overlord.jbossesb.actions.Service; + +/** + * @author jeffyu + * + */ +@Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="overlord.cdl.samples.supplier@Supplier", root=true) + +public class SupplierMain implements Serializable { + + private static final long serialVersionUID = -3956749311779109550L; + + private long id; + + public long getId() { + return this.id; + } + + + public void setId(long id) { + this.id = id; + } + +} Added: cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/deployment.xml (rev 0) +++ cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/deployment.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,6 @@ +<jbossesb-deployment> + <depends>jboss.esb:deployment=cdl-jbossesb.esb</depends> + <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1</depends> + <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11</depends> + <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12</depends> +</jbossesb-deployment> Added: cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/jboss-esb.xml (rev 0) +++ cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/jboss-esb.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,133 @@ +<?xml version = "1.0" encoding = "UTF-8"?> +<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..." + parameterReloadSecs="5000"> + + <providers> + <jms-provider name="JBossMQ" connection-factory="ConnectionFactory" + jndi-context-factory="org.jnp.interfaces.NamingContextFactory" + jndi-URL="localhost"> + <jms-bus busid="SupplierService1"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier1" /> + </jms-bus> + <jms-bus busid="SupplierService11"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier11" /> + </jms-bus> + <jms-bus busid="SupplierService12"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier12" /> + </jms-bus> + </jms-provider> + + </providers> + + <services> + <service category="ESBBroker.Suppliers" name="Supplier1.main" description=""> + <listeners> + <jms-listener name="SupplierServiceListener1" + busidref="SupplierService1" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.MessageRouterAction" + process="process" name="su-1"> + <property name="paths"> + <route service-category="ESBBroker.Suppliers" + service-name="Supplier1.main.1" + initiate="true"> + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + <message type="requestForQuote" /> + </route> + <route service-category="ESBBroker.Suppliers" + service-name="Supplier1.main.2" + initiate="true"> + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + <message type="orderConfirmed" /> + </route> + </property> + </action> + </actions> + </service> + + <service category="ESBBroker.Suppliers" name="Supplier1.main.1" description=""> + <listeners> + <jms-listener name="SupplierServiceListener11" + busidref="SupplierService11" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" + process="process" name="su11-1"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.supplier.SupplierMain" /> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" + process="process" name="su11-2"> + <property name="messageType" value="requestForQuote" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + </property> + </action> + <action class="org.jboss.soa.overlord.samples.jbossesb.supplier.SetQuoteMessageAction" name="su11-3"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" + process="process" name="su11-4"> + <property name="messageType" value="quote" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + </property> + </action> + </actions> + </service> + + <service category="ESBBroker.Suppliers" name="Supplier1.main.2" description=""> + <listeners> + <jms-listener name="SupplierServiceListener12" + busidref="SupplierService12" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" + process="process" name="su12-1"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.supplier.SupplierMain" /> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" + process="process" name="su12-2"> + <property name="messageType" value="orderConfirmed" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + </property> + </action> + <action class="org.jboss.soa.overlord.samples.jbossesb.supplier.SetOrderConfirmResponseAction" name="su12-3"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" + process="process" name="su12-4"> + <property name="messageType" value="bookingReference" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + </property> + </action> + </actions> + </service> + + </services> +</jbossesb> Added: cdl/trunk/samples/jbossesb/supplier/src/main/resources/jbmq-queue-service.xml =================================================================== --- cdl/trunk/samples/jbossesb/supplier/src/main/resources/jbmq-queue-service.xml (rev 0) +++ cdl/trunk/samples/jbossesb/supplier/src/main/resources/jbmq-queue-service.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<server> + +<mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1"> + <depends optional-attribute-name="DestinationManager"> + jboss.mq:service=DestinationManager + </depends> +</mbean> + +<mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11"> + <depends optional-attribute-name="DestinationManager"> + jboss.mq:service=DestinationManager + </depends> +</mbean> + +<mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12"> + <depends optional-attribute-name="DestinationManager"> + jboss.mq:service=DestinationManager + </depends> +</mbean> + +</server> Added: cdl/trunk/samples/jbossesb/supplier/src/main/resources/log4j.xml =================================================================== --- cdl/trunk/samples/jbossesb/supplier/src/main/resources/log4j.xml (rev 0) +++ cdl/trunk/samples/jbossesb/supplier/src/main/resources/log4j.xml 2008-08-12 11:23:21 UTC (rev 229) @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + +  +  +  + +  + <appender name="FILE" class="org.apache.log4j.FileAppender"> +  + <param name="File" value="./supplier.log"/> + <param name="Append" value="false"/> + +  + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + +  + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + +  + </layout> + </appender> + + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> +  + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + +  +  +  + +  + <category name="org.apache"> + <priority value="INFO"/> + </category> + +  + <category name="org.jboss.serial"> + <priority value="INFO"/> + </category> + +  + <category name="org.jgroups"> + <priority value="WARN"/> + </category> + +  + <category name="jacorb"> + <priority value="WARN"/> + </category> + + +  + <category name="org.jboss.management"> + <priority value="INFO"/> + </category> + +  + <category name="org.jboss.webservice"> + <priority value="DEBUG"/> + </category> + <category name="org.jboss.axis"> + <priority value="INFO"/> + </category> + + <category name="org.milyn"> + <priority value="INFO"/> + </category> + <category name="org.milyn.delivery.SmooksXML"> + <priority value="INFO"/> + </category> + <category name="org.milyn.delivery.serialize.Serializer"> + <priority value="INFO"/> + </category> + <category name="org.milyn.cdr.XMLConfigDigester"> + <priority value="INFO"/> + </category> + + <category name="org.jboss.soa.overlord"> + <priority value="DEBUG" /> + </category> + +  +  +  + + <root> + <priority value="INFO" /> + <appender-ref ref="CONSOLE"/> + <appender-ref ref="FILE"/> + </root> + + +</log4j:configuration>

15 years, 9 months

1
0
0 / 0

Overlord SVN: r228 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model: change and 1 other directory.

by overlord-commits＠lists.jboss.org

Author: objectiser Date: 2008-08-08 15:01:37 -0400 (Fri, 08 Aug 2008) New Revision: 228 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/change/ConversationInteractionModelChangeRule.java Log: Now generating initiate flag on message router. 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-08-08 16:43:22 UTC (rev 227) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java 2008-08-08 19:01:37 UTC (rev 228) @@ -152,6 +152,10 @@ path.setAttribute(SERVICE_CATEGORY, category); path.setAttribute(SERVICE_NAME, name); + if (initiate) { + path.setAttribute(INITIATE, Boolean.toString(initiate)); + } + for (int i=0; i < messageTypes.size(); i++) { org.w3c.dom.Element mt= getAction().getOwnerDocument().createElement(MESSAGE_ELEMENT); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-08-08 16:43:22 UTC (rev 227) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-08-08 19:01:37 UTC (rev 228) @@ -261,7 +261,7 @@ mra.addRoute(((ESBService)context.getParent()).getCategory(), ((ESBService)context.getParent()).getName(), - false, mtypes); + service.isRoot(), mtypes); } }

15 years, 9 months

1
0
0 / 0

Overlord SVN: r227 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src: java/org/jboss/tools/overlord/jbossesb/model/change and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: objectiser Date: 2008-08-08 12:43:22 -0400 (Fri, 08 Aug 2008) New Revision: 227 Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/RunModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java Log: Determine initiator roles, even when composition involved. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java 2008-08-08 16:43:22 UTC (rev 227) @@ -96,6 +96,15 @@ public String getPropertyValue(String property); /** + * This method determines the property value, associated + * with the supplied name, is defined. + * + * @param property The property name + * @return Whether the property has been defined + */ + public boolean hasProperty(String property); + + /** * This method returns the XML configuration representation of the action. * * @return The XML configuration for the action Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-08-08 16:43:22 UTC (rev 227) @@ -121,6 +121,12 @@ service.addAction(action, position); + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == action && + interaction.getEnclosingDefinition() instanceof Conversation) { + action.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)interaction.getEnclosingDefinition()))); + } + if (interaction.getRequestLabel() != null) { // Create new ESB service Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java 2008-08-08 16:43:22 UTC (rev 227) @@ -124,6 +124,12 @@ schedule.setDestination(joinService.getCategory(), joinService.getName(), true); ((ESBService)context.getParent()).addAction(schedule, -1); + + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == schedule && + ifElem.getEnclosingDefinition() instanceof Conversation) { + schedule.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)ifElem.getEnclosingDefinition()))); + } } if (ifElem.getElseBlock() != null) { @@ -154,7 +160,19 @@ schedule.setDestination(joinService.getCategory(), joinService.getName(), true); ((ESBService)context.getParent()).addAction(schedule, -1); + + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == schedule && + ifElem.getEnclosingDefinition() instanceof Conversation) { + schedule.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)ifElem.getEnclosingDefinition()))); + } } + + if (service.getFirstSessionBasedAction() == ifAction && + ifElem.getEnclosingDefinition() instanceof Conversation) { + ifAction.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)ifElem.getEnclosingDefinition()))); + } } else { // Switch action, as role is a decision observer @@ -206,6 +224,12 @@ joinService.getName(), true); ((ESBService)context.getParent()).addAction(schedule, -1); + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == schedule && + ifElem.getEnclosingDefinition() instanceof Conversation) { + schedule.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)ifElem.getEnclosingDefinition()))); + } + if (interactions != null) { java.util.Iterator<Interaction> iter=interactions.iterator(); @@ -257,6 +281,12 @@ joinService.getName(), true); ((ESBService)context.getParent()).addAction(schedule, -1); + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == schedule && + ifElem.getEnclosingDefinition() instanceof Conversation) { + schedule.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)ifElem.getEnclosingDefinition()))); + } + if (interactions != null) { java.util.Iterator<Interaction> iter=interactions.iterator(); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java 2008-08-08 16:43:22 UTC (rev 227) @@ -116,6 +116,12 @@ joinService.getName(), true); ((ESBService)context.getParent()).addAction(schedule, -1); + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == schedule && + parallel.getEnclosingDefinition() instanceof Conversation) { + schedule.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)parallel.getEnclosingDefinition()))); + } + boolean immediate=true; // Get lookahead analyser @@ -147,6 +153,13 @@ parAction.addPath(joinService.getCategory(), joinService.getName(), false, true, -1); + // Check if business object type needs to be specified + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == parAction && + parallel.getEnclosingDefinition() instanceof Conversation) { + parAction.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)parallel.getEnclosingDefinition()))); + } + return(true); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/RunModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/RunModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/RunModelChangeRule.java 2008-08-08 16:43:22 UTC (rev 227) @@ -89,6 +89,13 @@ action.setDestination(category, name); + // Check if business object type needs to be specified + if (service.getFirstSessionBasedAction() == action && + run.getEnclosingDefinition() instanceof Conversation) { + action.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)run.getEnclosingDefinition()))); + } + // Create return service ESBService returnService= esbModel.createService(service.getCategory(), Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java 2008-08-08 16:43:22 UTC (rev 227) @@ -87,6 +87,13 @@ action.setDestination(category, name); + // Check if business object type needs to be specified + if (service.getFirstSessionBasedAction() == action && + spawn.getEnclosingDefinition() instanceof Conversation) { + action.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)spawn.getEnclosingDefinition()))); + } + return(true); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java 2008-08-08 16:43:22 UTC (rev 227) @@ -117,9 +117,21 @@ ((ESBService)context.getParent()).addAction(schedule, -1); + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == schedule && + when.getEnclosingDefinition() instanceof Conversation) { + schedule.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)when.getEnclosingDefinition()))); + } + action.addPath(subService.getCategory(), subService.getName(), i); } + + if (service.getFirstSessionBasedAction() == action && + when.getEnclosingDefinition() instanceof Conversation) { + action.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)when.getEnclosingDefinition()))); + } } else { // Switch action, as role is a decision observer @@ -172,6 +184,12 @@ ((ESBService)context.getParent()).addAction(schedule, -1); + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == schedule && + when.getEnclosingDefinition() instanceof Conversation) { + schedule.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)when.getEnclosingDefinition()))); + } + if (interactions != null) { java.util.Iterator<Interaction> iter=interactions.iterator(); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.java 2008-08-08 16:43:22 UTC (rev 227) @@ -112,6 +112,13 @@ service.addAction(action, position); + // Check if business object type needs to be specified + if (service.getFirstSessionBasedAction() == action && + whileElem.getEnclosingDefinition() instanceof Conversation) { + action.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)whileElem.getEnclosingDefinition()))); + } + ESBService subService= esbModel.createService(service.getCategory(), esbModel.getUniqueServiceName(service.getCategory(), @@ -140,6 +147,13 @@ whileElem.getRoles().contains(context.getRole())); ((ESBService)context.getParent()).addAction(schedule, -1); + // Check if business object type needs to be specified + if (((ESBService)context.getParent()).getFirstSessionBasedAction() == schedule && + whileElem.getEnclosingDefinition() instanceof Conversation) { + schedule.setBusinessObjectType(ConversationUtil.getBusinessObjectType( + ((Conversation)whileElem.getEnclosingDefinition()))); + } + // Check whether message types need to be defined in // place of an expression java.util.List<MessageSignature> messageTypes= Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java 2008-08-08 12:01:56 UTC (rev 226) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java 2008-08-08 16:43:22 UTC (rev 227) @@ -87,6 +87,11 @@ return false; } + public boolean hasProperty(String property) { + // TODO Auto-generated method stub + return false; + } + public void validate(ModelListener l) { // TODO Auto-generated method stub

15 years, 9 months

1
0
0 / 0

Overlord SVN: r226 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb: src/java/org/jboss/tools/overlord/jbossesb/model/actions and 3 other directories.

by overlord-commits＠lists.jboss.org

Author: objectiser Date: 2008-08-08 08:01:56 -0400 (Fri, 08 Aug 2008) New Revision: 226 Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/META-INF/MANIFEST.MF 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/PerformAction.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.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/change/IfModelChangeRuleTest.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRuleTest.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRuleTest.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRuleTest.java Log: Add 'ScheduleStateAction' into grouping constructs to either specify a join service descriptor or iterate back to the while service descriptor (in the case of the WhileAction). Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/META-INF/MANIFEST.MF =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/META-INF/MANIFEST.MF 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/META-INF/MANIFEST.MF 2008-08-08 12:01:56 UTC (rev 226) @@ -21,5 +21,10 @@ org.jboss.tools.overlord.jbossesb.model.change.LanguageToConversationModelChangeRule, org.jboss.tools.overlord.jbossesb.model.change.ConversationModelChangeRule, org.jboss.tools.overlord.jbossesb.model.change.ConversationInteractionModelChangeRule, - org.jboss.tools.overlord.jbossesb.model.change.IfModelChangeRule + org.jboss.tools.overlord.jbossesb.model.change.IfModelChangeRule, + org.jboss.tools.overlord.jbossesb.model.change.ParallelModelChangeRule, + org.jboss.tools.overlord.jbossesb.model.change.RunModelChangeRule, + org.jboss.tools.overlord.jbossesb.model.change.SpawnModelChangeRule, + org.jboss.tools.overlord.jbossesb.model.change.WhenModelChangeRule, + org.jboss.tools.overlord.jbossesb.model.change.WhileModelChangeRule Bundle-ActivationPolicy: lazy 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-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-08-08 12:01:56 UTC (rev 226) @@ -353,6 +353,32 @@ } /** + * This method determines the property value, associated + * with the supplied name, is defined. + * + * @param property The property name + * @return Whether the property has been defined + */ + public boolean hasProperty(String property) { + boolean ret=false; + + if (m_action != null) { + org.w3c.dom.NodeList nl=m_action.getChildNodes(); + + for (int i=0; ret == false && i < nl.getLength(); i++) { + if (nl.item(i) instanceof org.w3c.dom.Element && + nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) && + ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR). + equals(property)) { + ret = true; + } + } + } + + return(ret); + } + + /** * This method returns the element associated with the * requested property. If the property does not exist, then * it will be created. 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-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java 2008-08-08 12:01:56 UTC (rev 226) @@ -161,7 +161,7 @@ Compose elem=null; // Check if perform is asynchronous - if (getAction().hasAttribute(RETURN_SERVICE_NAME)) { + if (hasProperty(RETURN_SERVICE_NAME)) { elem = new Run(); } else { elem = new Spawn(); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) @@ -81,6 +81,13 @@ ESBService service=(ESBService)context.getParent(); If ifElem=(If)mobj; + ESBService joinService= + esbModel.createService(service.getCategory(), + esbModel.getUniqueServiceName(service.getCategory(), + service.getName())); + + esbModel.addService(joinService); + // Check if should be an 'if' or a 'switch' action if (ifElem.getRoles().contains(context.getRole())) { @@ -110,6 +117,13 @@ ifAction.addPath((i==0 ? IfAction.IF : IfAction.ELSEIF), subService.getCategory(), subService.getName(), immediate, null, i); + + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + + schedule.setDestination(joinService.getCategory(), + joinService.getName(), true); + ((ESBService)context.getParent()).addAction(schedule, -1); } if (ifElem.getElseBlock() != null) { @@ -133,6 +147,13 @@ ifAction.addPath(IfAction.ELSE, subService.getCategory(), subService.getName(), immediate, null, -1); + + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + + schedule.setDestination(joinService.getCategory(), + joinService.getName(), true); + ((ESBService)context.getParent()).addAction(schedule, -1); } } else { @@ -177,6 +198,13 @@ switchAction.addCase(subService.getCategory(), subService.getName(), interactions, i); + + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + + schedule.setDestination(joinService.getCategory(), + joinService.getName(), true); + ((ESBService)context.getParent()).addAction(schedule, -1); if (interactions != null) { java.util.Iterator<Interaction> iter=interactions.iterator(); @@ -222,6 +250,13 @@ switchAction.addCase(subService.getCategory(), subService.getName(), interactions, -1); + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + + schedule.setDestination(joinService.getCategory(), + joinService.getName(), true); + ((ESBService)context.getParent()).addAction(schedule, -1); + if (interactions != null) { java.util.Iterator<Interaction> iter=interactions.iterator(); @@ -270,6 +305,8 @@ } } + context.setParent(joinService); + return(true); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) @@ -80,6 +80,15 @@ ESBService service=(ESBService)context.getParent(); Parallel parallel=(Parallel)mobj; + // Create the join service + ESBService joinService= + esbModel.createService(service.getCategory(), + esbModel.getUniqueServiceName(service.getCategory(), + service.getName())); + + esbModel.addService(joinService); + + // Create and configure the parallel action ParallelAction parAction=new ParallelAction(service); service.addAction(parAction, position); @@ -99,6 +108,13 @@ for (int j=0; j < b.getContents().size(); j++) { context.insert(model, b.getContents().get(j), j); } + + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + + schedule.setDestination(joinService.getCategory(), + joinService.getName(), true); + ((ESBService)context.getParent()).addAction(schedule, -1); boolean immediate=true; @@ -126,14 +142,6 @@ subService.getName(), immediate, false, i); } - // Create the join service - ESBService joinService= - esbModel.createService(service.getCategory(), - esbModel.getUniqueServiceName(service.getCategory(), - service.getName())); - - esbModel.addService(joinService); - context.setParent(joinService); parAction.addPath(joinService.getCategory(), Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java (rev 0) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) @@ -0,0 +1,94 @@ +/* + * 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.change; + +//import java.util.logging.Logger; + +import org.jboss.tools.overlord.jbossesb.model.*; +import org.jboss.tools.overlord.jbossesb.model.actions.*; +import org.jboss.tools.overlord.jbossesb.model.util.*; +import org.scribble.model.*; +import org.scribble.model.change.*; +import org.scribble.conversation.model.*; +import org.scribble.extensions.*; + +/** + * This is the model change rule for the Spawn composition construct. + */ +(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +public class SpawnModelChangeRule extends AbstractModelChangeRule { + + /** + * This method determines whether the rule is appropriate + * for the supplied type of model, parent (in the context) and + * model object. + * + * @param context The context + * @param model The model + * @param mobj The model object causing the change + * @return Whether the rule supports the supplied information + */ + @Override + protected boolean isChangeSupported(ModelChangeContext context, + Model model, ModelObject mobj) { + boolean ret=false; + + if (mobj instanceof Spawn && + context.getParent() instanceof ESBService && + model instanceof ESBLanguageModel) { + ret = true; + } + + return(ret); + } + + /** + * This method adds a new model object, within a + * parent model object, with the details supplied in + * another model object. The supplied model object + * will usually be from a different model representation + * (e.g. due to a merge), so the details will be + * copied and placed in the representation associated + * with the supplied model and parent model object. + * + * @param context The context + * @param model The model being changed + * @param mobj The model object details to be inserted + * @param position The position, where relevant + * @return Whether the change has been applied + */ + @Override + public boolean insert(ModelChangeContext context, + Model model, ModelObject mobj, int position) { + ESBService service=(ESBService)context.getParent(); + Spawn spawn=(Spawn)mobj; + + PerformAction action=new PerformAction(service); + + service.addAction(action, position); + + String category=ConversationUtil.getServiceCategory(spawn.getDefinition()); + String name=ConversationUtil.getServiceName(spawn.getDefinition()); + + action.setDestination(category, name); + + return(true); + } + + //private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.change"); +} Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) @@ -80,6 +80,13 @@ ESBService service=(ESBService)context.getParent(); When when=(When)mobj; + ESBService joinService= + esbModel.createService(service.getCategory(), + esbModel.getUniqueServiceName(service.getCategory(), + service.getName())); + + esbModel.addService(joinService); + // Check if context role is decision maker if (when.getRoles().contains(context.getRole())) { WhenAction action=new WhenAction(service); @@ -102,6 +109,14 @@ context.insert(model, b.getContents().get(j), j); } + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + + schedule.setDestination(joinService.getCategory(), + joinService.getName(), true); + + ((ESBService)context.getParent()).addAction(schedule, -1); + action.addPath(subService.getCategory(), subService.getName(), i); } @@ -149,6 +164,14 @@ switchAction.addCase(subService.getCategory(), subService.getName(), interactions, i); + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + + schedule.setDestination(joinService.getCategory(), + joinService.getName(), true); + + ((ESBService)context.getParent()).addAction(schedule, -1); + if (interactions != null) { java.util.Iterator<Interaction> iter=interactions.iterator(); @@ -197,6 +220,8 @@ } } + context.setParent(joinService); + return(true); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.java 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.java 2008-08-08 12:01:56 UTC (rev 226) @@ -80,6 +80,34 @@ ESBService service=(ESBService)context.getParent(); While whileElem=(While)mobj; + // Check if current service is session based + // If so, then need to put while in a separate new + // service + if (service.isSessionBased()) { + ESBService whileService= + esbModel.createService(service.getCategory(), + esbModel.getUniqueServiceName(service.getCategory(), + service.getName())); + + esbModel.addService(whileService); + + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + + // 'immediate' flag set depending on whether the role + // is an initiator of the while. If not, then the + // immediate flag is false, which means the loop will be + // evaluated based on the next received message + schedule.setDestination(whileService.getCategory(), + whileService.getName(), + whileElem.getRoles().contains(context.getRole())); + ((ESBService)context.getParent()).addAction(schedule, -1); + + context.setParent(whileService); + + service = whileService; + } + WhileAction action=new WhileAction(service); service.addAction(action, position); @@ -91,13 +119,29 @@ esbModel.addService(subService); + // Configure the while loop service context.setParent(subService); for (int j=0; j < whileElem.getBlock().getContents().size(); j++) { context.insert(model, whileElem.getBlock().getContents().get(j), j); } + // Need to insert a 'ScheduleStateAction' to return back + // to the 'WhileAction', to re-evaluate the expression + ScheduleStateAction schedule= + new ScheduleStateAction((ESBService)context.getParent()); + // 'immediate' flag set depending on whether the role + // is an initiator of the while. If not, then the + // immediate flag is false, which means the loop will be + // evaluated based on the next received message + schedule.setDestination(service.getCategory(), + service.getName(), + whileElem.getRoles().contains(context.getRole())); + ((ESBService)context.getParent()).addAction(schedule, -1); + + // Check whether message types need to be defined in + // place of an expression java.util.List<MessageSignature> messageTypes= new java.util.Vector<MessageSignature>(); 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-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java 2008-08-08 12:01:56 UTC (rev 226) @@ -209,7 +209,7 @@ } } - public void testConvert() { + public void testConvertRun() { TestESBService service=new TestESBService(); java.util.Map<String,String> props=new java.util.Hashtable<String,String>(); @@ -278,7 +278,63 @@ fail("Subsequent activity after run was not act2"); } } - + + public void testConvertSpawn() { + TestESBService service=new TestESBService(); + + java.util.Map<String,String> props=new java.util.Hashtable<String,String>(); + props.put(PerformAction.SERVICE_CATEGORY, "cat1"); + props.put(PerformAction.SERVICE_NAME, "name1"); + + org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null); + + TestESBService other1=new TestESBService(); + other1.setCategory("cat1"); + other1.setName("name1"); + + TestActivity act1=new TestActivity(); + other1.getContents().add(act1); + + TestESBLanguageModel model=new TestESBLanguageModel(); + model.addService(other1); + model.addService(service); + + service.setModel(model); + + PerformAction action=new PerformAction(service, elem); + action.initializeLinks(); + + service.getActions().add(action); + + java.util.List<Activity> activities=new java.util.Vector<Activity>(); + + action.convert(activities, null); + + if (activities.size() != 1) { + fail("Expecting 1 activity, but got: "+activities.size()); + } + + Activity act=activities.get(0); + + if ((act instanceof Spawn) == false) { + fail("Expecting a 'Spawn' activity"); + } + + Spawn spawnAction=(Spawn)act; + + if (spawnAction.getDefinition() == null) { + fail("Run definition was null"); + } + + if (spawnAction.getDefinition().getBlock().getContents().size() != 1) { + fail("Expecting one block activity: "+spawnAction.getDefinition().getBlock().getContents().size()); + } + + if (spawnAction.getDefinition().getBlock().getContents().get(0) != act1) { + fail("Spawn model block should have 1 activity = act1"); + } + } + public void testConvertNotExcludingEmptyPath() { TestESBService service=new TestESBService(); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRuleTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRuleTest.java 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRuleTest.java 2008-08-08 12:01:56 UTC (rev 226) @@ -65,8 +65,8 @@ fail("Action was not IfAction: "+service.getActions().get(0)); } - if (model.getServices().size() != 2) { - fail("Two services expected: "+model.getServices().size()); + if (model.getServices().size() != 3) { + fail("Three services expected: "+model.getServices().size()); } ESBService ifService=null; @@ -148,25 +148,29 @@ fail("Action was not IfAction: "+service.getActions().get(0)); } - if (model.getServices().size() != 4) { - fail("Four services expected: "+model.getServices().size()); + if (model.getServices().size() != 5) { + fail("Five services expected: "+model.getServices().size()); } ESBService ifService=null; ESBService elseIfService1=null; ESBService elseIfService2=null; + ESBService join=null; java.util.Iterator<ESBService> iter=model.getServices().iterator(); while ((ifService == null || elseIfService1 == null || - elseIfService2 == null) && iter.hasNext()) { + elseIfService2 == null || join==null) && iter.hasNext()) { ESBService serv = iter.next(); if (serv.getName().endsWith("__0")) { + join = serv; + } + if (serv.getName().endsWith("__1")) { ifService = serv; } - if (serv.getName().endsWith("__1")) { + if (serv.getName().endsWith("__2")) { elseIfService1 = serv; } - if (serv.getName().endsWith("__2")) { + if (serv.getName().endsWith("__3")) { elseIfService2 = serv; } } @@ -195,6 +199,28 @@ "' not expected: "+ifService.getName()); } + if (ifService.getActions().size() != 1) { + fail("Path(1) does not have 1 action: "+ifService.getActions().size()); + } + + if ((ifService.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+ifService.getActions().get(0)); + } + + ScheduleStateAction schedule=(ScheduleStateAction)ifService.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(1); if (elem.getNodeName().equals("elseif") == false) { @@ -211,6 +237,28 @@ "' not expected: "+elseIfService1.getName()); } + if (elseIfService1.getActions().size() != 1) { + fail("Path(2) does not have 1 action: "+elseIfService1.getActions().size()); + } + + if ((elseIfService1.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+elseIfService1.getActions().get(0)); + } + + schedule=(ScheduleStateAction)elseIfService1.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(2); if (elem.getNodeName().equals("elseif") == false) { @@ -226,6 +274,28 @@ fail("Service name '"+elem.getAttribute("service-name")+ "' not expected: "+elseIfService2.getName()); } + + if (elseIfService2.getActions().size() != 1) { + fail("Path(3) does not have 1 action: "+elseIfService2.getActions().size()); + } + + if ((elseIfService2.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+elseIfService2.getActions().get(0)); + } + + schedule=(ScheduleStateAction)elseIfService2.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } } public void testInsertIfElseAction() { @@ -269,21 +339,25 @@ fail("Action was not IfAction: "+service.getActions().get(0)); } - if (model.getServices().size() != 3) { - fail("Three services expected: "+model.getServices().size()); + if (model.getServices().size() != 4) { + fail("Four services expected: "+model.getServices().size()); } ESBService ifService=null; ESBService elseService=null; + ESBService join=null; java.util.Iterator<ESBService> iter=model.getServices().iterator(); - while ((ifService == null || elseService == null) && - iter.hasNext()) { + while ((ifService == null || elseService == null || + join == null) && iter.hasNext()) { ESBService serv = iter.next(); if (serv.getName().endsWith("__0")) { + join = serv; + } + if (serv.getName().endsWith("__1")) { ifService = serv; } - if (serv.getName().endsWith("__1")) { + if (serv.getName().endsWith("__2")) { elseService = serv; } } @@ -312,6 +386,28 @@ "' not expected: "+ifService.getName()); } + if (ifService.getActions().size() != 1) { + fail("Path(1) does not have 1 action: "+ifService.getActions().size()); + } + + if ((ifService.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+ifService.getActions().get(0)); + } + + ScheduleStateAction schedule=(ScheduleStateAction)ifService.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(1); if (elem.getNodeName().equals("else") == false) { @@ -327,6 +423,29 @@ fail("Service name '"+elem.getAttribute("service-name")+ "' not expected: "+elseService.getName()); } + + if (elseService.getActions().size() != 1) { + fail("Path(2) does not have 1 action: "+elseService.getActions().size()); + } + + if ((elseService.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+elseService.getActions().get(0)); + } + + schedule=(ScheduleStateAction)ifService.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + } public void testInsertSwitchAction() { @@ -374,8 +493,8 @@ fail("Action was not SwitchAction: "+service.getActions().get(0)); } - if (model.getServices().size() != 2) { - fail("Two services expected: "+model.getServices().size()); + if (model.getServices().size() != 3) { + fail("Three services expected: "+model.getServices().size()); } ESBService switchService=null; @@ -464,25 +583,29 @@ fail("Action was not SwitchAction: "+service.getActions().get(0)); } - if (model.getServices().size() != 4) { - fail("Four services expected: "+model.getServices().size()); + if (model.getServices().size() != 5) { + fail("Five services expected: "+model.getServices().size()); } + ESBService join=null; ESBService caseService1=null; ESBService caseService2=null; ESBService caseService3=null; java.util.Iterator<ESBService> iter=model.getServices().iterator(); while ((caseService1 == null || caseService2 == null || - caseService3 == null) && iter.hasNext()) { + caseService3 == null || join == null) && iter.hasNext()) { ESBService serv = iter.next(); if (serv.getName().endsWith("__0")) { + join = serv; + } + if (serv.getName().endsWith("__1")) { caseService1 = serv; } - if (serv.getName().endsWith("__1")) { + if (serv.getName().endsWith("__2")) { caseService2 = serv; } - if (serv.getName().endsWith("__2")) { + if (serv.getName().endsWith("__3")) { caseService3 = serv; } } @@ -511,6 +634,28 @@ "' not expected: "+caseService1.getName()); } + if (caseService1.getActions().size() != 1) { + fail("Path(1) does not have 1 action: "+caseService1.getActions().size()); + } + + if ((caseService1.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+caseService1.getActions().get(0)); + } + + ScheduleStateAction schedule=(ScheduleStateAction)caseService1.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(1); if (elem.getNodeName().equals("case") == false) { @@ -527,6 +672,28 @@ "' not expected: "+caseService2.getName()); } + if (caseService2.getActions().size() != 1) { + fail("Path(2) does not have 1 action: "+caseService2.getActions().size()); + } + + if ((caseService2.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+caseService2.getActions().get(0)); + } + + schedule=(ScheduleStateAction)caseService2.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(2); if (elem.getNodeName().equals("case") == false) { @@ -542,5 +709,27 @@ fail("Service name '"+elem.getAttribute("service-name")+ "' not expected: "+caseService3.getName()); } + + if (caseService3.getActions().size() != 1) { + fail("Path(3) does not have 1 action: "+caseService3.getActions().size()); + } + + if ((caseService3.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+caseService3.getActions().get(0)); + } + + schedule=(ScheduleStateAction)caseService3.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } } } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRuleTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRuleTest.java 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRuleTest.java 2008-08-08 12:01:56 UTC (rev 226) @@ -88,16 +88,16 @@ join == null) && iter.hasNext()) { ESBService serv = iter.next(); if (serv.getName().endsWith("__0")) { - s1 = serv; + join = serv; } if (serv.getName().endsWith("__1")) { - s2 = serv; + s1 = serv; } if (serv.getName().endsWith("__2")) { - s3 = serv; + s2 = serv; } if (serv.getName().endsWith("__3")) { - join = serv; + s3 = serv; } } @@ -129,6 +129,28 @@ fail("path(1) immediate not set"); } + if (s1.getActions().size() != 1) { + fail("Path(1) does not have 1 action: "+s1.getActions().size()); + } + + if ((s1.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+s1.getActions().get(0)); + } + + ScheduleStateAction schedule=(ScheduleStateAction)s1.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(1); if (elem.getNodeName().equals("path") == false) { @@ -149,6 +171,28 @@ fail("path(2) immediate not set"); } + if (s2.getActions().size() != 1) { + fail("Path(2) does not have 1 action: "+s2.getActions().size()); + } + + if ((s2.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+s2.getActions().get(0)); + } + + schedule=(ScheduleStateAction)s2.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(2); if (elem.getNodeName().equals("path") == false) { @@ -169,6 +213,28 @@ fail("path(3) immediate not set"); } + if (s3.getActions().size() != 1) { + fail("Path(3) does not have 1 action: "+s3.getActions().size()); + } + + if ((s3.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+s3.getActions().get(0)); + } + + schedule=(ScheduleStateAction)s3.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(3); if (elem.getNodeName().equals("join") == false) { @@ -261,10 +327,10 @@ while ((s1 == null || join == null) && iter.hasNext()) { ESBService serv = iter.next(); if (serv.getName().endsWith("__0")) { - s1 = serv; + join = serv; } if (serv.getName().endsWith("__1")) { - join = serv; + s1 = serv; } } @@ -387,10 +453,10 @@ while ((s1 == null || join == null) && iter.hasNext()) { ESBService serv = iter.next(); if (serv.getName().endsWith("__0")) { - s1 = serv; + join = serv; } if (serv.getName().endsWith("__1")) { - join = serv; + s1 = serv; } } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRuleTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRuleTest.java 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRuleTest.java 2008-08-08 12:01:56 UTC (rev 226) @@ -75,25 +75,29 @@ fail("Action was not WhenAction: "+service.getActions().get(0)); } - if (model.getServices().size() != 4) { - fail("Four services expected: "+model.getServices().size()); + if (model.getServices().size() != 5) { + fail("Five services expected: "+model.getServices().size()); } ESBService s1=null; ESBService s2=null; ESBService s3=null; + ESBService join=null; java.util.Iterator<ESBService> iter=model.getServices().iterator(); while ((s1 == null || s2 == null || - s3 == null) && iter.hasNext()) { + s3 == null || join == null) && iter.hasNext()) { ESBService serv = iter.next(); if (serv.getName().endsWith("__0")) { + join = serv; + } + if (serv.getName().endsWith("__1")) { s1 = serv; } - if (serv.getName().endsWith("__1")) { + if (serv.getName().endsWith("__2")) { s2 = serv; } - if (serv.getName().endsWith("__2")) { + if (serv.getName().endsWith("__3")) { s3 = serv; } } @@ -122,6 +126,28 @@ "' not expected: "+s1.getName()); } + if (s1.getActions().size() != 1) { + fail("Path(1) does not have 1 action: "+s1.getActions().size()); + } + + if ((s1.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+s1.getActions().get(0)); + } + + ScheduleStateAction schedule=(ScheduleStateAction)s1.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(1); if (elem.getNodeName().equals("when") == false) { @@ -138,6 +164,28 @@ "' not expected: "+s2.getName()); } + if (s2.getActions().size() != 1) { + fail("Path(2) does not have 1 action: "+s2.getActions().size()); + } + + if ((s2.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+s2.getActions().get(0)); + } + + schedule=(ScheduleStateAction)s2.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(2); if (elem.getNodeName().equals("when") == false) { @@ -153,6 +201,28 @@ fail("Service name '"+elem.getAttribute("service-name")+ "' not expected: "+s3.getName()); } + + if (s3.getActions().size() != 1) { + fail("Path(3) does not have 1 action: "+s3.getActions().size()); + } + + if ((s3.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+s3.getActions().get(0)); + } + + schedule=(ScheduleStateAction)s3.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } } public void testInsertSwitchAction() { @@ -200,8 +270,8 @@ fail("Action was not SwitchAction: "+service.getActions().get(0)); } - if (model.getServices().size() != 2) { - fail("Two services expected: "+model.getServices().size()); + if (model.getServices().size() != 3) { + fail("Three services expected: "+model.getServices().size()); } ESBService switchService=null; @@ -290,25 +360,29 @@ fail("Action was not SwitchAction: "+service.getActions().get(0)); } - if (model.getServices().size() != 4) { - fail("Four services expected: "+model.getServices().size()); + if (model.getServices().size() != 5) { + fail("Five services expected: "+model.getServices().size()); } + ESBService join=null; ESBService caseService1=null; ESBService caseService2=null; ESBService caseService3=null; java.util.Iterator<ESBService> iter=model.getServices().iterator(); while ((caseService1 == null || caseService2 == null || - caseService3 == null) && iter.hasNext()) { + caseService3 == null || join == null) && iter.hasNext()) { ESBService serv = iter.next(); if (serv.getName().endsWith("__0")) { + join = serv; + } + if (serv.getName().endsWith("__1")) { caseService1 = serv; } - if (serv.getName().endsWith("__1")) { + if (serv.getName().endsWith("__2")) { caseService2 = serv; } - if (serv.getName().endsWith("__2")) { + if (serv.getName().endsWith("__3")) { caseService3 = serv; } } @@ -337,6 +411,28 @@ "' not expected: "+caseService1.getName()); } + if (caseService1.getActions().size() != 1) { + fail("Path(1) does not have 1 action: "+caseService1.getActions().size()); + } + + if ((caseService1.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+caseService1.getActions().get(0)); + } + + ScheduleStateAction schedule=(ScheduleStateAction)caseService1.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(1); if (elem.getNodeName().equals("case") == false) { @@ -353,6 +449,28 @@ "' not expected: "+caseService2.getName()); } + if (caseService2.getActions().size() != 1) { + fail("Path(2) does not have 1 action: "+caseService2.getActions().size()); + } + + if ((caseService2.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+caseService2.getActions().get(0)); + } + + schedule=(ScheduleStateAction)caseService2.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } + elem=(org.w3c.dom.Element)paths.item(2); if (elem.getNodeName().equals("case") == false) { @@ -368,5 +486,27 @@ fail("Service name '"+elem.getAttribute("service-name")+ "' not expected: "+caseService3.getName()); } + + if (caseService3.getActions().size() != 1) { + fail("Path(3) does not have 1 action: "+caseService3.getActions().size()); + } + + if ((caseService3.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action not schedule state: "+caseService3.getActions().get(0)); + } + + schedule=(ScheduleStateAction)caseService3.getActions().get(0); + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(join.getCategory()) == false) { + fail("Schedule cateogry is not join '"+join.getCategory()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)); + } + + if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(join.getName()) == false) { + fail("Schedule name is not join '"+join.getName()+"': "+ + schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)); + } } } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRuleTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRuleTest.java 2008-08-07 17:15:54 UTC (rev 225) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRuleTest.java 2008-08-08 12:01:56 UTC (rev 226) @@ -417,4 +417,167 @@ "' not expected: "+s2.getName()); } } + + public void testInsertWhileNotFirstSessionAction() { + WhileModelChangeRule rule=new WhileModelChangeRule(); + + TestESBLanguageModel model=new TestESBLanguageModel(); + + TestESBService service=(TestESBService) + model.createService("testcategory", "testname"); + + model.addService(service); + + // Make session based service + service.setSessionBased(true); + + TestModelChangeContext context=new TestModelChangeContext(); + context.setParent(service); + + java.util.Set<Interaction> interactions=new java.util.HashSet<Interaction>(); + + TestLookaheadAnalyser tla=new TestLookaheadAnalyser(); + tla.setInteractions(interactions); + + Role role=new Role(); + role.setName("role1"); + + Interaction interaction=new Interaction(); + interaction.setToRole(role); + + TypeReference ref=new TypeReference(); + ref.setNamespace("ns"); + ref.setLocalpart("lp"); + + MessageSignature msig=new MessageSignature(); + interaction.setMessageSignature(msig); + msig.getTypes().add(ref); + + interactions.add(interaction); + + org.scribble.extensions.TestSingleExtensionRegistry reg= + new org.scribble.extensions.TestSingleExtensionRegistry(tla); + org.scribble.extensions.RegistryFactory.setRegistry(reg); + + context.setRole(role); + + Conversation conv=new Conversation(); + ModelName mname=new ModelName(); + conv.setModelName(mname); + + mname.setLocatedRole(role); + + While mobj=new While(); + conv.getBlock().getContents().add(mobj); + + mobj.getRoles().add(role); + + if (rule.insert(context, model, mobj, -1) == false) { + fail("Failed to insert"); + } + + // Check actions + if (service.getActions().size() != 1) { + fail("Expecting 1 action: "+service.getActions().size()); + } + + if ((service.getActions().get(0) instanceof ScheduleStateAction) == false) { + fail("Action was not ScheduleStateAction: "+service.getActions().get(0)); + } + + ScheduleStateAction whileSchedule=(ScheduleStateAction) + service.getActions().get(0); + + if (model.getServices().size() != 4) { + fail("Four services expected: "+model.getServices().size()); + } + + ESBService whileService=null; + ESBService s1=null; + ESBService s2=null; + java.util.Iterator<ESBService> iter=model.getServices().iterator(); + + while ((s1 == null || s2 == null || whileService == null) && + iter.hasNext()) { + ESBService serv = iter.next(); + if (serv.getName().endsWith("__0")) { + whileService = serv; + } + if (serv.getName().endsWith("__1")) { + s1 = serv; + } + if (serv.getName().endsWith("__2")) { + s2 = serv; + } + } + + if (whileSchedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY). + equals(whileService.getCategory()) == false) { + fail("While schedule action category '"+ + whileSchedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)+ + "' not expected: "+whileService.getCategory()); + } + + if (whileSchedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME). + equals(whileService.getName()) == false) { + fail("While schedule action service name '"+ + whileSchedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)+ + "' not expected: "+whileService.getName()); + } + + if (whileService.getActions().size() != 1) { + fail("Expecting 1 action: "+whileService.getActions().size()); + } + + if ((whileService.getActions().get(0) instanceof WhileAction) == false) { + fail("Action was not WhileAction: "+whileService.getActions().get(0)); + } + + WhileAction action=(WhileAction)whileService.getActions().get(0); + + org.w3c.dom.NodeList paths=action.getPropertyChildNodes("paths"); + + if (paths.getLength() != 2) { + fail("Two path children expected: "+paths.getLength()); + } + + org.w3c.dom.Element elem=(org.w3c.dom.Element)paths.item(0); + + if (elem.getNodeName().equals("while") == false) { + fail("while expected but got: "+elem.getNodeName()); + } + + if (elem.getAttribute("service-category").equals(s1.getCategory()) == false) { + fail("Service category '"+elem.getAttribute("service-category")+ + "' not expected: "+s1.getCategory()); + } + + if (elem.getAttribute("service-name").equals(s1.getName()) == false) { + fail("Service name '"+elem.getAttribute("service-name")+ + "' not expected: "+s1.getName()); + } + + // Check no message types + org.w3c.dom.NodeList mtypeNL=elem.getElementsByTagName("message"); + + if (mtypeNL.getLength() != 0) { + fail("Should have no message types: "+mtypeNL.getLength()); + } + + elem=(org.w3c.dom.Element)paths.item(1); + + if (elem.getNodeName().equals("exit") == false) { + fail("exit expected but got: "+elem.getNodeName()); + } + + if (elem.getAttribute("service-category").equals(s2.getCategory()) == false) { + fail("Service category '"+elem.getAttribute("service-category")+ + "' not expected: "+s2.getCategory()); + } + + if (elem.getAttribute("service-name").equals(s2.getName()) == false) { + fail("Service name '"+elem.getAttribute("service-name")+ + "' not expected: "+s2.getName()); + } + } }

15 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

overlord-commits August 2008