JBoss JBPM SVN: r2315 - in jbpm3/trunk: modules/enterprise/ear and 3 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-23 13:36:43 -0400 (Tue, 23 Sep 2008)
New Revision: 2315
Added:
jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java
jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt
jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt
jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt
Modified:
jbpm3/trunk/modules/enterprise/ear/pom.xml
jbpm3/trunk/modules/enterprise/jar/pom.xml
jbpm3/trunk/pom.xml
Log:
Fix Container provided jars
Modified: jbpm3/trunk/modules/enterprise/ear/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-23 16:21:54 UTC (rev 2314)
+++ jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-23 17:36:43 UTC (rev 2315)
@@ -13,7 +13,7 @@
<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>
- <name>JBoss jBPM3 - Enterprise Bundle</name>
+ <name>JBoss jBPM3 - Enterprise (EAR)</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-enterprise-bundle</artifactId>
<packaging>ear</packaging>
@@ -27,9 +27,20 @@
<!-- Dependencies -->
<dependencies>
- <!-- jBPM Dependencies -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-enterprise-beans</artifactId>
+ <version>${version}</version>
+ <type>ejb</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-console</artifactId>
<version>${version}</version>
<type>war</type>
@@ -73,18 +84,6 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise-beans</artifactId>
- <version>${version}</version>
- <type>ejb</type>
- <exclusions>
- <exclusion>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-identity</artifactId>
<version>${version}</version>
<exclusions>
@@ -129,7 +128,7 @@
<contextRoot>/jbpm-console</contextRoot>
<unpack>true</unpack>
</webModule>
- <webModule>
+ <webModule>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console-war</artifactId>
<bundleFileName>gwt-console.war</bundleFileName>
Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-09-23 16:21:54 UTC (rev 2314)
+++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-09-23 17:36:43 UTC (rev 2315)
@@ -13,7 +13,7 @@
<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>
- <name>JBoss jBPM3 - Enterprise Beans</name>
+ <name>JBoss jBPM3 - Enterprise (JAR)</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-enterprise-beans</artifactId>
<packaging>ejb</packaging>
@@ -33,10 +33,6 @@
<artifactId>jbpm-core</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.jbpm.spec</groupId>
- <artifactId>jbpm-spec-api</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<dependency>
@@ -73,13 +69,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <!-- verify that this version works for all target containers -->
- <version>4.2.2.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.integration.shared.api</artifactId>
<scope>test</scope>
@@ -90,6 +79,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <!-- verify that this version works for all target containers -->
+ <version>4.2.2.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Plugins -->
Added: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java 2008-09-23 17:36:43 UTC (rev 2315)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.enterprise;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.ObjectNameFactory;
+import org.jboss.bpm.test.IntegrationTestCase;
+
+/**
+ * Test that there are jars deployed which should in fact be provided by the container
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 23-Sep-2008
+ */
+public class ContainerProvidedJarsTest extends IntegrationTestCase
+{
+ public void testDependencies() throws Exception
+ {
+ String targetContainer = null;
+ if (isTargetJBoss422())
+ {
+ targetContainer = "jboss422";
+ }
+ else if (isTargetJBoss423())
+ {
+ targetContainer = "jboss423";
+ }
+ else if (isTargetJBoss500())
+ {
+ targetContainer = "jboss500";
+ }
+ assertNotNull("System property 'target.container' not null", targetContainer);
+ assertTrue("Supported target.container: " + targetContainer, "jboss422,jboss423,jboss500".indexOf(targetContainer) >= 0);
+
+ File jbossJars = getResourceFile(targetContainer + "-dependencies.txt");
+ assertTrue("JBoss jar fixture exists: " + jbossJars, jbossJars.exists());
+
+ // Read the JBoss ServerHomeDir
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File serverHomeDir = (File)getServer().getAttribute(oname, "ServerHomeDir");
+ if (serverHomeDir == null)
+ throw new IllegalStateException("Cannot obtain jboss home dir");
+
+ File jbpmDir = new File(serverHomeDir + "/deploy/jbpm");
+ assertTrue("jBPM dir exists: " + jbpmDir, jbpmDir.exists());
+
+ // Store the deployed jars in a string builder
+ String deployedJars = getDeployedJars(jbpmDir).toString();
+
+ // Iterate over the known server provided jars
+ List<String> matchingJars = new ArrayList<String>();
+ BufferedReader br = new BufferedReader(new FileReader(jbossJars));
+ String line = br.readLine();
+ while (line != null)
+ {
+ if (line.length() == 0 || line.startsWith("#"))
+ {
+ line = br.readLine();
+ continue;
+ }
+
+ if (deployedJars.indexOf(line) > 0)
+ {
+ matchingJars.add(line);
+ }
+ line = br.readLine();
+ }
+
+ assertEquals("Invalid deployed jars: " + matchingJars, 0, matchingJars.size());
+ }
+
+ private List<String> getDeployedJars(File subdir)
+ {
+ List<String> deployedJars = new ArrayList<String>();
+ for (File file : subdir.listFiles())
+ {
+ if (file.isDirectory())
+ {
+ deployedJars.addAll(getDeployedJars(file));
+ continue;
+ }
+
+ String fileName = file.getName();
+ if (fileName.endsWith(".jar"))
+ deployedJars.add(fileName);
+ }
+ return deployedJars;
+ }
+}
Property changes on: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt 2008-09-23 17:36:43 UTC (rev 2315)
@@ -0,0 +1,82 @@
+# This file shows jboss-4.2.2.ga thirdparty dependencies. It was produced running the following command
+#
+# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort -u
+#
+activation
+antlr
+autonumber-plugin
+bcel
+bindingservice-plugin
+bsf
+bsh
+bsh-deployer
+cglib
+commons-codec
+commons-collections
+commons-httpclient
+commons-logging
+concurrent
+dom4j
+ejb3-persistence
+el-api
+getopt
+hibernate3
+hibernate-annotations
+hibernate-entitymanager
+hsqldb
+hsqldb-plugin
+javassist
+jaxen
+jboss
+jboss-cache-jdk50
+jboss-common
+jboss-common-jdbc-wrapper
+jboss-ejb3x
+jboss-hibernate
+jboss-j2ee
+jboss-jaxrpc
+jboss-jaxws
+jboss-jca
+jboss-jmx
+jboss-jsr77
+jboss-jsr88
+jbossjta
+jbossjta-integration
+jboss-management
+jboss-monitoring
+jbossmq
+jboss-remoting
+jboss-remoting-int
+jboss-saaj
+jboss-serialization
+jboss-srp
+jbosssx
+jboss-system
+jboss-transaction
+jbossts-common
+jboss-vfs
+jbossws-common
+jbossws-framework
+jbossws-jboss42
+jbossws-spi
+jboss-xml-binding
+jmx-adaptor-plugin
+jnpserver
+joesnmp
+jpl-pattern
+jpl-util
+jsp-api
+log4j
+log4j-boot
+log4j-snmp-appender
+mail
+mail-plugin
+properties-plugin
+quartz
+scheduler-plugin
+scheduler-plugin-example
+serializer
+servlet-api
+xalan
+xercesImpl
+xmlentitymgr
Property changes on: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt 2008-09-23 17:36:43 UTC (rev 2315)
@@ -0,0 +1,83 @@
+# This file shows jboss-4.2.3.ga thirdparty dependencies. It was produced running the following command
+#
+# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort
+#
+activation
+antlr
+autonumber-plugin
+bcel
+bindingservice-plugin
+bsf
+bsh
+bsh-deployer
+cglib
+commons-codec
+commons-collections
+commons-httpclient
+commons-logging
+concurrent
+dom4j
+ejb3-persistence
+el-api
+getopt
+hibernate3
+hibernate-annotations
+hibernate-entitymanager
+hsqldb
+hsqldb-plugin
+javassist
+jaxb-api
+jaxb-impl
+jaxen
+jboss
+jboss-common
+jboss-common-jdbc-wrapper
+jboss-ejb3x
+jboss-hibernate
+jboss-iiop
+jboss-j2ee
+jboss-jaxrpc
+jboss-jaxws
+jboss-jaxws-ext
+jboss-jca
+jboss-jmx
+jboss-jsr77
+jboss-jsr88
+jbossjta
+jbossjta-integration
+jboss-management
+jboss-monitoring
+jbossmq
+jboss-remoting
+jboss-remoting-int
+jboss-saaj
+jboss-serialization
+jboss-srp
+jbosssx
+jboss-system
+jboss-transaction
+jbossts-common
+jboss-vfs
+jbossws-common
+jbossws-framework
+jbossws-jboss42
+jbossws-spi
+jboss-xml-binding
+jmx-adaptor-plugin
+jnpserver
+joesnmp
+jsp-api
+log4j
+log4j-boot
+log4j-snmp-appender
+mail
+mail-plugin
+properties-plugin
+quartz
+scheduler-plugin
+scheduler-plugin-example
+serializer
+servlet-api
+xalan
+xercesImpl
+xmlentitymgr
Property changes on: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt 2008-09-23 17:36:43 UTC (rev 2315)
@@ -0,0 +1,151 @@
+# This file shows jboss-5.0.0.cr2 thirdparty dependencies. It was produced running the following command
+#
+# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort -u
+#
+activation
+antlr
+autonumber-plugin
+bcel
+bsf
+bsh
+commons-collections
+commons-httpclient
+commons-logging
+concurrent
+dom4j
+dtdparser121
+ejb3-persistence
+el-api
+getopt
+hibernate-annotations
+hibernate-commons-annotations
+hibernate-core
+hibernate-entitymanager
+hibernate-jmx
+hibernate-validator
+hsqldb
+hsqldb-plugin
+javassist
+jaxb-api
+jaxb-impl
+jaxb-xjc
+jaxen
+jboss
+jboss-aop-deployer-jdk50
+jboss-aop-jboss4-jdk50
+jboss-aop-jboss5
+jboss-aop-jdk50
+jboss-aop-mc-int
+jbossas-remoting
+jboss-bindingservice
+jboss-bootstrap
+jboss-classloader
+jboss-classloading
+jboss-classloading-spi
+jboss-classloading-vfs
+jboss-common-core
+jboss-common-jdbc-wrapper
+jboss-current-invocation-aspects
+jboss-dependency
+jboss-deployers-client
+jboss-deployers-client-spi
+jboss-deployers-core
+jboss-deployers-core-spi
+jboss-deployers-impl
+jboss-deployers-spi
+jboss-deployers-structure-spi
+jboss-deployers-vfs
+jboss-deployers-vfs-spi
+jboss-ejb3-cache
+jboss-ejb3-common
+jboss-ejb3-core
+jboss-ejb3-ext-api
+jboss-ejb3-ext-api-impl
+jboss-ejb3-interceptors
+jboss-ejb3-metadata
+jboss-ejb3-proxy
+jboss-ejb3-proxy-clustered
+jboss-ejb3-security
+jboss-ejb3-transactions
+jbossha
+jboss-ha-client
+jboss-ha-server-api
+jboss-ha-server-cache-jbc
+jboss-ha-server-cache-spi
+jboss-hibernate
+jboss-iiop
+jboss-integration
+jboss-j2se
+jboss-jaspi-api
+jboss-javaee
+jboss-jca
+jboss-jmx
+jboss-jmx-remoting
+jboss-jpa-deployers
+jboss-jsr77
+jboss-jsr88
+jbossjta
+jbossjta-integration
+jboss-kernel
+jboss-logging-jdk
+jboss-logging-log4j
+jboss-logging-spi
+jboss-main
+jboss-managed
+jboss-management
+jboss-mbeans
+jboss-mdr
+jboss-messaging
+jboss-messaging-int
+jboss-metadata
+jboss-metatype
+jboss-monitoring
+jboss-profileservice
+jboss-reflect
+jboss-remoting
+jboss-remoting-aspects
+jboss-security-aspects
+jboss-security-spi
+jboss-serialization
+jboss-srp
+jboss-sunxacml
+jbosssx
+jbosssx-server
+jboss-system
+jboss-system-jmx
+jboss-transaction-aspects
+jbossts-common
+jboss-vfs
+jbossws-common
+jbossws-framework
+jbossws-native-jaxrpc
+jbossws-native-jaxws
+jbossws-native-jaxws-ext
+jbossws-native-saaj
+jbossws-spi
+jboss-xacml
+jboss-xml-binding
+jmx-adaptor-plugin
+jnpserver
+joesnmp
+jsp-api
+log4j
+log4j-boot
+log4j-snmp-appender
+mail
+mail-plugin
+osgi.core
+properties-plugin
+quartz
+resolver
+scheduler-plugin
+scheduler-plugin-example
+serializer
+servlet-api
+slf4j-api
+slf4j-jboss-logging
+stax-api
+trove
+wstx
+xalan
+xercesImpl
Property changes on: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-09-23 16:21:54 UTC (rev 2314)
+++ jbpm3/trunk/pom.xml 2008-09-23 17:36:43 UTC (rev 2315)
@@ -28,15 +28,15 @@
<!-- Modules -->
<modules>
+ <module>modules/console</module>
<module>modules/core</module>
+ <module>modules/enterprise</module>
+ <module>modules/examples</module>
+ <module>modules/gwt-console</module>
<module>modules/identity</module>
<module>modules/integration</module>
- <module>modules/examples</module>
+ <module>modules/jbpm4jsf</module>
<module>modules/simulation</module>
- <module>modules/console</module>
- <module>modules/enterprise</module>
- <module>modules/jbpm4jsf</module>
- <module>modules/gwt-console</module>
</modules>
<!-- Properties -->
@@ -69,7 +69,7 @@
<javax.persistence.version>1.0</javax.persistence.version>
<javax.jaxb.version>2.1</javax.jaxb.version>
<jaxen.version>1.1.1</jaxen.version>
- <jbpm.api.version>1.0.0-Alpha1</jbpm.api.version>
+ <jbpm.api.version>1.0.0-SNAPSHOT</jbpm.api.version>
<jboss.jbpm.designer.version>3.1.4</jboss.jbpm.designer.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.seam.version>2.0.2.GA</jboss.seam.version>
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2314 - in projects/jbpm-spec/trunk/modules/api: src/main/java/org/jboss/bpm/test and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-23 12:21:54 -0400 (Tue, 23 Sep 2008)
New Revision: 2314
Modified:
projects/jbpm-spec/trunk/modules/api/pom.xml
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java
Log:
Add access to MBeanServer
Modified: projects/jbpm-spec/trunk/modules/api/pom.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/api/pom.xml 2008-09-23 13:10:34 UTC (rev 2313)
+++ projects/jbpm-spec/trunk/modules/api/pom.xml 2008-09-23 16:21:54 UTC (rev 2314)
@@ -27,24 +27,21 @@
<!-- Dependencies -->
<dependencies>
-
<!-- Compile Dependencies -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
<!-- Provided Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
<!-- Plugins -->
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java 2008-09-23 13:10:34 UTC (rev 2313)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java 2008-09-23 16:21:54 UTC (rev 2314)
@@ -5,16 +5,16 @@
* 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
+ * under the terms of the GNU Lesser General protected 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.
+ * Lesser General protected License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Lesser General protected
* 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.
@@ -27,72 +27,61 @@
import java.net.MalformedURLException;
import java.net.URL;
+import javax.management.MBeanServerConnection;
+
import junit.framework.TestCase;
public abstract class IntegrationTestCase extends TestCase
{
private IntegrationTestHelper delegate = new IntegrationTestHelper();
- /**
- * Deploy the given archive
- */
- public void deploy(String archive) throws Exception
+ protected void deploy(String archive) throws Exception
{
delegate.deploy(archive);
}
- /**
- * Undeploy the given archive
- */
- public void undeploy(String archive) throws Exception
+ protected void undeploy(String archive) throws Exception
{
delegate.undeploy(archive);
}
- public boolean isTargetJBoss500()
+ protected boolean isTargetJBoss500()
{
return delegate.isTargetJBoss500();
}
- public boolean isTargetJBoss423()
+ protected boolean isTargetJBoss423()
{
return delegate.isTargetJBoss423();
}
- public boolean isTargetJBoss422()
+ protected boolean isTargetJBoss422()
{
return delegate.isTargetJBoss422();
}
- /**
- * Discover the URL for the deployment archive
- */
- public URL getArchiveURL(String archive) throws MalformedURLException
+ protected URL getArchiveURL(String archive) throws MalformedURLException
{
return delegate.getArchiveURL(archive);
}
- /**
- * Discover the File for the deployment archive
- */
- public File getArchiveFile(String archive)
+ protected File getArchiveFile(String archive)
{
return delegate.getArchiveFile(archive);
}
- /**
- * Discover the URL for the test resource
- */
- public URL getResourceURL(String resource) throws MalformedURLException
+ protected URL getResourceURL(String resource) throws MalformedURLException
{
return delegate.getResourceURL(resource);
}
- /**
- * Discover the File for the test resource
- */
- public File getResourceFile(String resource)
+ protected File getResourceFile(String resource)
{
return delegate.getResourceFile(resource);
}
+
+ protected MBeanServerConnection getServer()
+ {
+ return IntegrationTestHelper.getServer();
+ }
}
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2313 - projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-23 09:10:34 -0400 (Tue, 23 Sep 2008)
New Revision: 2313
Modified:
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
Log:
Use target/test-classes for default test resources
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java 2008-09-23 12:46:06 UTC (rev 2312)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java 2008-09-23 13:10:34 UTC (rev 2313)
@@ -206,7 +206,7 @@
public static String getTestResourcesDir()
{
if (testResourcesDir == null)
- testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-resource");
+ testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-classes");
return testResourcesDir;
}
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2312 - projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-23 08:46:06 -0400 (Tue, 23 Sep 2008)
New Revision: 2312
Modified:
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java
Log:
Add file access to integration test case
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java 2008-09-23 12:40:07 UTC (rev 2311)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java 2008-09-23 12:46:06 UTC (rev 2312)
@@ -23,20 +23,26 @@
// $Id$
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
import junit.framework.TestCase;
public abstract class IntegrationTestCase extends TestCase
{
private IntegrationTestHelper delegate = new IntegrationTestHelper();
-
- /** Deploy the given archive
+
+ /**
+ * Deploy the given archive
*/
public void deploy(String archive) throws Exception
{
delegate.deploy(archive);
}
- /** Undeploy the given archive
+ /**
+ * Undeploy the given archive
*/
public void undeploy(String archive) throws Exception
{
@@ -57,4 +63,36 @@
{
return delegate.isTargetJBoss422();
}
+
+ /**
+ * Discover the URL for the deployment archive
+ */
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getArchiveURL(archive);
+ }
+
+ /**
+ * Discover the File for the deployment archive
+ */
+ public File getArchiveFile(String archive)
+ {
+ return delegate.getArchiveFile(archive);
+ }
+
+ /**
+ * Discover the URL for the test resource
+ */
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return delegate.getResourceURL(resource);
+ }
+
+ /**
+ * Discover the File for the test resource
+ */
+ public File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
}
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2311 - in projects/jbpm-spec/trunk: modules/api/src/main/java/org/jboss/bpm/test and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-23 08:40:07 -0400 (Tue, 23 Sep 2008)
New Revision: 2311
Added:
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java
Modified:
projects/jbpm-spec/trunk/eclipse/jBPMCodeStyle.xml
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
Log:
Add IntegrationTestCase
Modified: projects/jbpm-spec/trunk/eclipse/jBPMCodeStyle.xml
===================================================================
--- projects/jbpm-spec/trunk/eclipse/jBPMCodeStyle.xml 2008-09-23 10:00:14 UTC (rev 2310)
+++ projects/jbpm-spec/trunk/eclipse/jBPMCodeStyle.xml 2008-09-23 12:40:07 UTC (rev 2311)
@@ -70,7 +70,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="140"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
Added: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java (rev 0)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java 2008-09-23 12:40:07 UTC (rev 2311)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.bpm.test;
+
+// $Id$
+
+import junit.framework.TestCase;
+
+public abstract class IntegrationTestCase extends TestCase
+{
+ private IntegrationTestHelper delegate = new IntegrationTestHelper();
+
+ /** Deploy the given archive
+ */
+ public void deploy(String archive) throws Exception
+ {
+ delegate.deploy(archive);
+ }
+
+ /** Undeploy the given archive
+ */
+ public void undeploy(String archive) throws Exception
+ {
+ delegate.undeploy(archive);
+ }
+
+ public boolean isTargetJBoss500()
+ {
+ return delegate.isTargetJBoss500();
+ }
+
+ public boolean isTargetJBoss423()
+ {
+ return delegate.isTargetJBoss423();
+ }
+
+ public boolean isTargetJBoss422()
+ {
+ return delegate.isTargetJBoss422();
+ }
+}
Property changes on: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java 2008-09-23 10:00:14 UTC (rev 2310)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java 2008-09-23 12:40:07 UTC (rev 2311)
@@ -27,119 +27,187 @@
import java.util.Hashtable;
import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.jboss.bpm.model.ObjectNameFactory;
+
/**
* An integration test helper that deals with test deployment/undeployment, etc.
- *
+ *
* @author Thomas.Diesler(a)jboss.org
* @since 14-Oct-2004
*/
public class IntegrationTestHelper
{
- private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
- private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
+ private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
+ private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
+ private static final String SYSPROP_TARGET_CONTAINER = "jbpm.target.container";
- private static MBeanServerConnection server;
- private static String testArchiveDir;
- private static String testResourcesDir;
+ private static MBeanServerConnection server;
+ private static String testArchiveDir;
+ private static String testResourcesDir;
+ private static String integrationTarget;
- /** Deploy the given archive
- */
- public void deploy(String archive) throws Exception
- {
- URL url = getArchiveFile(archive).toURI().toURL();
- getDeployer().deploy(url);
- }
+ /**
+ * Deploy the given archive
+ */
+ public void deploy(String archive) throws Exception
+ {
+ URL url = getArchiveFile(archive).toURI().toURL();
+ getDeployer().deploy(url);
+ }
- /** Undeploy the given archive
- */
- public void undeploy(String archive) throws Exception
- {
- URL url = getArchiveFile(archive).toURI().toURL();
- getDeployer().undeploy(url);
- }
+ /**
+ * Undeploy the given archive
+ */
+ public void undeploy(String archive) throws Exception
+ {
+ URL url = getArchiveFile(archive).toURI().toURL();
+ getDeployer().undeploy(url);
+ }
- @SuppressWarnings("unchecked")
- public static MBeanServerConnection getServer()
- {
- if (server == null)
+ public boolean isTargetJBoss500()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss500");
+ }
+
+ public boolean isTargetJBoss423()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss423");
+ }
+
+ public boolean isTargetJBoss422()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss422");
+ }
+
+ public String getIntegrationTarget()
+ {
+ if (integrationTarget == null)
+ {
+ integrationTarget = System.getProperty(SYSPROP_TARGET_CONTAINER);
+
+ if (integrationTarget == null)
+ throw new IllegalStateException("Cannot obtain system property: " + SYSPROP_TARGET_CONTAINER);
+
+ // Read the JBoss SpecificationVersion
+ String jbossVersion = null;
+ try
{
- Hashtable jndiEnv = null;
- try
- {
- InitialContext iniCtx = new InitialContext();
- jndiEnv = iniCtx.getEnvironment();
- server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
- }
- catch (NamingException ex)
- {
- throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex);
- }
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
+ if (jbossVersion == null)
+ throw new IllegalStateException("Cannot obtain jboss version");
+
+ if (jbossVersion.startsWith("5.0.0"))
+ jbossVersion = "jboss500";
+ else if (jbossVersion.startsWith("4.2.3"))
+ jbossVersion = "jboss423";
+ else if (jbossVersion.startsWith("4.2.2"))
+ jbossVersion = "jboss422";
+ else
+ throw new IllegalStateException("Unsupported jboss version: " + jbossVersion);
}
- return server;
- }
+ catch (IllegalStateException ex)
+ {
+ throw ex;
+ }
+ catch (Exception ex)
+ {
+ // ignore, we are not running on jboss-4.2 or greater
+ }
- private ArchiveDeployer getDeployer()
- {
- return new JBossArchiveDeployer(getServer());
- }
+ if (integrationTarget.startsWith(jbossVersion) == false)
+ throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ")");
+ }
+ return integrationTarget;
+ }
- /** Try to discover the URL for the deployment archive */
- public URL getArchiveURL(String archive) throws MalformedURLException
- {
- return getArchiveFile(archive).toURI().toURL();
- }
+ @SuppressWarnings("unchecked")
+ public static MBeanServerConnection getServer()
+ {
+ if (server == null)
+ {
+ Hashtable jndiEnv = null;
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ jndiEnv = iniCtx.getEnvironment();
+ server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
+ }
+ catch (NamingException ex)
+ {
+ throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex);
+ }
+ }
+ return server;
+ }
- /** Try to discover the File for the deployment archive */
- public File getArchiveFile(String archive)
- {
- File file = new File(archive);
- if (file.exists())
- return file;
+ private ArchiveDeployer getDeployer()
+ {
+ return new JBossArchiveDeployer(getServer());
+ }
- file = new File(getTestArchiveDir() + "/" + archive);
- if (file.exists())
- return file;
+ /** Try to discover the URL for the deployment archive */
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return getArchiveFile(archive).toURI().toURL();
+ }
- String notSet = (getTestArchiveDir() == null ? " System property '" + SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set." : "");
- throw new IllegalArgumentException("Cannot obtain '" + getTestArchiveDir() + "/" + archive + "'." + notSet);
- }
+ /** Try to discover the File for the deployment archive */
+ public File getArchiveFile(String archive)
+ {
+ File file = new File(archive);
+ if (file.exists())
+ return file;
- /** Try to discover the URL for the test resource */
- public URL getResourceURL(String resource) throws MalformedURLException
- {
- return getResourceFile(resource).toURI().toURL();
- }
+ file = new File(getTestArchiveDir() + "/" + archive);
+ if (file.exists())
+ return file;
- /** Try to discover the File for the test resource */
- public File getResourceFile(String resource)
- {
- File file = new File(resource);
- if (file.exists())
- return file;
+ String notSet = (getTestArchiveDir() == null ? " System property '" + SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set."
+ : "");
+ throw new IllegalArgumentException("Cannot obtain '" + getTestArchiveDir() + "/" + archive + "'." + notSet);
+ }
- file = new File(getTestResourcesDir() + "/" + resource);
- if (file.exists())
- return file;
+ /** Try to discover the URL for the test resource */
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return getResourceFile(resource).toURI().toURL();
+ }
- throw new IllegalArgumentException("Cannot obtain '" + getTestResourcesDir() + "/" + resource + "'");
- }
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ if (file.exists())
+ return file;
- public static String getTestArchiveDir()
- {
- if (testArchiveDir == null)
- testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs");
+ file = new File(getTestResourcesDir() + "/" + resource);
+ if (file.exists())
+ return file;
- return testArchiveDir;
- }
+ throw new IllegalArgumentException("Cannot obtain '" + getTestResourcesDir() + "/" + resource + "'");
+ }
- public static String getTestResourcesDir()
- {
- if (testResourcesDir == null)
- testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-resource");
+ public static String getTestArchiveDir()
+ {
+ if (testArchiveDir == null)
+ testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs");
- return testResourcesDir;
- }
+ return testArchiveDir;
+ }
+
+ public static String getTestResourcesDir()
+ {
+ if (testResourcesDir == null)
+ testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-resource");
+
+ return testResourcesDir;
+ }
}
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2310 - in jbpm3/trunk: modules/enterprise/ear and 2 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-09-23 06:00:14 -0400 (Tue, 23 Sep 2008)
New Revision: 2310
Modified:
jbpm3/trunk/modules/enterprise/ear/pom.xml
jbpm3/trunk/modules/gwt-console/pom.xml
jbpm3/trunk/modules/gwt-console/war/pom.xml
jbpm3/trunk/pom.xml
Log:
Include gwt-console in distribution
Modified: jbpm3/trunk/modules/enterprise/ear/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-23 07:52:47 UTC (rev 2309)
+++ jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-23 10:00:14 UTC (rev 2310)
@@ -36,6 +36,12 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console-war</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-core</artifactId>
<version>${version}</version>
<exclusions>
@@ -123,6 +129,13 @@
<contextRoot>/jbpm-console</contextRoot>
<unpack>true</unpack>
</webModule>
+ <webModule>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console-war</artifactId>
+ <bundleFileName>gwt-console.war</bundleFileName>
+ <contextRoot>/gwt-console</contextRoot>
+ <unpack>true</unpack>
+ </webModule>
</modules>
</configuration>
</plugin>
Modified: jbpm3/trunk/modules/gwt-console/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/pom.xml 2008-09-23 07:52:47 UTC (rev 2309)
+++ jbpm3/trunk/modules/gwt-console/pom.xml 2008-09-23 10:00:14 UTC (rev 2310)
@@ -1,7 +1,7 @@
<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>
- <name>JBoss jBPM - GWT Console</name>
+ <name>JBoss jBPM3 - GWT Console</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console</artifactId>
<packaging>pom</packaging>
Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-23 07:52:47 UTC (rev 2309)
+++ jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-23 10:00:14 UTC (rev 2310)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
- <name>JBoss jBPM - GWT Console (WAR)</name>
+ <name>JBoss jBPM3 - GWT Console (WAR)</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console-war</artifactId>
<packaging>war</packaging>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-09-23 07:52:47 UTC (rev 2309)
+++ jbpm3/trunk/pom.xml 2008-09-23 10:00:14 UTC (rev 2310)
@@ -36,6 +36,7 @@
<module>modules/console</module>
<module>modules/enterprise</module>
<module>modules/jbpm4jsf</module>
+ <module>modules/gwt-console</module>
</modules>
<!-- Properties -->
@@ -51,7 +52,7 @@
<dom4j.version>1.6.1</dom4j.version>
<drools.version>3.0.4</drools.version>
<dumbster.version>1.6</dumbster.version>
- <gwt.version>1.4.62</gwt.version>
+ <gwt.version>1.5.2</gwt.version>
<hibernate.version>3.2.6.ga</hibernate.version>
<hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version>
<hibernate.validator.version>3.0.0.ga</hibernate.validator.version>
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2309 - in jbpm3/trunk/modules/gwt-console/war/src/main/webapp: WEB-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-09-23 03:52:47 -0400 (Tue, 23 Sep 2008)
New Revision: 2309
Added:
jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/jboss-web.xml
Modified:
jbpm3/trunk/modules/gwt-console/war/src/main/webapp/index.html
Log:
default context root: 'gwt-console'
Added: jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/jboss-web.xml (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/jboss-web.xml 2008-09-23 07:52:47 UTC (rev 2309)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+
+ <!--security-domain>java:/jaas/jbpm-console</security-domain-->
+
+ <context-root>gwt-console</context-root>
+
+ <!--resource-ref>
+ <res-ref-name>jdbc/JbpmDataSource</res-ref-name>
+ <jndi-name>java:/JbpmDS</jndi-name>
+ </resource-ref>
+ -->
+
+</jboss-web>
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/webapp/index.html
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/webapp/index.html 2008-09-23 07:50:56 UTC (rev 2308)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/webapp/index.html 2008-09-23 07:52:47 UTC (rev 2309)
@@ -3,6 +3,6 @@
<head>
<!-- forward to the GWT Example Application -->
<meta http-equiv="REFRESH"
- content="0;url=org.jboss.bpm.console.client.Application/Application.html">
+ content="0;url=org.jboss.bpm.console.Application/Application.html">
</HEAD>
</HTML>
\ No newline at end of file
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2308 - jbpm3/trunk/modules/gwt-console/war.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-09-23 03:50:56 -0400 (Tue, 23 Sep 2008)
New Revision: 2308
Modified:
jbpm3/trunk/modules/gwt-console/war/pom.xml
Log:
Avoid double gwt:compile execution
Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-22 14:04:07 UTC (rev 2307)
+++ jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-23 07:50:56 UTC (rev 2308)
@@ -76,14 +76,7 @@
</configuration>
<executions>
<execution>
- <id>compile</id>
- <phase>process-classes</phase>
<goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <goals>
<goal>mergewebxml</goal>
<goal>compile</goal>
<goal>gwt</goal>
@@ -97,7 +90,7 @@
(this is a replacement for the old "automatic" mode - useful if you
don't have GWT installed already, or you just want a maven way to
handle gwt deps)
- -->
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -127,7 +120,7 @@
<!--
If you want to use the target/web.xml file mergewebxml produces,
tell the war plugin to use it
- -->
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2307 - in jbpm3/trunk/modules/gwt-console: war and 2 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-09-22 10:04:07 -0400 (Mon, 22 Sep 2008)
New Revision: 2307
Added:
jbpm3/trunk/modules/gwt-console/war/README.txt
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/49.png
Modified:
jbpm3/trunk/modules/gwt-console/README.txt
jbpm3/trunk/modules/gwt-console/war/pom.xml
jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/web.xml
Log:
Update docs on building and running the GWT app
Modified: jbpm3/trunk/modules/gwt-console/README.txt
===================================================================
--- jbpm3/trunk/modules/gwt-console/README.txt 2008-09-22 11:25:09 UTC (rev 2306)
+++ jbpm3/trunk/modules/gwt-console/README.txt 2008-09-22 14:04:07 UTC (rev 2307)
@@ -1,117 +1 @@
-WELCOME to the maven-googlewebtoolkit2-sample Project
-=====================================================
-
-Also see GWT-Maven documentation:
-http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/index.html
-
-About:
-======
-This sample project has some specific goals:
- + GWT-Maven 'Best Practice' & Usage
- + Java5+ integration on the GWT server side & Java1.4 on the GWT client side using a multi-module maven project.
- + GWT RPC structure via multi-module maven project - and inheriting a GWT module
- + The features offered by GWT-Maven (like building a WAR, running the GWTShell, mergewebxml, and GWT testing)
-
-Overview:
-=========
-This sample package contains 4 different examples to show how GWT-Maven
-should be used with your project. If you intend to use multiple modules, you will want to build
-more than one of the examples. If you wish to set up a simpler single module (with just one pom.xml),
-then choose the example that is closest to the function of your project (likely the war project).
-
-This sample uses GWT-Maven with the "automatic" GWT setup mode enabled. This means
-that you do *not* have to download and install GWT yourself, the plugin will
-setup and extract GWT for you (when using this method).
-(You can optionally use manual method with a local GWT install, see documentation.)
-
-Which project to build:
-=======================
- + parent (this is the root parent module of the project)
- + rpc (this is the GWT RPC *INTERFACE* definition) Java 1.4
- + server (this is the GWT RPC *IMPLEMENTATION*, it builds a GWT module that war inherits) Java 1.5+
- + war (this is the GWT client code) Java 1.4
-
-Prerequisites:
-==============
- + Maven2 - http://maven.apache.org
- + Maven bin directory added to Path
-
-
-Running the parent example:
-===========================
-The parent example demonstrates a multi-module Maven build with a GWT project.
-When run it will build the rpc, server, and war sub projects.
-
-1. Use a command prompt to navigate into the maven-googlewebtoolkit2-sample directory.
-2. Execute "mvn clean install".
-3. Sub projects will have artifacts (see details for each below)
-
-
-Running the WAR example:
-========================
-The WAR project builds a Web-Application-Archive file for a GWT project.
-This war can then be deployed to a servlet container, and or you can run this
-project in the GWTShell using GWT-Maven.
-
-This project demonstrates not only the usefulness of GWT-Maven in terms of
-building WAR files, and running the shell, but also the "merge web xml" aspect.
-Notice that this project has a local web.xml source file, that is used to create
-a deployment time file that includes a standard servlet entry, as well as a GWT-RPC entry.
-(GWT-Maven allows you to use the embedded Tomcat server with source web.xml and other
-files [context.xml, if you use Tomcat outside of the shell], and it configures the
-embedded Tomcat for you.)
-
-This project also includes a testing sample using the GWT-Maven testGwt goal, and
-includes EMMA based code coverage and reports for GWTTestCase based tests.
-Code coverage with GWT is a bit tricky, but using the coverage patch JAR (as this project does)
-and generating ONLY a report (not instrumentation data itself, which GWT does for you when patched)
-along with AntRun to move things around, creates an automated build with testing and reports.
-(If you want to see the testing stuff, uncomment the "testGwt" goal in the POM, it is commented
-out by default to keep things faster and simpler.)
-(Note* - when running tests the Surefire plugin is NOT used for GwtTestCase based tests, rather
-a special testGwt goal is included with GWT-Maven for GwtTestCase based tests, thus TWO test phases
-will happen during "mvn test", one for Surefire standard tests, and one for testGwt GWT tests.)
-
-1. Build the server sub-project, using the instructions in "Running the parent example" above.
-2. Use a command prompt to navigate into the maven-googlewebtoolkit2-sample/war directory.
-3. Execute "mvn package".
-4. Your sample war will be created in the war/target directory.
-
- OR you can run the GWTShell locally by executing "mvn gwt:gwt".
-
- Optionally: Execute "mvn test site" (with testGwt goal enabled) to run test and get coverage.
-(See "target/site" directory for output.)
-
-
-Running the RPC example
-========================
-The RPC example is meant to show defining GWT-RPC interfaces.
-This project creates a JAR archive that includes source, so that it can be used by other
-GWT projects (the WAR example here uses it). This project does not need GWT-Maven
-(no shell to run, no GWT compiler, etc) - but does require GWT dependencies.
-
-1. Use a command prompt to navigate into the maven-googlewebtoolkit2-sample/rpc directory.
-2. Execute "mvn install".
-3. Your JAR library, with source included, will be in the rpc/target directory.
-
-
-Running the SERVER sample
-=========================
-The Server example demonstrates implementing GWT-RPC interfaces (the one from the RPC example),
-creating a GWT library module (that other projects can inherit), and including a standard
-HttpServlet example in the same project. This project creates
-a JAR archive that is built for the server side of a GWT project. This JAR can then
-be inherited using GWT inheritance to expose a GWT-RPC endpoint.
-(This demonstrates that it can make sense to break up your GWT projects into client and server portions,
-sometimes that helps with re-use [more than one client can import and use the RPC] and with team divisions.)
-
-1. Use a command prompt to navigate into the maven-googlewebtoolkit2-sample/server directory.
-2. Execute "mvn install".
-3. Your JAR library, with source included, will be in the server/target directory.
-
-
-More help:
-==========
-Docs: http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/i...
-Also refer to the the gwt-maven message board: http://groups.google.com/group/gwt-maven
-
+Please see ./war/README.txt for instructions on building and testing the GWT console
Added: jbpm3/trunk/modules/gwt-console/war/README.txt
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/README.txt (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/README.txt 2008-09-22 14:04:07 UTC (rev 2307)
@@ -0,0 +1,26 @@
+Running in hosted mode:
+----------------------
+
+mvn compile gwt:gwt
+
+When the hosted browser is started, simple hit the 'refresh' button to recompile
+and verfiy changes.
+
+NOTE: Really quick turnaround through "mvn -o clean compile gwt:gwt"
+
+
+Running in web mode:
+-------------------
+
+mvn package
+mvn deploy (TODO)
+
+Produces a war file in target/gwt-console-war-<version>.war,
+which can be deployed to a running jboss instance.
+
+Please post any questions to the jbpm developer forum.
+
+Have fun.
+
+
+
Property changes on: jbpm3/trunk/modules/gwt-console/war/README.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-22 11:25:09 UTC (rev 2306)
+++ jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-22 14:04:07 UTC (rev 2307)
@@ -62,20 +62,28 @@
<version>2.0-beta23</version>
<configuration>
<logLevel>INFO</logLevel>
- <compileTargets>
- <value>org.jboss.bpm.console.Application</value>
- </compileTargets>
+ <compileTargets><value>org.jboss.bpm.console.Application</value></compileTargets>
<runTarget>org.jboss.bpm.console.Application/Application.html</runTarget>
<style>DETAILED</style>
<noServer>false</noServer>
- <extraJvmArgs>-Xmx512m</extraJvmArgs>
- <!-- this parameter is VERY important with automatic mode - has to match the version in your declared deps -->
- <!-- if this is set incorrect, or left out and default does not match (default is 1.5.2 for 2.0-beta23) you will have mysterious errors -->
+ <extraJvmArgs>-Xmx256M -Xms256M</extraJvmArgs>
+ <!-- this parameter is VERY important with automatic mode -
+ has to match the version in your declared deps
+ if this is set incorrect, or left out and default does not match
+ (default is 1.5.2 for 2.0-beta23) you will have mysterious errors
+ -->
<gwtVersion>${gwt.version}</gwtVersion>
</configuration>
<executions>
<execution>
+ <id>compile</id>
+ <phase>process-classes</phase>
<goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <goals>
<goal>mergewebxml</goal>
<goal>compile</goal>
<goal>gwt</goal>
@@ -89,7 +97,7 @@
(this is a replacement for the old "automatic" mode - useful if you
don't have GWT installed already, or you just want a maven way to
handle gwt deps)
- -->
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -105,17 +113,21 @@
<artifactItem>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
- <version>${gwt.version}</version>
+ <version>${gwtVersion}</version>
<classifier>${platform}-libs</classifier>
<type>zip</type>
<overWrite>false</overWrite>
- <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwt.version}</outputDirectory>
+ <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwtVersion}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <!--
+ If you want to use the target/web.xml file mergewebxml produces,
+ tell the war plugin to use it
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
@@ -123,6 +135,14 @@
<webXml>target/web.xml</webXml>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/49.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/49.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/web.xml 2008-09-22 11:25:09 UTC (rev 2306)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/web.xml 2008-09-22 14:04:07 UTC (rev 2307)
@@ -1,9 +1,19 @@
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
-
+
<web-app>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
+ <display-name>Archetype Created Web Application</display-name>
+ <servlet>
+ <servlet-name>HttpServlet</servlet-name>
+ <servlet-class>com.totsp.mavenplugin.gwt.sample.server.HttpServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>HttpServlet</servlet-name>
+ <url-pattern>/HttpServlet</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
</web-app>
\ No newline at end of file
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2306 - in jbpm3/trunk/modules/gwt-console: war and 2 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-09-22 07:25:09 -0400 (Mon, 22 Sep 2008)
New Revision: 2306
Modified:
jbpm3/trunk/modules/gwt-console/pom.xml
jbpm3/trunk/modules/gwt-console/war/pom.xml
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Update to gwt 1.5.2 and gwt-ext 2.0.5
Modified: jbpm3/trunk/modules/gwt-console/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/pom.xml 2008-09-21 08:51:33 UTC (rev 2305)
+++ jbpm3/trunk/modules/gwt-console/pom.xml 2008-09-22 11:25:09 UTC (rev 2306)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss jBPM - GWT Console</name>
- <groupId>org.jbpm</groupId>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console</artifactId>
<packaging>pom</packaging>
@@ -14,6 +14,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+ <gchart.version>2.2</gchart.version>
+ <gwtext.version>2.0.5</gwtext.version>
+ </properties>
+
<modules>
<module>war</module>
</modules>
@@ -23,8 +28,13 @@
<dependency>
<groupId>com.gwtext</groupId>
<artifactId>gwtext</artifactId>
- <version>2.0.4</version>
+ <version>${gwtext.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gchart</artifactId>
+ <version>${gchart.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-21 08:51:33 UTC (rev 2305)
+++ jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-22 11:25:09 UTC (rev 2306)
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
- <name>JBossBPM - GWT Console (WAR)</name>
- <groupId>org.jboss.bpm</groupId>
+ <name>JBoss jBPM - GWT Console (WAR)</name>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console-war</artifactId>
<packaging>war</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console</artifactId>
<version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -19,20 +19,37 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
+ <version>${gwt.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
+ <version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${gwt.version}</version>
+ <classifier>${platform}-libs</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${gwt.version}</version>
+ <classifier>${platform}</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.gwtext</groupId>
- <artifactId>gwtext</artifactId>
+ <artifactId>gwtext</artifactId>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
- <artifactId>gchart</artifactId>
+ <artifactId>gchart</artifactId>
</dependency>
</dependencies>
@@ -42,45 +59,60 @@
<plugin>
<groupId>com.totsp.gwt</groupId>
<artifactId>maven-googlewebtoolkit2-plugin</artifactId>
- <version>2.0-beta18</version>
+ <version>2.0-beta23</version>
<configuration>
<logLevel>INFO</logLevel>
<compileTargets>
<value>org.jboss.bpm.console.Application</value>
</compileTargets>
<runTarget>org.jboss.bpm.console.Application/Application.html</runTarget>
- <generatorRootClasses>
- <value>org.jboss.bpm.console.Application</value>
- </generatorRootClasses>
- <overwriteGeneratedClasses>true</overwriteGeneratedClasses>
<style>DETAILED</style>
- <generateGettersAndSetters>true</generateGettersAndSetters>
<noServer>false</noServer>
- <extraJvmArgs>-Dgwt.coverage.enable=true -Xmx256M -Xms256M</extraJvmArgs>
+ <extraJvmArgs>-Xmx512m</extraJvmArgs>
+ <!-- this parameter is VERY important with automatic mode - has to match the version in your declared deps -->
+ <!-- if this is set incorrect, or left out and default does not match (default is 1.5.2 for 2.0-beta23) you will have mysterious errors -->
+ <gwtVersion>${gwt.version}</gwtVersion>
</configuration>
<executions>
<execution>
- <id>compile</id>
- <phase>process-classes</phase>
<goals>
+ <goal>mergewebxml</goal>
<goal>compile</goal>
+ <goal>gwt</goal>
+ <!--goal>test</goal-->
</goals>
</execution>
+ </executions>
+ </plugin>
+ <!-- Use the dependency plugin to unpack gwt-dev-PLATFORM-libs.zip -->
+ <!--
+ (this is a replacement for the old "automatic" mode - useful if you
+ don't have GWT installed already, or you just want a maven way to
+ handle gwt deps)
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
<execution>
+ <id>unpack</id>
+ <phase>compile</phase>
<goals>
- <!--
- autoconfig gwt (download and unzip GWT itself)
- *note* you can also use manual config, if you already have GWT installed
- see site docs for details -
- http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/s...
- -->
- <goal>setup</goal>
- <goal>extractGwt</goal>
- <!-- actual work goals -->
- <goal>mergewebxml</goal>
- <goal>compile</goal>
- <goal>gwt</goal>
+ <goal>unpack</goal>
</goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${gwt.version}</version>
+ <classifier>${platform}-libs</classifier>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwt.version}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -94,4 +126,44 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+
+ <!-- profiles (with activation per platform) -->
+ <profiles>
+ <profile>
+ <id>gwt-dev-windows</id>
+ <properties>
+ <platform>windows</platform>
+ </properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ </profile>
+ <profile>
+ <id>gwt-dev-mac</id>
+ <properties>
+ <platform>mac</platform>
+ </properties>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ </profile>
+ <profile>
+ <id>gwt-dev-linux</id>
+ <properties>
+ <platform>linux</platform>
+ </properties>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <os>
+ <name>linux</name>
+ </os>
+ </activation>
+ </profile>
+ </profiles>
+</project>
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-09-21 08:51:33 UTC (rev 2305)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-09-22 11:25:09 UTC (rev 2306)
@@ -42,7 +42,10 @@
image.setStyleName("bpm-ProcessImage");
this.setHeader(false);
- this.setBorder(false);
+ this.setBorder(true);
+ this.setFrame(false);
+
+ this.setAutoScroll(true);
this.add(image);
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-09-21 08:51:33 UTC (rev 2305)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-09-22 11:25:09 UTC (rev 2306)
@@ -37,21 +37,21 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*
- * @see ProcessInstanceList#onExamine(Integer)
+ * @see ProcessInstanceList#onExamine(Integer)
*/
public class ProcessInstanceEditor extends EditorView
{
public final static String ID = "org.jboss.bpm.process.ProcessInstance";
private ProcessDefinition processDefinition;
-
+
private ProcessInstance processInstance;
private ConsoleView view;
private Panel teaserPanel;
-
- public ProcessInstanceEditor(ProcessDefinition proc, ProcessInstance instance, ConsoleView view)
+
+ public ProcessInstanceEditor(final ProcessDefinition proc, final ProcessInstance instance, final ConsoleView view)
{
super();
this.setId(ProcessInstanceEditor.ID+"."+instance.getId());
@@ -61,20 +61,50 @@
this.view = view;
// ----------------------------------
-
- this.setPaddings(15);
+
+ this.setPaddings(10);
this.setWidth(UIConstants.EDITOR_PANE_WIDTH);
this.setLayout( new ColumnLayout() );
-
+
this.setBorder(false);
this.setHeader(false);
// ----------------------------------
- PaddedPanel rightPanel = new PaddedPanel(new ProcessImageView(instance), 5, 5, 0, 5);
+ ProcessImageView imageView = new ProcessImageView(instance);
+ imageView.setWidth(UIConstants.MAIN_EDITOR_PANEL_WIDTH);
+ Toolbar imageToolbar = new Toolbar();
+ imageToolbar.addFill();
+ ToolbarButton toolbarButton = new ToolbarButton("Enlarge",
+ new ButtonListenerAdapter()
+ {
+ public void onClick(Button button, EventObject e)
+ {
+
+ final Window window = new Window();
+ window.setTitle("Process Graph");
+ window.setClosable(true);
+ window.setWidth(600);
+ window.setHeight(400);
+ window.setPlain(true);
+ /*window.setLayout(new BorderLayout());
+ window.add(tabPanel, centerData);
+ window.add(navPanel, westData);*/
+ window.setCloseAction(Window.HIDE);
+ window.add(new ProcessImageView(instance) );
+ window.show("");
+ }
+ }
+ );
+ toolbarButton.setIconCls("bpm-enlarge-icon");
+ imageToolbar.addButton( toolbarButton );
+ imageView.setBottomToolbar(imageToolbar);
+
+ PaddedPanel rightPanel = new PaddedPanel(imageView, 5, 5, 0, 5);
+
// ----------------------------------
-
+
teaserPanel = new TeaserPanel();
// ----------------------------------
@@ -86,14 +116,16 @@
Toolbar bottomToolbar = new Toolbar();
bottomToolbar.addFill();
- bottomToolbar.addButton(
- new ToolbarButton("View tasks", new ButtonListenerAdapter()
+ ToolbarButton taskBtn = new ToolbarButton("View tasks",
+ new ButtonListenerAdapter()
{
public void onClick(Button button, EventObject e)
{
}
- })
+ }
);
+ taskBtn.setIconCls("bpm-switch-context-icon");
+ bottomToolbar.addButton(taskBtn);
taskPanel.setBottomToolbar(bottomToolbar);
teaserPanel.add(taskPanel);
@@ -118,9 +150,9 @@
commentPanel.setBottomToolbar(bottomToolbar2);
teaserPanel.add(commentPanel);
-
+
// ----------------------------------
-
+
this.add(rightPanel, new ColumnLayoutData(0.7) );
this.add(teaserPanel, new ColumnLayoutData(0.3) );
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-09-21 08:51:33 UTC (rev 2305)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-09-22 11:25:09 UTC (rev 2306)
@@ -92,3 +92,6 @@
background-image: url( images/icons/27.png)
}
+.bpm-enalrge-icon {
+ background-image: url( images/icons/49.png)
+}
17 years, 7 months
- 1
- 0