Author: heiko.braun(a)jboss.com Date: 2010-10-12 08:34:16 -0400 (Tue, 12 Oct 2010) New Revision: 1034 Added: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/LRUCache.java trunk/console/integration/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.GraphViewerPlugin Modified: trunk/console/bpel2svg/pom.xml trunk/console/bpel2svg/src/main/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtil.java trunk/console/integration/pom.xml trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/install/build.xml trunk/pom.xml Log: RIFTSAW-262: Implement graph viewer plugin Modified: trunk/console/bpel2svg/pom.xml =================================================================== --- trunk/console/bpel2svg/pom.xml 2010-10-12 05:23:49 UTC (rev 1033) +++ trunk/console/bpel2svg/pom.xml 2010-10-12 12:34:16 UTC (rev 1034) @@ -104,6 +104,11 @@ <artifactId>axiom-impl</artifactId> <version>${axiom.version}</version> </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-api</artifactId> + <version>${axiom.version}</version> + </dependency> <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis-ext</artifactId> Modified: trunk/console/bpel2svg/src/main/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtil.java =================================================================== --- trunk/console/bpel2svg/src/main/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtil.java 2010-10-12 05:23:49 UTC (rev 1033) +++ trunk/console/bpel2svg/src/main/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtil.java 2010-10-12 12:34:16 UTC (rev 1034) @@ -141,6 +141,8 @@ LayoutManager layoutManager = BPEL2SVGFactory.getInstance().getLayoutManager(); layoutManager.setVerticalLayout(true); + layoutManager.setYSpacing(20); + layoutManager.setYSpacing(50); layoutManager.layoutSVG(bpel.getRootActivity()); SVGImpl svg = new SVGImpl(); Modified: trunk/console/integration/pom.xml =================================================================== --- trunk/console/integration/pom.xml 2010-10-12 05:23:49 UTC (rev 1033) +++ trunk/console/integration/pom.xml 2010-10-12 12:34:16 UTC (rev 1034) @@ -32,6 +32,12 @@ <!-- RiftSaw --> <dependency> + <groupId>org.jboss.soa.bpel.console</groupId> + <artifactId>bpel2svg</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-api</artifactId> </dependency> Added: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java (rev 0) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2010-10-12 12:34:16 UTC (rev 1034) @@ -0,0 +1,165 @@ +/* + * Copyright 2009 JBoss, a divison Red Hat, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.soa.bpel.console; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.ode.bpel.iapi.ProcessConf; +import org.jboss.bpm.console.client.model.ActiveNodeInfo; +import org.jboss.bpm.console.client.model.DiagramInfo; +import org.jboss.bpm.console.server.plugin.GraphViewerPlugin; +import org.jboss.soa.bpel.bpel2svg.BPEL2SVGUtil; +import org.jboss.soa.bpel.console.util.LRUCache; +import org.jboss.soa.bpel.runtime.engine.BPELEngine; +import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; +import org.jboss.soa.bpel.runtime.integration.ServerConfig; +import org.jboss.soa.bpel.runtime.integration.ServerConfigFactory; +import org.wso2.carbon.bpel.ui.bpel2svg.SVGInterface; + +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.namespace.QName; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +/** + * Provides the BPEL process images to the console + * leveraging the {@link org.jboss.soa.bpel.bpel2svg.BPEL2SVGUtil} + * + * @author: Heiko Braun <hbraun(a)redhat.com&gt; + * @date: Oct 12, 2010 + */ +public class SVGPlugin implements GraphViewerPlugin { + + protected final static Log log = LogFactory.getLog(SVGPlugin.class); + + protected final static String WEB_CONTEXT = "/gwt-console-server/rs"; + + protected String webServiceHost = null; + protected int webServicePort = 8080; + + private BPELEngine engine; + + private LRUCache cache; + + public SVGPlugin() { + + // host & port resolution + ServerConfig serverConfig = ServerConfigFactory.getServerConfig(); + this.webServiceHost = serverConfig.getWebServiceHost(); + this.webServicePort = serverConfig.getWebServicePort(); + + try + { + InitialContext ctx = new InitialContext(); + engine = (BPELEngine)ctx.lookup("bpel/Engine"); + } + catch (NamingException e) + { + throw new RuntimeException("Failed to initialize BPEL engine"); + } + + cache = new LRUCache(20); + } + + protected StringBuilder getBaseUrl() { + StringBuilder spec = new StringBuilder(); + spec.append("http://"); + spec.append(webServiceHost); + spec.append(":"); + spec.append(webServicePort); + spec.append(WEB_CONTEXT); + return spec; + } + + public byte[] getProcessImage(String processId) { + + // any cache hits? + byte[] cached = (byte[])cache.get(processId); + if(cached !=null) + return cached; + + // generate new + InputStream in = getBpelDescriptor(processId); + + SVGInterface svg = null; + + try { + svg = BPEL2SVGUtil.generate(in); + + if (svg == null) + log.error("Failed to get SVGInterface"); + + } catch(Exception e) { + throw new RuntimeException("Failed to render process image", e); + } + + byte[] bytes = svg.toPNGBytes(); + + cache.put(processId, bytes); + + return bytes; + } + + private InputStream getBpelDescriptor(String processId) + { + String actualId = ModelAdaptor.decodeId(processId); + QName qName= QName.valueOf(actualId); + ProcessConf pconf = ((BPELEngineImpl)engine)._store.getProcessConfiguration(qName); + + try { + File deployDir = new File(pconf.getBaseURI()); + File bpelDoc = new File(deployDir, pconf.getBpelDocument()); + return new FileInputStream(bpelDoc); + } catch (FileNotFoundException e) { + throw new RuntimeException("Faile to load bpel file", e); + } + } + + public DiagramInfo getDiagramInfo(String processId) { + throw new RuntimeException("Not implemented"); + } + + public List<ActiveNodeInfo> getActiveNodeInfo(String instanceId) { + return new ArrayList<ActiveNodeInfo>(); // Not used + } + + public URL getDiagramURL(String id) { + URL result = null; + + StringBuilder sb = getBaseUrl().append("/process/definition/"); + sb.append(id); + sb.append("/image"); + + try { + result = new URL(sb.toString()); + } catch (MalformedURLException e) { + throw new RuntimeException("Failed to create url", e); + } + + return result; + } + + public List<ActiveNodeInfo> getNodeInfoForActivities(String processDefinitionId, List<String> activities) { + return new ArrayList<ActiveNodeInfo>(); // Not used + } +} Added: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/LRUCache.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/LRUCache.java (rev 0) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/LRUCache.java 2010-10-12 12:34:16 UTC (rev 1034) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 JBoss, a divison Red Hat, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.soa.bpel.console.util; + +import java.util.LinkedHashMap; +import java.util.Collection; +import java.util.Map; +import java.util.ArrayList; + +/** + * An LRU cache, based on <code>LinkedHashMap</code>.<br> + * This cache has a fixed maximum number of elements (<code>cacheSize</code>). + * If the cache is full and another entry is added, the LRU (least recently used) entry is dropped. + * <p> + * This class is thread-safe. All methods of this class are synchronized.<br> + * Author: Christian d'Heureuse (<a href="http://www.source-code.biz">www.source-code.biz</a>)<br> + * License: <a href="http://www.gnu.org/licenses/lgpl.html">LGPL</a>;. + */ +public class LRUCache<K,V> { + + private static final float hashTableLoadFactor = 0.75f; + + private LinkedHashMap<K,V> map; + private int cacheSize; + + /** + * Creates a new LRU cache. + * @param cacheSize the maximum number of entries that will be kept in this cache. + */ + public LRUCache (int cacheSize) { + this.cacheSize = cacheSize; + int hashTableCapacity = (int)Math.ceil(cacheSize / hashTableLoadFactor) + 1; + map = new LinkedHashMap<K,V>(hashTableCapacity, hashTableLoadFactor, true) { + // (an anonymous inner class) + private static final long serialVersionUID = 1; + @Override + protected boolean removeEldestEntry (Map.Entry<K,V> eldest) { + return size() > LRUCache.this.cacheSize; + } + }; + } + + /** + * Retrieves an entry from the cache.<br> + * The retrieved entry becomes the MRU (most recently used) entry. + * @param key the key whose associated value is to be returned. + * @return the value associated to this key, or null if no value with this key exists in the cache. + */ + public synchronized V get (K key) { + return map.get(key); } + + /** + * Adds an entry to this cache. + * The new entry becomes the MRU (most recently used) entry. + * If an entry with the specified key already exists in the cache, it is replaced by the new entry. + * If the cache is full, the LRU (least recently used) entry is removed from the cache. + * @param key the key with which the specified value is to be associated. + * @param value a value to be associated with the specified key. + */ + public synchronized void put (K key, V value) { + map.put (key, value); } + + /** + * Clears the cache. + */ + public synchronized void clear() { + map.clear(); } + + /** + * Returns the number of used entries in the cache. + * @return the number of entries currently in the cache. + */ + public synchronized int usedEntries() { + return map.size(); } + + /** + * Returns a <code>Collection</code> that contains a copy of all cache entries. + * @return a <code>Collection</code> with a copy of the cache content. + */ + public synchronized Collection<Map.Entry<K,V>> getAll() { + return new ArrayList<Map.Entry<K,V>>(map.entrySet()); } + +} // end class LRUCache \ No newline at end of file Added: trunk/console/integration/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.GraphViewerPlugin =================================================================== --- trunk/console/integration/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.GraphViewerPlugin (rev 0) +++ trunk/console/integration/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.GraphViewerPlugin 2010-10-12 12:34:16 UTC (rev 1034) @@ -0,0 +1 @@ +org.jboss.soa.bpel.console.SVGPlugin \ No newline at end of file Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2010-10-12 05:23:49 UTC (rev 1033) +++ trunk/distribution/pom.xml 2010-10-12 12:34:16 UTC (rev 1034) @@ -173,6 +173,12 @@ <dependency> <groupId>org.jboss.soa.bpel.console</groupId> + <artifactId>bpel2svg</artifactId> + <version>${version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>integration</artifactId> <version>${version}</version> </dependency> Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2010-10-12 05:23:49 UTC (rev 1033) +++ trunk/distribution/src/main/assembly/bin.xml 2010-10-12 12:34:16 UTC (rev 1034) @@ -19,196 +19,224 @@ * (C) 2008 --> <assembly> - <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> - <id></id> - <includeBaseDirectory>true</includeBaseDirectory> - <formats> - <format>zip</format> - </formats> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id></id> + <includeBaseDirectory>true</includeBaseDirectory> + <formats> + <format>zip</format> + </formats> - <fileSets> + <fileSets> - <!--Copy files like License and samples etc --> - <fileSet> - <directory>src/main/release</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.txt</include> - </includes> - </fileSet> + <!--Copy files like License and samples etc --> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.txt</include> + </includes> + </fileSet> - <fileSet> - <directory>src/main/release/install</directory> - <outputDirectory>/install</outputDirectory> - </fileSet> + <fileSet> + <directory>src/main/release/install</directory> + <outputDirectory>/install</outputDirectory> + </fileSet> - <fileSet> - <directory>src/main/release/db</directory> - <outputDirectory>/db</outputDirectory> - </fileSet> + <fileSet> + <directory>src/main/release/db</directory> + <outputDirectory>/db</outputDirectory> + </fileSet> - <fileSet> - <directory>src/main/release/modules</directory> - <outputDirectory>/modules</outputDirectory> - </fileSet> + <fileSet> + <directory>src/main/release/modules</directory> + <outputDirectory>/modules</outputDirectory> + </fileSet> - <fileSet> - <directory>../runtime/deployer/target</directory> - <outputDirectory>/modules/riftsaw.deployer</outputDirectory> - <includes> - <include>jboss-riftsaw-deployer.jar</include> - </includes> - </fileSet> + <fileSet> + <directory>../runtime/deployer/target</directory> + <outputDirectory>/modules/riftsaw.deployer</outputDirectory> + <includes> + <include>jboss-riftsaw-deployer.jar</include> + </includes> + </fileSet> - <fileSet> - <directory>../samples</directory> - <outputDirectory>samples</outputDirectory> - <includes> - <include>common/**</include> - <include>esb/bpel_helloworld/**</include> - <include>esb/bpel_loan_fault/**</include> - <include>esb/invoke_esb_ebws/**</include> - <include>esb/simple_esb_proxy_invoke/**</include> - <include>esb/simple_esb_proxy_invoke2/**</include> - <include>quickstart/bpel_event_listener/**</include> - <include>quickstart/fault_compensation/**</include> - <include>quickstart/hello_world/**</include> - <include>quickstart/hello_world_header_ode/**</include> - <include>quickstart/hello_world_header_wsdl/**</include> - <include>quickstart/loan_approval/**</include> - <include>quickstart/math/**</include> - <include>quickstart/salutations/**</include> - <include>quickstart/say_hello/**</include> - <include>quickstart/secure_invoke/**</include> - <include>quickstart/secure_service/**</include> - <include>quickstart/service_handler/**</include> - <include>quickstart/simple_correlation/**</include> - <include>quickstart/simple_invoke/**</include> - <include>quickstart/simple_pick/**</include> - <include>quickstart/while_wait/**</include> - <include>tutorial/BPEL-BluePrint1/**</include> - <include>tutorial/BPEL-BluePrint2/**</include> - <include>tutorial/BPEL-BluePrint3/**</include> - <include>tutorial/BPEL-BluePrint4/**</include> - <include>tutorial/BPEL-BluePrint5/**</include> - <include>readme.txt</include> - </includes> - </fileSet> + <fileSet> + <directory>../samples</directory> + <outputDirectory>samples</outputDirectory> + <includes> + <include>common/**</include> + <include>esb/bpel_helloworld/**</include> + <include>esb/bpel_loan_fault/**</include> + <include>esb/invoke_esb_ebws/**</include> + <include>esb/simple_esb_proxy_invoke/**</include> + <include>esb/simple_esb_proxy_invoke2/**</include> + <include>quickstart/bpel_event_listener/**</include> + <include>quickstart/fault_compensation/**</include> + <include>quickstart/hello_world/**</include> + <include>quickstart/hello_world_header_ode/**</include> + <include>quickstart/hello_world_header_wsdl/**</include> + <include>quickstart/loan_approval/**</include> + <include>quickstart/math/**</include> + <include>quickstart/salutations/**</include> + <include>quickstart/say_hello/**</include> + <include>quickstart/secure_invoke/**</include> + <include>quickstart/secure_service/**</include> + <include>quickstart/service_handler/**</include> + <include>quickstart/simple_correlation/**</include> + <include>quickstart/simple_invoke/**</include> + <include>quickstart/simple_pick/**</include> + <include>quickstart/while_wait/**</include> + <include>tutorial/BPEL-BluePrint1/**</include> + <include>tutorial/BPEL-BluePrint2/**</include> + <include>tutorial/BPEL-BluePrint3/**</include> + <include>tutorial/BPEL-BluePrint4/**</include> + <include>tutorial/BPEL-BluePrint5/**</include> + <include>readme.txt</include> + </includes> + </fileSet> - <fileSet> - <directory>src/main/release/bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>755</fileMode> - </fileSet> + <fileSet> + <directory>src/main/release/bin</directory> + <outputDirectory>bin</outputDirectory> + <fileMode>755</fileMode> + </fileSet> - <fileSet> - <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/gettingstartedguide</outputDirectory> - </fileSet> + <fileSet> + <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/gettingstartedguide</outputDirectory> + </fileSet> - <fileSet> - <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/userguide</outputDirectory> - </fileSet> + <fileSet> + <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/userguide</outputDirectory> + </fileSet> - <fileSet> - <directory>../console/integration/target</directory> - <outputDirectory>/modules/bpel-console</outputDirectory> - <includes> - <include>riftsaw-console-integration.jar</include> - </includes> - </fileSet> + <fileSet> + <directory>../console/integration/target</directory> + <outputDirectory>/modules/bpel-console</outputDirectory> + <includes> + <include>riftsaw-console-integration.jar</include> + </includes> + </fileSet> - <fileSet> - <directory>../console/bpaf/target</directory> - <outputDirectory>/modules/bpel-console</outputDirectory> - <includes> - <include>riftsaw-console-bpaf.jar</include> - </includes> - </fileSet> + <fileSet> + <directory>../console/bpaf/target</directory> + <outputDirectory>/modules/bpel-console</outputDirectory> + <includes> + <include>riftsaw-console-bpaf.jar</include> + </includes> + </fileSet> - <fileSet> - <directory>../console/identity/target</directory> - <outputDirectory>/modules/bpel-console</outputDirectory> - <includes> - <include>riftsaw-console-identity.jar</include> - </includes> - </fileSet> + <fileSet> + <directory>../console/identity/target</directory> + <outputDirectory>/modules/bpel-console</outputDirectory> + <includes> + <include>riftsaw-console-identity.jar</include> + </includes> + </fileSet> - <fileSet> - <directory>../runtime/clustering/src/main/resources/</directory> - <outputDirectory>/modules/clustering</outputDirectory> - </fileSet> + <fileSet> + <directory>../runtime/clustering/src/main/resources/</directory> + <outputDirectory>/modules/clustering</outputDirectory> + </fileSet> - </fileSets> + </fileSets> - <dependencySets> - - <dependencySet> - <outputDirectory>/modules</outputDirectory> - <unpack>true</unpack> - <includes> - <include>org.jboss.soa.bpel.runtime:bpel.esb:zip</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>/modules/riftsaw.sar</outputDirectory> - <unpack>true</unpack> - <includes> - <include>org.jboss.soa.bpel.runtime:riftsaw:zip</include> - </includes> - </dependencySet> + <dependencySets> - <dependencySet> - <outputDirectory>/db/drivers</outputDirectory> - <includes> - <include>net.sourceforge.jtds:jtds</include> - <include>postgresql:postgresql</include> - <include>mysql:mysql-connector-java</include> - <include>org.apache.derby:derby</include> - <include>org.apache.derby:derbytools</include> - <include>com.h2database:h2</include> - </includes> - </dependencySet> + <dependencySet> + <outputDirectory>/modules</outputDirectory> + <unpack>true</unpack> + <includes> + <include>org.jboss.soa.bpel.runtime:bpel.esb:zip</include> + </includes> + </dependencySet> - <dependencySet> - <outputDirectory>/modules/bpel-console</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>org.jboss.bpm:gwt-console</include> - <include>org.jboss.bpm:gwt-console-server</include> - <include>org.jboss.bpm:gwt-console-server-integration</include> - <include>org.jboss.bpm:gwt-console-rpc</include> - <include>org.codehaus.jettison:jettison</include> - <include>org.jboss.bpm:activity-monitor-model</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>/lib</outputDirectory> - <includes> - <include>commons-codec:commons-codec</include> - <include>commons-httpclient:commons-httpclient</include> - <include>org.jboss.soa.bpel:riftsaw-tools</include> - </includes> - </dependencySet> + <dependencySet> + <outputDirectory>/modules/riftsaw.sar</outputDirectory> + <unpack>true</unpack> + <includes> + <include>org.jboss.soa.bpel.runtime:riftsaw:zip</include> + </includes> + </dependencySet> - <!-- clustering module --> - <dependencySet> - <outputDirectory>/modules/clustering</outputDirectory> - <includes> - <include>org.jboss.soa.bpel.runtime:riftsaw-clustering</include> - </includes> - </dependencySet> + <dependencySet> + <outputDirectory>/db/drivers</outputDirectory> + <includes> + <include>net.sourceforge.jtds:jtds</include> + <include>postgresql:postgresql</include> + <include>mysql:mysql-connector-java</include> + <include>org.apache.derby:derby</include> + <include>org.apache.derby:derbytools</include> + <include>com.h2database:h2</include> + </includes> + </dependencySet> - <!-- juddi-client, should be removed once esb catches up to 3.0.4--> - <dependencySet> - <outputDirectory>/db/juddi</outputDirectory> - <includes> - <include>org.apache.juddi:juddi-client</include> - </includes> - </dependencySet> - </dependencySets> + <dependencySet> + <outputDirectory>/modules/bpel-console</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.jboss.bpm:gwt-console</include> + <include>org.jboss.bpm:gwt-console-server</include> + <include>org.jboss.bpm:gwt-console-server-integration</include> + <include>org.jboss.bpm:gwt-console-rpc</include> + <include>org.codehaus.jettison:jettison</include> + <include>org.jboss.bpm:activity-monitor-model</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>/modules/bpel-console/bpel2svg</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.jboss.soa.bpel.console:bpel2svg</include> + <include>batik:batik-anim</include> + <include>batik:batik-awt-util</include> + <include>batik:batik-bridge</include> + <include>batik:batik-codec</include> + <include>batik:batik-css</include> + <include>batik:batik-dom</include> + <include>batik:batik-ext</include> + <include>batik:batik-gvt</include> + <include>batik:batik-parser</include> + <include>batik:batik-script</include> + <include>batik:batik-svg-dom</include> + <include>batik:batik-svggen</include> + <include>batik:batik-transcoder</include> + <include>batik:batik-util</include> + <include>batik:batik-xml</include> + <include>org.apache.ws.commons.axiom:axiom-impl</include> + <include>org.apache.ws.commons.axiom:axiom-api</include> + <include>commons-codec:commons-codec</include> + <include>xml-apis:xml-apis-ext</include> + </includes> + </dependencySet> + + + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <includes> + <include>commons-codec:commons-codec</include> + <include>commons-httpclient:commons-httpclient</include> + <include>org.jboss.soa.bpel:riftsaw-tools</include> + </includes> + </dependencySet> + + <!-- clustering module --> + <dependencySet> + <outputDirectory>/modules/clustering</outputDirectory> + <includes> + <include>org.jboss.soa.bpel.runtime:riftsaw-clustering</include> + </includes> + </dependencySet> + + <!-- juddi-client, should be removed once esb catches up to 3.0.4--> + <dependencySet> + <outputDirectory>/db/juddi</outputDirectory> + <includes> + <include>org.apache.juddi:juddi-client</include> + </includes> + </dependencySet> + </dependencySets> + </assembly> Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2010-10-12 05:23:49 UTC (rev 1033) +++ trunk/distribution/src/main/release/install/build.xml 2010-10-12 12:34:16 UTC (rev 1034) @@ -103,6 +103,10 @@ <mkdir dir="${deploy.dir}/bpel-console/bpel-identity.sar"/> <mkdir dir="${deploy.dir}/bpel-console/gwt-console-server.war"/> + <copy todir="${deploy.dir}/bpel-console/bpel2svg"> + <fileset dir="${modules}/bpel-console/bpel2svg"/> + </copy> + <copy file="${modules}/bpel-console/riftsaw-console-bpaf.jar" todir="${deploy.dir}/bpel-console"/> <copy file="${modules}/bpel-console/activity-monitor-model.jar" todir="${deploy.dir}/bpel-console"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-12 05:23:49 UTC (rev 1033) +++ trunk/pom.xml 2010-10-12 12:34:16 UTC (rev 1034) @@ -77,7 +77,7 @@ <properties> <riftsaw.ode.version>2.2.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version> - <bpel.console.version>2.1.2</bpel.console.version> + <bpel.console.version>2.2.0-SNAPSHOT</bpel.console.version> <activity.monitor.model.version>1.0.0-Beta1</activity.monitor.model.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>4.8.1</junit.version>