December 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3414 - in projects/jsf-console/trunk: console and 6 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-17 17:46:50 -0500 (Wed, 17 Dec 2008) New Revision: 3414 Added: projects/jsf-console/trunk/jbpm4jsf/jbpm3-jbpm4jsf.iml projects/jsf-console/trunk/jsf-console.iml projects/jsf-console/trunk/soa/ projects/jsf-console/trunk/soa/pom.xml projects/jsf-console/trunk/soa/src/ projects/jsf-console/trunk/soa/src/main/ projects/jsf-console/trunk/soa/src/main/webapp/ projects/jsf-console/trunk/soa/src/main/webapp/JBossLogo.jpg projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/ projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/web.xml projects/jsf-console/trunk/soa/src/main/webapp/login.jsp Modified: projects/jsf-console/trunk/console/pom.xml projects/jsf-console/trunk/pom.xml Log: JBPM-1920: Include SOA-P overlays in jbpm build Modified: projects/jsf-console/trunk/console/pom.xml =================================================================== --- projects/jsf-console/trunk/console/pom.xml 2008-12-17 21:21:22 UTC (rev 3413) +++ projects/jsf-console/trunk/console/pom.xml 2008-12-17 22:46:50 UTC (rev 3414) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <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 - Console</name> @@ -40,6 +40,12 @@ </exclusions> </dependency> <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>soa-webapp</artifactId> + <version>${version}</version> + <type>war</type> + </dependency> + <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> </dependency> @@ -76,5 +82,39 @@ </configuration> </plugin> </plugins> + <finalName>jsf-console</finalName> </build> + + <profiles> + <profile> + <id>soa</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <overlays> + <overlay> + <id>soa-webapp-overlay</id> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>soa-webapp</artifactId> + <includes> + <include>JBossLogo.jpg</include> + <include>login.jsp</include> + <include>WEB-INF/web.xml</include> + <include>WEB-INF/jboss-web.xml</include> + </includes> + </overlay> + <overlay> +  + </overlay> + </overlays> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + </profiles> </project> Added: projects/jsf-console/trunk/jbpm4jsf/jbpm3-jbpm4jsf.iml =================================================================== --- projects/jsf-console/trunk/jbpm4jsf/jbpm3-jbpm4jsf.iml (rev 0) +++ projects/jsf-console/trunk/jbpm4jsf/jbpm3-jbpm4jsf.iml 2008-12-17 22:46:50 UTC (rev 3414) @@ -0,0 +1,369 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm3-core" exported="" /> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: concurrent:concurrent:jar:1.3.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-core:jar:1.4.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.sun.facelets:jsf-facelets:jar:1.1.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: junit:junit:jar:3.8.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.derby:derby:jar:10.2.1.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.faces:jsf-api:jar:1.2_03:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/faces/jsf-api/1.2_03/jsf-api-1.2_03.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: bsh:bsh:jar:1.3.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/bsh/bsh/1.3.0/bsh-1.3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.gravel:gravel:jar:1.0.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/gravel/gravel/1.0.0.GA/gravel-1.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: pdfbox:pdfbox:jar:0.6.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.poi:poi:jar:3.0.2-FINAL:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/poi/poi/3.0.2-FINAL/poi-3.0.2-FINAL.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.5/slf4j-api-1.5.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: xml-apis:xml-apis:jar:1.3.03:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.el:el-api:jar:1.2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/el/el-api/1.2/el-api-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jbpm.jbpm3:jbpm-identity:jar:3.3.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-identity/3.3.0-SNAPSHOT/jbpm-identity-3.3.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-identity/3.3.0-SNAPSHOT/jbpm-identity-3.3.0-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: xerces:xercesImpl:jar:2.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-text-extractors:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-api:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-jcr-commons:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.lucene:lucene-core:jar:2.2.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.faces:jsf-impl:jar:1.2_03:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/faces/jsf-impl/1.2_03/jsf-impl-1.2_03.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.textmining:tm-extractors:jar:0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-spi-commons:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-spi:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Added: projects/jsf-console/trunk/jsf-console.iml =================================================================== --- projects/jsf-console/trunk/jsf-console.iml (rev 0) +++ projects/jsf-console/trunk/jsf-console.iml 2008-12-17 22:46:50 UTC (rev 3414) @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/console/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/console/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/jbpm4jsf/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/jbpm4jsf/src/main/resources" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: junit:junit:jar:3.8.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: concurrent:concurrent:jar:1.3.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-core:jar:1.4.5:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.sun.facelets:jsf-facelets:jar:1.1.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.faces:jsf-api:jar:1.2_03:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/faces/jsf-api/1.2_03/jsf-api-1.2_03.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.derby:derby:jar:10.2.1.6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: bsh:bsh:jar:1.3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/bsh/bsh/1.3.0/bsh-1.3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: poi:poi:jar:2.5.1-final-20040804:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.gravel:gravel:jar:1.0.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/gravel/gravel/1.0.0.GA/gravel-1.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: pdfbox:pdfbox:jar:0.6.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.el:el-api:jar:1.2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/el/el-api/1.2/el-api-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xercesImpl:jar:2.8.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-text-extractors:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-api:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-jcr-commons:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm3:jbpm-core:jar:3.3.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-core/3.3.0.CR1/jbpm-core-3.3.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-io:commons-io:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-io/commons-io/1.4/commons-io-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.faces:jsf-impl:jar:1.2_03:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/faces/jsf-impl/1.2_03/jsf-impl-1.2_03.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.lucene:lucene-core:jar:2.2.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.textmining:tm-extractors:jar:0.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-spi-commons:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm3:jbpm-identity:jar:3.3.0.CR1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-identity/3.3.0.CR1/jbpm-identity-3.3.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-spi:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: projects/jsf-console/trunk/pom.xml =================================================================== --- projects/jsf-console/trunk/pom.xml 2008-12-17 21:21:22 UTC (rev 3413) +++ projects/jsf-console/trunk/pom.xml 2008-12-17 22:46:50 UTC (rev 3414) @@ -27,6 +27,7 @@  <modules> + <module>soa</module> <module>console</module> <module>jbpm4jsf</module> </modules> Added: projects/jsf-console/trunk/soa/pom.xml =================================================================== --- projects/jsf-console/trunk/soa/pom.xml (rev 0) +++ projects/jsf-console/trunk/soa/pom.xml 2008-12-17 22:46:50 UTC (rev 3414) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<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 - SOA Overlay</name> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>soa-webapp</artifactId> + <packaging>war</packaging> + +  + <parent> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jsf-console-parent</artifactId> + <version>3.3.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + +  + <dependencies> + + </dependencies> + +</project> Added: projects/jsf-console/trunk/soa/src/main/webapp/JBossLogo.jpg =================================================================== (Binary files differ) Property changes on: projects/jsf-console/trunk/soa/src/main/webapp/JBossLogo.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-17 22:46:50 UTC (rev 3414) @@ -0,0 +1,34 @@ +<?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/soa</security-domain> + <context-root>jbpm-console</context-root> + + <resource-ref> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <jndi-name>java:/JbpmDS</jndi-name> + </resource-ref> + + <resource-ref> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <jndi-name>java:JmsXA</jndi-name> + </resource-ref> + + <ejb-ref> + <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> + <jndi-name>java:ejb/TimerEntityBean</jndi-name> + </ejb-ref> + +  + <message-destination-ref> + <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> + <jndi-name>queue/JbpmJobQueue</jndi-name> + </message-destination-ref> + +</jboss-web> Added: projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/web.xml (rev 0) +++ projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/web.xml 2008-12-17 22:46:50 UTC (rev 3414) @@ -0,0 +1,176 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + +  + <listener> + <listener-class>org.jbpm.web.BootstrapListener</listener-class> + </listener> + + <servlet> + <description>Enable the JSF servlet. See faces-config.xml for Faces-specific configuration</description> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/app/pi/*</url-pattern> + </servlet-mapping> + + <context-param> + <description> Use Documents Saved as *.xhtml </description> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <description> Facelets debug output </description> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>false</param-value> + </context-param> + +  + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + + <servlet> + <description> This is the GDP's deployer servlet </description> + <servlet-name>GDP Deployer Servlet</servlet-name> + <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>GDP Deployer Servlet</servlet-name> + <url-pattern>/app/upload/*</url-pattern> + </servlet-mapping> + +  + <security-role> + <role-name>admin</role-name> + </security-role> + <security-role> + <role-name>user</role-name> + </security-role> + +  + <security-constraint> + <web-resource-collection> + <web-resource-name>Secure Area</web-resource-name> + <url-pattern>/app/*</url-pattern> + <http-method>GET</http-method> + <http-method>POST</http-method> + </web-resource-collection> + <auth-constraint> + <role-name>user</role-name> + </auth-constraint> + </security-constraint> + +  + <login-config> + <auth-method>FORM</auth-method> + <form-login-config> + <form-login-page>/login.jsp</form-login-page> + <form-error-page>/login.jsp?error=1</form-error-page> + </form-login-config> + </login-config> + +  + +  + +  + + <listener> + <description> + Closes the jBPM configuration on servlet context destruction, releasing + application resources. This listener should appear after the job executor + launcher to avoid reopening the configuration. + </description> + <listener-class>org.jbpm.web.JbpmConfigurationCloser</listener-class> + </listener> + + <resource-ref> + <description> + Logical name of the data source that provides connections to the persistence service. + Must match the hibernate.connection.datasource property in the Hibernate + configuration file. + </description> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + </resource-ref> + + <resource-ref> + <description> + Logical name of the factory that provides JMS connections to the message service. + Required for processes that contain asynchronous continuations. + </description> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <res-type>javax.jms.ConnectionFactory</res-type> + <res-auth>Container</res-auth> + </resource-ref> + + <ejb-ref> + <description> + Link to the local entity bean that implements the scheduler service. Required for + processes that contain timers. + </description> + <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> + <ejb-ref-type>Entity</ejb-ref-type> + <home>org.jbpm.ejb.TimerEntityHome</home> + <remote>org.jbpm.ejb.TimerEntity</remote> + </ejb-ref> + + <message-destination-ref> + <description> + The message service sends job messages to the queue referenced here. To ensure + this is the same queue from which the JobListenerBean receives messages, the + message-destination-link element points to a common logical destination, JobQueue. + </description> + <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-usage>Produces</message-destination-usage> + <message-destination-link>JobQueue</message-destination-link> + </message-destination-ref> + +</web-app> Added: projects/jsf-console/trunk/soa/src/main/webapp/login.jsp =================================================================== --- projects/jsf-console/trunk/soa/src/main/webapp/login.jsp (rev 0) +++ projects/jsf-console/trunk/soa/src/main/webapp/login.jsp 2008-12-17 22:46:50 UTC (rev 3414) @@ -0,0 +1,100 @@ +<% + if (request.getRemoteUser() != null) { + response.sendRedirect("app/"); + return; + } + // System.out.println("PATH: " + request.getRequestURI()); + +%> +<html> +<head> + <title>JBoss SOA Login</title> + + <style type="text/css"> + body { + font-family: sans-serif; + margin-left: 0; + margin-right: 0; + + padding-left: 0; + padding-right: 0; + + } + + img { + border: 0; + } + + #content { + padding: 15px; + } + + h3 { + color: #8c8c8c; + } + + a:link, a:visited, a { + font-weight: bold; + color: #333333; + } + + a:hover { + color: slategray; + } + + #topsep { + width: 100%; + background: url( '/Gradient.jpg' ); + } + + #footer { + text-align: center; + font-size: 10px; + } + + </style> + +</head> +<body> +<a href="/"><img src="/jbpm-console/JBossLogo.jpg" alt="JBoss SOA Platform"/></a> + +<div id="topsep"> </div> + +<div style="border: 1px solid darkgray; background: #ff8c00; font-weight: bold; padding: 10px; margin: 5px"> + You must provide security credentials to access this management console. +</div> + +<% if ("1".equals(request.getParameter("error"))) { %> +<div style="border: 1px solid darkgray; color: white; background: darkred; font-weight: bold; padding: 10px; margin: 5px"> + Invalid Login/Password. Please Try Again. +</div> +<% }%> + +<div align="center" style="border: 1px solid darkgray; background-color: gainsboro; font-size: 11px; padding: 15px;"> + <form name="loginform" method="post" action="j_security_check"> + <table class="leftmenu"> + <tbody> + <tr class="leftmenu"> + <th>User Name</th> + <td> + <input name="j_username" type="text"/> + </td> + </tr> + <tr class="leftmenu"> + <th>Password</th> + <td> + <input name="j_password" type="password"/> + </td> + </tr> + <tr class="leftmenu"> + <th/> + <td> + <input type="submit" value="Log In"/> + </td> + </tr> + </tbody> + </table> + </form> +</div> +</body> +</html> \ No newline at end of file

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3413 - in projects/jsf-console/trunk/console/src/main/webapp: ua and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-17 16:21:22 -0500 (Wed, 17 Dec 2008) New Revision: 3413 Modified: projects/jsf-console/trunk/console/src/main/webapp/app/deployproc.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/group.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/jobs.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_comments.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_pager.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_tokens.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_vars.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/task.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/token.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml projects/jsf-console/trunk/console/src/main/webapp/ua/login-example.xhtml projects/jsf-console/trunk/console/src/main/webapp/ua/login.xhtml projects/jsf-console/trunk/console/src/main/webapp/ua/t_base.xhtml Log: Identation to simplify comparison to SOA-P overlays Modified: projects/jsf-console/trunk/console/src/main/webapp/app/deployproc.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/deployproc.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/deployproc.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" Modified: projects/jsf-console/trunk/console/src/main/webapp/app/group.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/group.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/group.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -23,8 +24,10 @@ <ga:parameter name="view" target="#{viewMode}" default="children"/> <ga:parameter name="page" target="#{page}" default="1"/> <id:loadGroup id="#{id}" target="#{group}"/> - <gd:sort source="#{group.memberships}" target="#{members}" entryVar="e" argument="#{e.role == null ? '' : e.role}"/> - <gd:sort source="#{members}" target="#{members}" entryVar="e" argument="#{e.user.name == null ? '' : e.user.name}"/> + <gd:sort source="#{group.memberships}" target="#{members}" entryVar="e" + argument="#{e.role == null ? '' : e.role}"/> + <gd:sort source="#{members}" target="#{members}" entryVar="e" + argument="#{e.user.name == null ? '' : e.user.name}"/> <gd:pager target="#{members_pager}" value="#{members}" page="#{page}"/> <gd:sort source="#{group.children}" target="#{children}" entryVar="e" argument="#{e.name}"/> <gd:pager target="#{children_pager}" value="#{children}" page="#{page}"/> @@ -100,7 +103,8 @@ <h:inputHidden value="#{id}"/> <gs:ul> <gs:li> - <h:commandLink value="Delete" onclick="return confirm('#{msgs['identities.groups.confirm.delete']}');"> + <h:commandLink value="Delete" + onclick="return confirm('#{msgs['identities.groups.confirm.delete']}');"> <f:param name="xid"> <ga:attribute name="value" value="#{group.id}"/> </f:param> @@ -146,7 +150,8 @@ </tr> </thead> <tbody class="results"> - <gd:repeat value="#{children}" var="child" idVar="rid" first="#{children_pager.first}" limit="#{children_pager.limit}"> + <gd:repeat value="#{children}" var="child" idVar="rid" first="#{children_pager.first}" + limit="#{children_pager.limit}"> <gs:tr> <ga:attribute name="styleClass" value="#{rid % 2 == 0 ? 'odd' : 'even'}"/> <td> @@ -157,7 +162,8 @@ </td> <td> <h:form> - <h:commandLink value="Remove" onclick="return confirm('#{msgs['identities.groups.confirm.delete']}')"> + <h:commandLink value="Remove" + onclick="return confirm('#{msgs['identities.groups.confirm.delete']}')"> <f:param name="xgid"> <ga:attribute name="value" value="#{child.id}"/> </f:param> @@ -197,7 +203,8 @@ </thead> <gs:tbody styleClass="results"> <ga:attribute name="rendered" value="#{! empty members}"/> - <gd:repeat value="#{members}" var="member" idVar="rid" first="#{members_pager.first}" limit="#{members_pager.limit}"> + <gd:repeat value="#{members}" var="member" idVar="rid" first="#{members_pager.first}" + limit="#{members_pager.limit}"> <gs:tr> <ga:attribute name="styleClass" value="#{rid % 2 == 0 ? 'odd' : 'even'}"/> <td> @@ -238,7 +245,6 @@ </ui:define> - </ui:composition> </html> \ No newline at end of file Modified: projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -23,7 +24,8 @@ <ga:checkRole roles="#{access.role.identities.user}"> <f:setPropertyActionListener value="users" target="#{viewModeDefault}"/> </ga:checkRole> - <ga:parameter name="view" target="#{viewMode}" default="#{empty viewModeDefault ? 'users' : viewModeDefault}"/> + <ga:parameter name="view" target="#{viewMode}" + default="#{empty viewModeDefault ? 'users' : viewModeDefault}"/> <ga:parameter name="page" target="#{page}" default="1"> <f:convertNumber integerOnly="true"/> </ga:parameter> @@ -38,8 +40,10 @@ <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> <id:listUsers unless="#{viewMode != 'users'}" target="#{users}"/> - <gd:filter if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" filter="#{userName}" filterArgument="#{e.name}"/> - <gd:filter if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" filter="#{userEmail}" filterArgument="#{e.email}"/> + <gd:filter if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" filter="#{userName}" + filterArgument="#{e.name}"/> + <gd:filter if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" filter="#{userEmail}" + filterArgument="#{e.email}"/> <gd:sort if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" argument="#{e.name}"/> <gd:pager target="#{users_pager}" value="#{users}" page="#{page}"/> </ga:checkRole> @@ -57,9 +61,12 @@ <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> <id:listGroups unless="#{viewMode != 'groups'}" target="#{groups}"/> - <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupName}" filterArgument="#{e.name}"/> - <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupType}" filterArgument="#{e.type}"/> - <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupParentName}" filterArgument="#{e.parent.name}"/> + <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupName}" + filterArgument="#{e.name}"/> + <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupType}" + filterArgument="#{e.type}"/> + <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupParentName}" + filterArgument="#{e.parent.name}"/> <gd:sort if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" argument="#{e.name}"/> <gd:pager target="#{groups_pager}" value="#{groups}" page="#{page}"/> </ga:checkRole> @@ -114,7 +121,8 @@ <gs:ul> <ga:checkRole roles="#{access.role.identities.user}"> <gs:li> - <h:outputLink style="#{empty viewMode or viewMode == 'users' ? 'font-weight:bold' : ''}"> + <h:outputLink + style="#{empty viewMode or viewMode == 'users' ? 'font-weight:bold' : ''}"> <f:param name="view" value="users"/> <h:outputText value="#{msgs['identities.view.users']}"/> </h:outputLink> @@ -178,10 +186,12 @@ <tr> <td/> <td> - <input name="name_i" type="text" style="width:90px;" value="#{userName}" onkeypress="keypress(event,'apply')"/> + <input name="name_i" type="text" style="width:90px;" value="#{userName}" + onkeypress="keypress(event,'apply')"/> </td> <td> - <input name="email_i" type="text" style="width:110px;" value="#{userEmail}" onkeypress="keypress(event,'apply')"/> + <input name="email_i" type="text" style="width:110px;" value="#{userEmail}" + onkeypress="keypress(event,'apply')"/> </td> <td/> <td colspan="2" style="width:150px;"> @@ -190,7 +200,9 @@ <input type="hidden" name="name"/> <input type="hidden" name="email"/> </form> - <a id="apply" accesskey="a" onclick="document.getElementsByName('name')[0].value=document.getElementsByName('name_i')[0].value;document.getElementsByName('email')[0].value=document.getElementsByName('email_i')[0].value;document.getElementById('sf').submit();return false;"><h:outputText value="#{msgs['filter.apply']}"/></a> + <a id="apply" accesskey="a" + onclick="document.getElementsByName('name')[0].value=document.getElementsByName('name_i')[0].value;document.getElementsByName('email')[0].value=document.getElementsByName('email_i')[0].value;document.getElementById('sf').submit();return false;"><h:outputText + value="#{msgs['filter.apply']}"/></a> <h:outputLink style="margin-left:10px"> <f:param name="view" value="users"/> <h:outputText value="#{msgs['filter.clear']}"/> @@ -214,8 +226,10 @@ </td> <td> <ga:responseActions> - <gd:sort source="#{user.memberships}" target="#{memberships}" entryVar="e" argument="#{e.group.name}"/> - <gd:sort source="#{memberships}" target="#{memberships}" entryVar="e" argument="#{e.group.type}"/> + <gd:sort source="#{user.memberships}" target="#{memberships}" entryVar="e" + argument="#{e.group.name}"/> + <gd:sort source="#{memberships}" target="#{memberships}" entryVar="e" + argument="#{e.group.type}"/> </ga:responseActions> <gd:repeat value="#{memberships}" var="membership"> <h:outputText value="Group (#{membership.group.type}): #{membership.group.name}"/> @@ -231,7 +245,8 @@ <ga:checkRole roles="#{access.role.identities.user.delete}"> <td> <h:form> - <h:commandLink value="Delete" onclick="return confirm('#{msgs['identities.users.confirm.delete']}')"> + <h:commandLink value="Delete" + onclick="return confirm('#{msgs['identities.users.confirm.delete']}')"> <f:param name="xid"> <ga:attribute name="value" value="#{user.id}"/> </f:param> @@ -342,13 +357,15 @@ <tr> <td/> <td> - <input name="gname_i" type="text" style="width:90px;" value="#{groupName}" onkeypress="keypress(event,'gapply')"/> + <input name="gname_i" type="text" style="width:90px;" value="#{groupName}" + onkeypress="keypress(event,'gapply')"/> </td> <td> <input name="gtype_i" type="text" style="width:110px;" value="#{groupType}" onkeypress="keypress(event,'gapply')"/> </td> <td> - <input name="gpname_i" type="text" style="width:90px;" value="#{groupParentName}" onkeypress="keypress(event,'gapply')"/> + <input name="gpname_i" type="text" style="width:90px;" value="#{groupParentName}" + onkeypress="keypress(event,'gapply')"/> </td> <td colspan="2" style="width:150px;"> <form id="gsf" action="identities.jsf"> @@ -357,7 +374,9 @@ <input type="hidden" name="gtype"/> <input type="hidden" name="gpname"/> </form> - <a id="gapply" accesskey="a" onclick="document.getElementsByName('gname')[0].value=document.getElementsByName('gname_i')[0].value;document.getElementsByName('gpname')[0].value=document.getElementsByName('gpname_i')[0].value;document.getElementsByName('gtype')[0].value=document.getElementsByName('gtype_i')[0].value;document.getElementById('gsf').submit();return false;"><h:outputText value="#{msgs['filter.apply']}"/></a> + <a id="gapply" accesskey="a" + onclick="document.getElementsByName('gname')[0].value=document.getElementsByName('gname_i')[0].value;document.getElementsByName('gpname')[0].value=document.getElementsByName('gpname_i')[0].value;document.getElementsByName('gtype')[0].value=document.getElementsByName('gtype_i')[0].value;document.getElementById('gsf').submit();return false;"><h:outputText + value="#{msgs['filter.apply']}"/></a> <h:outputLink style="margin-left:10px"> <f:param name="view" value="groups"/> <h:outputText value="#{msgs['filter.clear']}"/> @@ -368,7 +387,8 @@ <h:outputText> <ga:attribute name="rendered" value="#{! empty groups}"/> <tbody class="results"> - <gd:repeat value="#{groups}" var="group" idVar="rid" first="#{groups_pager.first}" limit="#{groups_pager.limit}"> + <gd:repeat value="#{groups}" var="group" idVar="rid" first="#{groups_pager.first}" + limit="#{groups_pager.limit}"> <gs:tr> <ga:attribute name="styleClass" value="#{rid % 2 == 0 ? 'odd' : 'even'}"/> <td> @@ -391,7 +411,8 @@ <ga:checkRole roles="#{access.role.identities.group.delete}"> <td> <h:form> - <h:commandLink value="Delete" onclick="return confirm('#{msgs['identities.groups.confirm.delete']}')"> + <h:commandLink value="Delete" + onclick="return confirm('#{msgs['identities.groups.confirm.delete']}')"> <f:param name="xid"> <ga:attribute name="value" value="#{group.id}"/> </f:param> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/jobs.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/jobs.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/jobs.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -69,10 +70,15 @@ <ga:parameter name="page" target="#{page}" default="1"/> <j4j:listJobs target="#{jobs}"/> - <f:setPropertyActionListener value="#{viewMode == 'timers' ? 12 : viewMode == 'action' ? 9 : viewMode == 'node' ? 9 : 10}" target="#{colspan}"/> - <gd:filter if="#{viewMode == 'timers'}" entryVar="e" source="#{jobs}" target="#{jobs}" test="#{e.class.name == 'org.jbpm.job.Timer'}"/> - <gd:filter if="#{viewMode == 'action'}" entryVar="e" source="#{jobs}" target="#{jobs}" test="#{e.class.name == 'org.jbpm.job.ExecuteActionJob'}"/> - <gd:filter if="#{viewMode == 'node'}" entryVar="e" source="#{jobs}" target="#{jobs}" test="#{e.class.name == 'org.jbpm.job.ExecuteNodeJob'}"/> + <f:setPropertyActionListener + value="#{viewMode == 'timers' ? 12 : viewMode == 'action' ? 9 : viewMode == 'node' ? 9 : 10}" + target="#{colspan}"/> + <gd:filter if="#{viewMode == 'timers'}" entryVar="e" source="#{jobs}" target="#{jobs}" + test="#{e.class.name == 'org.jbpm.job.Timer'}"/> + <gd:filter if="#{viewMode == 'action'}" entryVar="e" source="#{jobs}" target="#{jobs}" + test="#{e.class.name == 'org.jbpm.job.ExecuteActionJob'}"/> + <gd:filter if="#{viewMode == 'node'}" entryVar="e" source="#{jobs}" target="#{jobs}" + test="#{e.class.name == 'org.jbpm.job.ExecuteNodeJob'}"/> <gd:pager target="#{pager}" value="#{jobs}" page="#{page}"/> </ga:responseActions> </ui:define> @@ -84,7 +90,8 @@ <th colspan="#{colspan}"> <ui:decorate template="t_pager.xhtml"> </ui:decorate> - <h:outputText value="#{viewMode == 'timers' ? 'Timers' : viewMode == 'action' ? 'Execute Action Jobs' : viewMode == 'node' ? 'Execute Node Jobs' : 'All Jobs'}"/> + <h:outputText + value="#{viewMode == 'timers' ? 'Timers' : viewMode == 'action' ? 'Execute Action Jobs' : viewMode == 'node' ? 'Execute Node Jobs' : 'All Jobs'}"/> </th> </tr> <tr> @@ -130,7 +137,8 @@ </h:outputText> <h:outputText rendered="#{viewMode == 'all'}"> <td> - <h:outputText value="#{job.class.name == 'org.jbpm.job.Timer' ? 'Timer' : job.class.name == 'org.jbpm.job.ExecuteActionJob' ? 'Execute Action' : job.class.name == 'org.jbpm.job.ExecuteNodeJob' ? 'Execute Node' : job.class.name}"/> + <h:outputText + value="#{job.class.name == 'org.jbpm.job.Timer' ? 'Timer' : job.class.name == 'org.jbpm.job.ExecuteActionJob' ? 'Execute Action' : job.class.name == 'org.jbpm.job.ExecuteNodeJob' ? 'Execute Node' : job.class.name}"/> </td> </h:outputText> <td> @@ -173,7 +181,8 @@ </td> <td> <h:form> - <h:commandLink onclick="return confirm('Are you sure you want to delete this job? The operation cannot be undone.');"> + <h:commandLink + onclick="return confirm('Are you sure you want to delete this job? The operation cannot be undone.');"> <h:outputText value="Delete"/> <j4j:loadJob id="#{job.id}" target="#{xjob}"/> <j4j:delete value="#{xjob}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -40,12 +41,17 @@ <j4j:loadProcess id="#{id}" target="#{pd}"/> <j4j:listTasksForProcess unless="#{viewMode != 'task'}" process="#{pd}" target="#{tasks}"/> <j4j:listProcessInstances unless="#{viewMode != 'ins'}" target="#{piList}" processId="#{id}"/> - <gd:filter source="#{piList}" target="#{piList}" entryVar="entry" test="#{filter_ended and entry.end != null or entry.end == null and (filter_suspended and entry.suspended or filter_running and ! entry.suspended)}"/> - <gd:filter if="#{! empty pi_key}" source="#{piList}" target="#{piList}" entryVar="entry" filter="#{pi_key}" filterArgument="#{entry.key == null ? '' : entry.key}"/> + <gd:filter source="#{piList}" target="#{piList}" entryVar="entry" + test="#{filter_ended and entry.end != null or entry.end == null and (filter_suspended and entry.suspended or filter_running and ! entry.suspended)}"/> + <gd:filter if="#{! empty pi_key}" source="#{piList}" target="#{piList}" entryVar="entry" filter="#{pi_key}" + filterArgument="#{entry.key == null ? '' : entry.key}"/> - <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> - <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/> - <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/> + <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" + test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> + <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" + filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/> + <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" + filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/> </ga:responseActions> <gs:div style="padding:0;margin:0"> <ga:attribute name="rendered" value="#{pd != null}"/> @@ -125,7 +131,8 @@ <h:outputText value=" a new instance of this process"/> </gs:li> <gs:li> - <h:commandLink value="Delete" onclick="return confirm('Are you sure you want to permanently delete this process? This operation cannot be undone.')"> + <h:commandLink value="Delete" + onclick="return confirm('Are you sure you want to permanently delete this process? This operation cannot be undone.')"> <ga:parameter name="id" target="#{id}"> <f:convertNumber integerOnly="true" maxFractionDigits="0"/> </ga:parameter> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -23,8 +24,10 @@ <ga:parameter name="version" target="#{version}" default=""> <f:converter converterId="gravel.RangeListFilter"/> </ga:parameter> - <gd:filter source="#{proclist}" target="#{proclist}" entryVar="entry" filter="#{name}" filterArgument="#{entry.name}"/> - <gd:filter source="#{proclist}" target="#{proclist}" entryVar="entry" filter="#{version}" filterArgument="#{entry.version}"/> + <gd:filter source="#{proclist}" target="#{proclist}" entryVar="entry" filter="#{name}" + filterArgument="#{entry.name}"/> + <gd:filter source="#{proclist}" target="#{proclist}" entryVar="entry" filter="#{version}" + filterArgument="#{entry.version}"/>  <f:setPropertyActionListener value="1" target="#{actionColspan}"/> <ga:checkRole roles="#{access.role.process.delete}"> @@ -105,14 +108,17 @@ <input name="name_i" type="text" style="width:110px;" value="#{name}" onkeypress="keypress(event,'apply')"/> </td> <td> - <input name="version_i" type="text" style="width:40px;" value="#{version}" onkeypress="keypress(event,'apply')"/> + <input name="version_i" type="text" style="width:40px;" value="#{version}" + onkeypress="keypress(event,'apply')"/> </td> <td colspan="#{actionColspan}" style="width:150px;"> <form id="sf" action="processes.jsf"> <input type="hidden" name="name"/> <input type="hidden" name="version"/> </form> - <a href="#" id="apply" accesskey="a" onclick="document.getElementsByName('name')[0].value=document.getElementsByName('name_i')[0].value;document.getElementsByName('version')[0].value=document.getElementsByName('version_i')[0].value;document.getElementById('sf').submit();return false;">Apply Filter</a> + <a href="#" id="apply" accesskey="a" + onclick="document.getElementsByName('name')[0].value=document.getElementsByName('name_i')[0].value;document.getElementsByName('version')[0].value=document.getElementsByName('version_i')[0].value;document.getElementById('sf').submit();return false;">Apply + Filter</a> <a href="?" style="margin-left:10px">Clear Filter</a> </td> </tr> @@ -144,7 +150,8 @@ <td> <h:form> <h:commandLink>Delete - <ga:attribute name="onclick" value="return confirm('#{msgs['confirm.process.delete']}')"/> + <ga:attribute name="onclick" + value="return confirm('#{msgs['confirm.process.delete']}')"/> <f:param name="id" value="#{pd.id}"/> <ga:parameter name="id" target="#{id}"> <f:convertNumber integerOnly="true"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -39,9 +40,12 @@ <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/> <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/> - <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> - <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/> - <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/> + <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" + test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> + <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" + filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/> + <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" + filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/> </ga:responseActions> </ui:define> @@ -189,7 +193,8 @@ <h:outputText value=" this process instance"/> </gs:li> <gs:li> - <h:commandLink value="Delete" onclick="return confirm('Are you sure you want to permanently delete this process instance? This operation cannot be undone.')"> + <h:commandLink value="Delete" + onclick="return confirm('Are you sure you want to permanently delete this process instance? This operation cannot be undone.')"> <j4j:loadProcessInstance id="#{id}" target="#{pi}" forUpdate="false"/> <f:setPropertyActionListener value="#{pi.processDefinition.id}" target="#{pdid}"/> <j4j:delete value="#{pi}"/> @@ -226,7 +231,8 @@ </ui:decorate> </h:outputText> <gs:div> - <ga:attribute name="style" value="position:relative;height:#{diagramInfo.height}px;width:#{diagramInfo.width}px"/> + <ga:attribute name="style" + value="position:relative;height:#{diagramInfo.height}px;width:#{diagramInfo.width}px"/> <ga:attribute name="rendered" value="#{viewMode == 'img'}"/> <img alt="" @@ -236,18 +242,24 @@ <ui:fragment> <ui:param name="node" value="#{diagramInfo.nodeMap[token.node.name]}"/> <gs:div> - <ga:attribute name="style" value="top:#{node.y - 12}px;left:#{node.x + 2}px;width:#{node.width - 3}px;height:#{node.height + 11}px"/> - <ga:attribute name="styleClass" value="#{token.end != null ? 'pboxs_e' : token.suspended ? 'pboxs_s' : 'pboxs'}"/> + <ga:attribute name="style" + value="top:#{node.y - 12}px;left:#{node.x + 2}px;width:#{node.width - 3}px;height:#{node.height + 11}px"/> + <ga:attribute name="styleClass" + value="#{token.end != null ? 'pboxs_e' : token.suspended ? 'pboxs_s' : 'pboxs'}"/> </gs:div> <gs:div> - <ga:attribute name="style" value="top:#{node.y}px;left:#{node.x}px;width:#{node.width - 3}px;height:#{node.height - 3}px"/> - <ga:attribute name="styleClass" value="#{token.end != null ? 'pbox_e' : token.suspended ? 'pbox_s' : 'pbox'}"/> + <ga:attribute name="style" + value="top:#{node.y}px;left:#{node.x}px;width:#{node.width - 3}px;height:#{node.height - 3}px"/> + <ga:attribute name="styleClass" + value="#{token.end != null ? 'pbox_e' : token.suspended ? 'pbox_s' : 'pbox'}"/> </gs:div> <gs:div> - <ga:attribute name="style" value="top:#{node.y - 14}px;left:#{node.x}px;width:#{node.width - 1}px"/> + <ga:attribute name="style" + value="top:#{node.y - 14}px;left:#{node.x}px;width:#{node.width - 1}px"/> <ga:attribute name="styleClass" value="pboxce"/> <gs:div> - <ga:attribute name="styleClass" value="#{token.end != null ? 'pboxc_e' : token.suspended ? 'pboxc_s' : 'pboxc'}"/> + <ga:attribute name="styleClass" + value="#{token.end != null ? 'pboxc_e' : token.suspended ? 'pboxc_s' : 'pboxc'}"/> <h:outputLink value="token.jsf"> <f:param name="id" value="#{token.id}"/> <h:outputText value="Running" rendered="#{token.end == null and ! token.suspended}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_comments.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/t_comments.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_comments.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -27,9 +28,12 @@ <gs:div> <h:outputText value="Anonymous comment" rendered="#{empty comment.actorId}"/> <h:outputText value="Comment by " rendered="#{! empty comment.actorId}"/> - <h:outputText value="#{comment.actorId}" rendered="#{! empty comment.actorId}" style="font-weight:bold"/> - <h:outputText value=" relating to task "" rendered="#{comment.taskInstance != null}"/> - <h:outputText value="#{comment.taskInstance.name}" rendered="#{comment.taskInstance != null}" style="font-weight:bold"/> + <h:outputText value="#{comment.actorId}" rendered="#{! empty comment.actorId}" + style="font-weight:bold"/> + <h:outputText value=" relating to task "" + rendered="#{comment.taskInstance != null}"/> + <h:outputText value="#{comment.taskInstance.name}" + rendered="#{comment.taskInstance != null}" style="font-weight:bold"/> <h:outputText value=""" rendered="#{comment.taskInstance != null}"/> <h:outputText value=" on "/> <h:outputText value="#{comment.time}" style="white-space:nowrap"> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -32,10 +33,12 @@ <ui:define name="header"> <h:outputText value="#{msgs['topmenu.caption']}" style="margin-left:30px;margin-right:10px"/> - <h:outputLink styleClass="headermenufirst" value="processes.jsf" style="#{view.viewId == '/app/processes.xhtml' ? 'font-weight:bold' : ''}"> + <h:outputLink styleClass="headermenufirst" value="processes.jsf" + style="#{view.viewId == '/app/processes.xhtml' ? 'font-weight:bold' : ''}"> <h:outputText value="#{msgs['topmenu.processes']}"/> </h:outputLink> - <h:outputLink styleClass="headermenu" value="tasks.jsf" style="#{view.viewId == '/app/tasks.xhtml' ? 'font-weight:bold' : ''}"> + <h:outputLink styleClass="headermenu" value="tasks.jsf" + style="#{view.viewId == '/app/tasks.xhtml' ? 'font-weight:bold' : ''}"> <h:outputText value="#{msgs['topmenu.tasks']}"/> </h:outputLink> <ga:checkRole roles="#{access.role.tasks.listAll}"> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_pager.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/t_pager.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_pager.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -62,11 +63,13 @@ <tr> <td/> <td> - <input name="name_i" type="text" style="width:150px;" value="#{task_filter_name}" onkeypress="keypress(event,'apply')"/> + <input name="name_i" type="text" style="width:150px;" value="#{task_filter_name}" + onkeypress="keypress(event,'apply')"/> </td> <td/> <td> - <input name="actor_i" type="text" style="width:80px;" value="#{task_filter_actor}" onkeypress="keypress(event,'apply')"/> + <input name="actor_i" type="text" style="width:80px;" value="#{task_filter_actor}" + onkeypress="keypress(event,'apply')"/> </td> <td style="width:120px;white-space:nowrap"> <h:selectBooleanCheckbox id="task_notstarted_i" value="#{task_filter_notstarted}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_tokens.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/t_tokens.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_tokens.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -70,7 +71,8 @@ </td> <td> <h:outputText value="(no parent)" style="font-style:italic" rendered="#{token.parent == null}"/> - <h:outputText value="#{token.parent.name} (ID #{token.parent.id})" rendered="#{token.parent != null and ! empty token.parent.name}"/> + <h:outputText value="#{token.parent.name} (ID #{token.parent.id})" + rendered="#{token.parent != null and ! empty token.parent.name}"/> <h:outputText value="ID #{token.parent.id}" rendered="#{token.parent != null and empty token.parent.name}"/> </td> <td> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_vars.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/t_vars.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_vars.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" Modified: projects/jsf-console/trunk/console/src/main/webapp/app/task.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/task.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/task.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -18,11 +19,14 @@ <j4j:loadTask id="#{id}" target="#{task}"/> <ga:parameter name="view" target="#{viewMode}" default="#{task.end != null ? 'comments' : 'form'}"/> <gd:reverse source="#{task.comments}" target="#{comments}"/> - <gd:sort if="#{! empty task.availableTransitions}" source="#{task.availableTransitions}" target="#{transitions}" entryVar="e" argument="#{e.name == null ? '' : e.name}"/> + <gd:sort if="#{! empty task.availableTransitions}" source="#{task.availableTransitions}" target="#{transitions}" + entryVar="e" argument="#{e.name == null ? '' : e.name}"/> <j4j:getVariableMap target="#{taskVariableMap}" value="#{task}"/> <j4j:getTaskFormInfo process="#{task.processInstance.processDefinition}" target="#{taskForms}"/> - <gd:sort if="#{! empty task.pooledActors}" source="#{task.pooledActors}" target="#{taskActors}" entryVar="e" argument="#{e.actorId}"/> - <gd:filter if="#{! empty taskActors and ! empty task.actorId}" entryVar="e" source="#{taskActors}" target="#{taskActors}" test="#{e.actorId != task.actorId}"/> + <gd:sort if="#{! empty task.pooledActors}" source="#{task.pooledActors}" target="#{taskActors}" entryVar="e" + argument="#{e.actorId}"/> + <gd:filter if="#{! empty taskActors and ! empty task.actorId}" entryVar="e" source="#{taskActors}" + target="#{taskActors}" test="#{e.actorId != task.actorId}"/> </ga:responseActions> <ga:keepAlive value="#{taskVariableMap}"/> </ui:define> @@ -104,7 +108,8 @@ <td> <h:outputLink value="procdef.jsf"> <f:param name="id" value="#{task.processInstance.processDefinition.id}"/> - <h:outputText value="#{task.processInstance.processDefinition.name} v#{task.processInstance.processDefinition.version}"/> + <h:outputText + value="#{task.processInstance.processDefinition.name} v#{task.processInstance.processDefinition.version}"/> </h:outputLink> </td> </tr> @@ -339,7 +344,8 @@ </ga:parameter> <j4j:loadTask id="#{id}" target="#{task}"/> <j4j:completeTask task="#{task}" transition="#{transition.name}"/> - <n:nav outcome="success" url="procins.jsf?id=#{task.processInstance.id}" storeMessages="true"/> + <n:nav outcome="success" url="procins.jsf?id=#{task.processInstance.id}" + storeMessages="true"/> <n:nav outcome="error" redirect="true" storeMessages="true"/> </h:commandLink> </h:form> @@ -359,9 +365,12 @@ <f:convertNumber integerOnly="true" maxFractionDigits="0"/> </ga:parameter> <j4j:loadTask id="#{id}" target="#{xtask}" navigate="false" unless="#{button == 'cancel'}"/> - <j4j:applyVariableMap target="#{xtask}" variableMap="#{taskVariableMap}" navigate="false" unless="#{button == 'cancel'}"/> - <j4j:addComment comment="#{comment}" target="#{xtask}" unless="#{empty comment or button == 'cancel'}" navigate="false"/> - <j4j:completeTask task="#{xtask}" transition="#{transition}" unless="#{button != 'transition'}" navigate="false"/> + <j4j:applyVariableMap target="#{xtask}" variableMap="#{taskVariableMap}" navigate="false" + unless="#{button == 'cancel'}"/> + <j4j:addComment comment="#{comment}" target="#{xtask}" unless="#{empty comment or button == 'cancel'}" + navigate="false"/> + <j4j:completeTask task="#{xtask}" transition="#{transition}" unless="#{button != 'transition'}" + navigate="false"/> <n:nav outcome="error" redirect="true" storeMessages="true"/> <n:nav outcome="save" redirect="true" storeMessages="true"/> <n:nav outcome="cancel" redirect="true" storeMessages="true"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" Modified: projects/jsf-console/trunk/console/src/main/webapp/app/token.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/token.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/token.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -17,7 +18,8 @@ <ga:parameter name="id" target="#{id}"/> <ga:parameter name="view" target="#{viewMode}" default="tran"/> <j4j:loadToken id="#{id}" target="#{token}"/> - <gd:sort if="#{! empty token.availableTransitions}" source="#{token.availableTransitions}" target="#{transitions}" entryVar="e" argument="#{e.name == null ? '' : e.name}"/> + <gd:sort if="#{! empty token.availableTransitions}" source="#{token.availableTransitions}" + target="#{transitions}" entryVar="e" argument="#{e.name == null ? '' : e.name}"/> </ga:responseActions> </ui:define> @@ -76,7 +78,8 @@ <td> <h:outputLink value="procdef.jsf"> <f:param name="id" value="#{token.processInstance.processDefinition.id}"/> - <h:outputText value="#{token.processInstance.processDefinition.name} v#{token.processInstance.processDefinition.version}"/> + <h:outputText + value="#{token.processInstance.processDefinition.name} v#{token.processInstance.processDefinition.version}"/> </h:outputLink> </td> </tr> @@ -268,13 +271,15 @@ <gd:repeat value="#{token.processInstance.processDefinition.nodes}" var="node" idVar="rid"> <gs:tr styleClass="#{rid % 2 == 0 ? 'odd' : 'even'}"> <td> - <h:outputText value="#{node.name}" style="#{token.node.id == node.id ? 'font-weight:bold;' : ''}"/> + <h:outputText value="#{node.name}" + style="#{token.node.id == node.id ? 'font-weight:bold;' : ''}"/> </td> <td> <h:form> <ga:attribute name="rendered" value="#{token.node.id != node.id}"/> <h:commandLink> - <ga:attribute name="onclick" value="return confirm('#{msgs['confirm.token.move']}')"/> + <ga:attribute name="onclick" + value="return confirm('#{msgs['confirm.token.move']}')"/> <h:outputText value="Move to this node"/> <ga:attribute name="rendered" value="#{! token.suspended}"/> <f:param name="id" value="#{id}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -34,9 +35,12 @@ <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> <id:loadUser id="#{id}" target="#{user}"/> - <gd:filter source="#{user.memberships}" target="#{memberships}" entryVar="e" filter="#{groupName}" filterArgument="#{e.group.name}"/> - <gd:filter source="#{memberships}" target="#{memberships}" entryVar="e" filter="#{groupType}" filterArgument="#{e.group.type}"/> - <gd:filter source="#{memberships}" target="#{memberships}" entryVar="e" filter="#{roleName}" filterArgument="#{e.role}"/> + <gd:filter source="#{user.memberships}" target="#{memberships}" entryVar="e" filter="#{groupName}" + filterArgument="#{e.group.name}"/> + <gd:filter source="#{memberships}" target="#{memberships}" entryVar="e" filter="#{groupType}" + filterArgument="#{e.group.type}"/> + <gd:filter source="#{memberships}" target="#{memberships}" entryVar="e" filter="#{roleName}" + filterArgument="#{e.role}"/> <gd:sort source="#{memberships}" target="#{memberships}" entryVar="e" argument="#{e.group.name}"/> <gd:sort source="#{memberships}" target="#{memberships}" entryVar="e" argument="#{e.group.type}"/> <gd:pager target="#{memberships_pager}" value="#{memberships}" page="#{page}"/> @@ -54,9 +58,13 @@ <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/> <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/> - <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> - <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/> - <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/> + <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" + test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> + <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" + filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/> + <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" + filter="#{task_filter_actor}" + filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/> </ga:checkRole> </ga:checkRole> </ga:checkRole> @@ -115,7 +123,8 @@ <h:inputHidden value="#{id}"/> <gs:ul> <gs:li> - <h:commandLink value="Delete" onclick="return confirm('Are you sure you want to delete this user? This operation cannot be undone.')"> + <h:commandLink value="Delete" + onclick="return confirm('Are you sure you want to delete this user? This operation cannot be undone.')"> <f:param name="xid"> <ga:attribute name="value" value="#{user.id}"/> </f:param> @@ -184,7 +193,9 @@ <input type="hidden" name="gtype"/> <input type="hidden" name="role"/> </form> - <a id="apply" accesskey="a" onclick="copyinput('gname_i','gname');copyinput('gtype_i','gtype');copyinput('role_i','role');document.getElementById('sf').submit();return false;">Apply Filter</a> + <a id="apply" accesskey="a" + onclick="copyinput('gname_i','gname');copyinput('gtype_i','gtype');copyinput('role_i','role');document.getElementById('sf').submit();return false;">Apply + Filter</a> <h:outputLink style="margin-left:10px"> <f:param name="id" value="#{id}"/>Clear Filter </h:outputLink> Modified: projects/jsf-console/trunk/console/src/main/webapp/ua/login-example.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/ua/login-example.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/ua/login-example.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" Modified: projects/jsf-console/trunk/console/src/main/webapp/ua/login.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/ua/login.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/ua/login.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" Modified: projects/jsf-console/trunk/console/src/main/webapp/ua/t_base.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/ua/t_base.xhtml 2008-12-17 20:58:23 UTC (rev 3412) +++ projects/jsf-console/trunk/console/src/main/webapp/ua/t_base.xhtml 2008-12-17 21:21:22 UTC (rev 3413) @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -95,7 +96,8 @@ <tr> <td> <h:outputText value="#{msg.summary}"/> - <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" value=": #{msg.detail}"/> + <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" + value=": #{msg.detail}"/> </td> </tr> </gd:repeat> @@ -115,7 +117,8 @@ <tr> <td> <h:outputText value="#{msg.summary}"/> - <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" value=": #{msg.detail}"/> + <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" + value=": #{msg.detail}"/> </td> </tr> </gd:repeat> @@ -135,7 +138,8 @@ <tr> <td> <h:outputText value="#{msg.summary}"/> - <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" value=": #{msg.detail}"/> + <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" + value=": #{msg.detail}"/> </td> </tr> </gd:repeat> @@ -155,7 +159,8 @@ <tr> <td> <h:outputText value="#{msg.summary}"/> - <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" value=": #{msg.detail}"/> + <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" + value=": #{msg.detail}"/> </td> </tr> </gd:repeat>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3412 - in projects/jsf-console/trunk/console/src/main/webapp: WEB-INF and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-17 15:58:23 -0500 (Wed, 17 Dec 2008) New Revision: 3412 Added: projects/jsf-console/trunk/console/src/main/webapp/app/ Removed: projects/jsf-console/trunk/console/src/main/webapp/sa/ Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jbpm4jsf-config.xml projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml projects/jsf-console/trunk/console/src/main/webapp/index.jsp Log: Align layout with SOA-P: move xhtml to app directory Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-17 20:33:41 UTC (rev 3411) +++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-17 20:58:23 UTC (rev 3412) @@ -1,12 +1,11 @@ <?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"> +<!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>jbpm-console</context-root> Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jbpm4jsf-config.xml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jbpm4jsf-config.xml 2008-12-17 20:33:41 UTC (rev 3411) +++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jbpm4jsf-config.xml 2008-12-17 20:58:23 UTC (rev 3412) @@ -13,7 +13,7 @@  <process-file-matcher> - <pattern>^/sa/pi/(\d+).jpg$</pattern> + <pattern>^/app/pi/(\d+).jpg$</pattern> <file-name>processimage.jpg</file-name> <content-type>image/jpg</content-type> </process-file-matcher> Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2008-12-17 20:33:41 UTC (rev 3411) +++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2008-12-17 20:58:23 UTC (rev 3412) @@ -26,7 +26,7 @@  <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/sa/pi/*</url-pattern> + <url-pattern>/app/pi/*</url-pattern> </servlet-mapping> <context-param> @@ -55,7 +55,7 @@ <servlet-mapping> <servlet-name>GDP Deployer Servlet</servlet-name> - <url-pattern>/upload/*</url-pattern> + <url-pattern>/app/upload/*</url-pattern> </servlet-mapping> <!-- @@ -76,7 +76,7 @@ <security-constraint> <web-resource-collection> <web-resource-name>Secure Area</web-resource-name> - <url-pattern>/sa/*</url-pattern> + <url-pattern>/app/*</url-pattern> <http-method>GET</http-method> <http-method>POST</http-method> </web-resource-collection> Copied: projects/jsf-console/trunk/console/src/main/webapp/app (from rev 3401, projects/jsf-console/trunk/console/src/main/webapp/sa) Modified: projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/sa/identities.xhtml 2008-12-16 14:24:23 UTC (rev 3401) +++ projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml 2008-12-17 20:58:23 UTC (rev 3412) @@ -11,7 +11,7 @@ xmlns:j4j="http://jbpm.org/jbpm4jsf/core" xmlns:id="http://jbpm.org/jbpm4jsf/identity" > - <ui:composition template="../sa/t_loggedin.xhtml"> + <ui:composition template="../app/t_loggedin.xhtml"> <ui:define name="actions"> <ga:checkRole roles="#{access.role.identities}"> <ga:responseActions> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/sa/processes.xhtml 2008-12-16 14:24:23 UTC (rev 3401) +++ projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml 2008-12-17 20:58:23 UTC (rev 3412) @@ -10,7 +10,7 @@ xmlns:n="http://gravel.jboss.org/jsf/1.0/navigation" xmlns:j4j="http://jbpm.org/jbpm4jsf/core" > - <ui:composition template="../sa/t_loggedin.xhtml"> + <ui:composition template="../app/t_loggedin.xhtml"> <ui:define name="actions"> <ga:responseActions> <j4j:listProcesses target="#{proclist}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/sa/t_loggedin.xhtml 2008-12-16 14:24:23 UTC (rev 3401) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml 2008-12-17 20:58:23 UTC (rev 3412) @@ -32,26 +32,26 @@ <ui:define name="header"> <h:outputText value="#{msgs['topmenu.caption']}" style="margin-left:30px;margin-right:10px"/> - <h:outputLink styleClass="headermenufirst" value="processes.jsf" style="#{view.viewId == '/sa/processes.xhtml' ? 'font-weight:bold' : ''}"> + <h:outputLink styleClass="headermenufirst" value="processes.jsf" style="#{view.viewId == '/app/processes.xhtml' ? 'font-weight:bold' : ''}"> <h:outputText value="#{msgs['topmenu.processes']}"/> </h:outputLink> - <h:outputLink styleClass="headermenu" value="tasks.jsf" style="#{view.viewId == '/sa/tasks.xhtml' ? 'font-weight:bold' : ''}"> + <h:outputLink styleClass="headermenu" value="tasks.jsf" style="#{view.viewId == '/app/tasks.xhtml' ? 'font-weight:bold' : ''}"> <h:outputText value="#{msgs['topmenu.tasks']}"/> </h:outputLink> <ga:checkRole roles="#{access.role.tasks.listAll}"> - <h:outputLink styleClass="headermenu" value="tasks_all.jsf" style="#{view.viewId == '/sa/tasks_all.xhtml' ? 'font-weight:bold' : ''}"> + <h:outputLink styleClass="headermenu" value="tasks_all.jsf" style="#{view.viewId == '/app/tasks_all.xhtml' ? 'font-weight:bold' : ''}"> <h:outputText value="#{msgs['topmenu.tasks_all']}"/> </h:outputLink> </ga:checkRole> <ga:checkRole roles="#{access.role.jobs}"> - <h:outputLink styleClass="headermenu" value="jobs.jsf" style="#{view.viewId == '/sa/jobs.xhtml' ? 'font-weight:bold' : ''}"> + <h:outputLink styleClass="headermenu" value="jobs.jsf" style="#{view.viewId == '/app/jobs.xhtml' ? 'font-weight:bold' : ''}"> <h:outputText value="#{msgs['topmenu.jobs']}"/> </h:outputLink> </ga:checkRole> <ga:checkRole roles="#{access.role.identities}"> - <h:outputLink styleClass="headermenu" value="identities.jsf" style="#{view.viewId == '/sa/identities.xhtml' ? 'font-weight:bold' : ''}"> + <h:outputLink styleClass="headermenu" value="identities.jsf" style="#{view.viewId == '/app/identities.xhtml' ? 'font-weight:bold' : ''}"> <h:outputText value="#{msgs['topmenu.identities']}"/> </h:outputLink> </ga:checkRole> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/sa/t_processinstances.xhtml 2008-12-16 14:24:23 UTC (rev 3401) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml 2008-12-17 20:58:23 UTC (rev 3412) @@ -65,11 +65,11 @@ onkeypress="keypress(event,'apply')"/> </td> <td style="white-space:nowrap;"> - <h:selectBooleanCheckbox id="running_i" value="#{filter_running == true}"/> + <h:selectBooleanCheckbox id="running_i" value="#{filter_running}"/> <gs:label forId="running_i" styleClass="statusRunning">R</gs:label> - <h:selectBooleanCheckbox id="suspended_i" value="#{filter_suspended == true}"/> + <h:selectBooleanCheckbox id="suspended_i" value="#{filter_suspended}"/> <gs:label forId="suspended_i" styleClass="statusSuspended">S</gs:label> - <h:selectBooleanCheckbox id="ended_i" value="#{filter_ended == true}"/> + <h:selectBooleanCheckbox id="ended_i" value="#{filter_ended}"/> <gs:label forId="ended_i" styleClass="statusEnded">E</gs:label> </td> <td/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/sa/t_tasks.xhtml 2008-12-16 14:24:23 UTC (rev 3401) +++ projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml 2008-12-17 20:58:23 UTC (rev 3412) @@ -69,13 +69,13 @@ <input name="actor_i" type="text" style="width:80px;" value="#{task_filter_actor}" onkeypress="keypress(event,'apply')"/> </td> <td style="width:120px;white-space:nowrap"> - <h:selectBooleanCheckbox id="task_notstarted_i" value="#{task_filter_notstarted == true}"/> + <h:selectBooleanCheckbox id="task_notstarted_i" value="#{task_filter_notstarted}"/> <gs:label forId="task_notstarted_i" styleClass="statusNotstarted">N</gs:label> - <h:selectBooleanCheckbox id="task_running_i" value="#{task_filter_running == true}"/> + <h:selectBooleanCheckbox id="task_running_i" value="#{task_filter_running}"/> <gs:label forId="task_running_i" styleClass="statusRunning">R</gs:label> - <h:selectBooleanCheckbox id="task_suspended_i" value="#{task_filter_suspended == true}"/> + <h:selectBooleanCheckbox id="task_suspended_i" value="#{task_filter_suspended}"/> <gs:label forId="task_suspended_i" styleClass="statusSuspended">S</gs:label> - <h:selectBooleanCheckbox id="task_ended_i" value="#{task_filter_ended == true}"/> + <h:selectBooleanCheckbox id="task_ended_i" value="#{task_filter_ended}"/> <gs:label forId="task_ended_i" styleClass="statusEnded">E</gs:label> </td> <td/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/sa/tasks.xhtml 2008-12-16 14:24:23 UTC (rev 3401) +++ projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml 2008-12-17 20:58:23 UTC (rev 3412) @@ -10,7 +10,7 @@ xmlns:n="http://gravel.jboss.org/jsf/1.0/navigation" xmlns:j4j="http://jbpm.org/jbpm4jsf/core" > - <ui:composition template="../sa/t_loggedin.xhtml"> + <ui:composition template="../app/t_loggedin.xhtml"> <ui:define name="actions"> <ga:responseActions> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/sa/tasks_all.xhtml 2008-12-16 14:24:23 UTC (rev 3401) +++ projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml 2008-12-17 20:58:23 UTC (rev 3412) @@ -10,7 +10,7 @@ xmlns:n="http://gravel.jboss.org/jsf/1.0/navigation" xmlns:j4j="http://jbpm.org/jbpm4jsf/core" > - <ui:composition template="../sa/t_loggedin.xhtml"> + <ui:composition template="../app/t_loggedin.xhtml"> <ui:define name="actions"> <ga:responseActions> Modified: projects/jsf-console/trunk/console/src/main/webapp/index.jsp =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/index.jsp 2008-12-17 20:33:41 UTC (rev 3411) +++ projects/jsf-console/trunk/console/src/main/webapp/index.jsp 2008-12-17 20:58:23 UTC (rev 3412) @@ -1,10 +1,11 @@ <% final String queryString = request.getQueryString(); final String contextRoot = request.getContextPath(); - final String target = contextRoot + "/sa/processes.jsf"; + final String target = contextRoot + "/app/processes.jsf"; if (queryString != null && queryString.length() > 0) { response.sendRedirect(target + "?" + queryString); - } else { + } + else { response.sendRedirect(target); } %>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3411 - in jbpm4/trunk/modules: examples/src/test/resources/org/jbpm/examples/java and 2 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-12-17 15:33:41 -0500 (Wed, 17 Dec 2008) New Revision: 3411 Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JohnDoe.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JavaBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java Log: moved java.instantiate to java Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2008-12-17 20:33:41 UTC (rev 3411) @@ -0,0 +1,44 @@ +/* + * 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.examples.java; + +import org.jbpm.Execution; +import org.jbpm.test.DbTestCase; + + +/** + * @author Tom Baeyens + */ +public class JavaInstantiateTest extends DbTestCase { + + public void testJavaInstantiate() { + deployJpdlResource("org/jbpm/examples/java/process.jpdl.xml"); + + Execution execution = executionService.startExecutionByKey("Java"); + String executionId = execution.getId(); + + String answer = (String) executionService.getVariable(executionId, "answer"); + + assertEquals("I'm fine, thank you.", answer); + } + +} Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JohnDoe.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JohnDoe.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JohnDoe.java 2008-12-17 20:33:41 UTC (rev 3411) @@ -0,0 +1,43 @@ +/* + * 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.examples.java; + +import org.hibernate.Session; + + +/** + * @author Tom Baeyens + */ +public class JohnDoe { + + String state; + Session session; + + public String hello(String msg) { + if ( (msg.indexOf("how are you?")!=-1) + && (session.isOpen()) + ) { + return "I'm "+state+", thank you."; + } + return null; + } +} Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2008-12-17 20:33:41 UTC (rev 3411) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process name="Java" xmlns="http://jbpm.org/4/jpdl"> + + <start> + <flow to="invoke java method" /> + </start> + + <java name="invoke java method" + class="org.jbpm.examples.java.JohnDoe" + method="hello" + var="answer"> + + <field name="state"><string value="fine"/></field> + <field name="session"><env type="org.hibernate.Session"/></field> + + <arg><string value="Hi, how are you?"/></arg> + + <flow to="wait" /> + </java> + + <state name="wait" /> + +</process> Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JavaBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JavaBinding.java 2008-12-17 15:53:56 UTC (rev 3410) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JavaBinding.java 2008-12-17 20:33:41 UTC (rev 3411) @@ -26,11 +26,8 @@ import java.util.Set; import org.jbpm.pvm.internal.util.XmlUtil; -import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.internal.wire.binding.ObjectBinding; import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.internal.wire.descriptor.ReferenceDescriptor; import org.jbpm.pvm.internal.wire.operation.InvokeOperation; import org.jbpm.pvm.internal.wire.operation.Operation; import org.jbpm.pvm.internal.wire.xml.WireParser; @@ -99,25 +96,7 @@ javaActivity.setDescriptor(objectDescriptor); } - - String objectName = XmlUtil.attribute(element, "object"); - if (objectName!=null) { - Descriptor objectDescriptor = new ReferenceDescriptor(objectName); - javaActivity.setDescriptor(objectDescriptor); - } - - if ( (objectName!=null) - && (className!=null) - ) { - parse.addProblem("in <"+TAG+"...>, attributes object and class are mutually exclusive"); - } - - if ( (objectName!=null) - && (!XmlUtil.elements(element, "field").isEmpty()) - ) { - parse.addProblem("in <"+TAG+"...>, attribute object is mutually exclusive with field elements"); - } - + return javaActivity; } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-12-17 15:53:56 UTC (rev 3410) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-12-17 20:33:41 UTC (rev 3411) @@ -411,7 +411,8 @@ } // then check if we can create the object from a descriptor - if (wireDefinition.hasDescriptor(objectName)) { + boolean hasDescriptor = (wireDefinition!=null ? wireDefinition.hasDescriptor(objectName) : false); + if (hasDescriptor) { if (isUnderConstruction(objectName) || isUnderInitialization(objectName)) { throw new WireException("circular dependency for "+objectName);

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3410 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples and 12 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-12-17 10:53:56 -0500 (Wed, 17 Dec 2008) New Revision: 3410 Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/instantiate/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/instantiate/JavaInstantiateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/instantiate/JohnDoe.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/instantiate/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/instantiate/process.jpdl.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JavaActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JavaBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentRefBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java Modified: jbpm4/trunk/modules/api/src/main/resources/cfg.xsd jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveBinding.java jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/WireBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java Log: adding java instantiate Modified: jbpm4/trunk/modules/api/src/main/resources/cfg.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2008-12-17 14:55:23 UTC (rev 3409) +++ jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2008-12-17 15:53:56 UTC (rev 3410) @@ -163,7 +163,7 @@ </complexType> </element> - <element name="environment-ref"> + <element name="env-ref"> <annotation><documentation>Obtains the current environment. The environment is only available in objects declared inside the environment context. So it can't be used inside the session-factory context. @@ -1105,7 +1105,7 @@ <element ref="tns:class" /> <element ref="tns:context-ref" /> <element ref="tns:double" /> - <element ref="tns:environment-ref" /> + <element ref="tns:env-ref" /> <element ref="tns:process-engine-ref" /> <element ref="tns:false" /> <element ref="tns:float" /> Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-17 14:55:23 UTC (rev 3409) +++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-17 15:53:56 UTC (rev 3410) @@ -202,8 +202,10 @@ </element> <element name="java"> - <annotation><documentation>Instantiates java class with reflection, inject - values from the environment in the fields and execute a method. + <annotation><documentation>Invokes a method on a java object. + Either the java class is instantiated with reflection, or the + java object is fetched from the environment. Then values from the + environment are injected into the fields and a method is executed. </documentation></annotation> <complexType> <complexContent> @@ -217,22 +219,6 @@ </complexType> </element> - <element name="java-ref"> - <annotation><documentation>Invokes a method on a java object in the - environment. - </documentation></annotation> - <complexType> - <complexContent> - <extension base="tns:javaRefType"> - <sequence> - <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" /> - </sequence> - <attributeGroup ref="tns:nodeAttributes" /> - </extension> - </complexContent> - </complexType> - </element> -  <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" />  Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml 2008-12-17 14:55:23 UTC (rev 3409) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml 2008-12-17 15:53:56 UTC (rev 3410) @@ -136,6 +136,12 @@ </any> <property name="exposeType" column="BOOLVAL_" /> </subclass> + + <subclass name="EnvDescriptor" discriminator-value="env"> + <property name="objectName" column="TEXT_" /> + <property name="typeName" column="CLASSNAME_" /> + </subclass> + </class>  Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2008-12-17 14:55:23 UTC (rev 3409) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2008-12-17 15:53:56 UTC (rev 3410) @@ -16,7 +16,7 @@ "<environment-scopes>" + " <process-engine />" + " <environment>" + - " <environment-ref name='e' />" + + " <env-ref name='e' />" + " </environment>" + "</environment-scopes>" ); Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-17 14:55:23 UTC (rev 3409) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-17 15:53:56 UTC (rev 3410) @@ -160,14 +160,17 @@ assertTrue("message " + i + " is not failed once: " + failOnceMessageIds, failOnceMessageIds.contains(i)); } assertEquals(nbrOfTestMessages, failOnceMessageIds.size()); + + log.debug("==== all messages processed, now checking if all messages have arrived exactly once ===="); commandService.execute(new Command<Object>() { public Object execute(Environment environment) throws Exception { Session session = environment.get(Session.class); List<Comment> comments = session.createQuery("from " + CommentImpl.class.getName()).list(); - + for (Comment comment : comments) { + log.debug("retrieved message: "+comment.getMessage()); Integer messageId = new Integer(comment.getMessage()); assertTrue("message " + messageId + " committed twice", failOnceMessageIds.remove(messageId)); }

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3409 - jbpm3/trunk.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-17 09:55:23 -0500 (Wed, 17 Dec 2008) New Revision: 3409 Modified: jbpm3/trunk/pom.xml Log: Use jboss.bpm.spec.version 1.0.0-Alpha3 Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-12-17 14:38:47 UTC (rev 3408) +++ jbpm3/trunk/pom.xml 2008-12-17 14:55:23 UTC (rev 3409) @@ -73,7 +73,7 @@ <jbpm.designer.version>3.1.5</jbpm.designer.version> <jbpm.gwt-console.version>1.0.0-SNAPSHOT</jbpm.gwt-console.version> <jbpm.jsf-console.version>3.3.1-SNAPSHOT</jbpm.jsf-console.version> - <jboss.bpm.spec.version>1.0.0-SNAPSHOT</jboss.bpm.spec.version> + <jboss.bpm.spec.version>1.0.0-Alpha3</jboss.bpm.spec.version> <jboss.client.version>4.2.2.GA</jboss.client.version> <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <jboss.seam.version>2.0.2.GA</jboss.seam.version>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3408 - in projects/spec: tags and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-17 09:38:47 -0500 (Wed, 17 Dec 2008) New Revision: 3408 Added: projects/spec/tags/jbpm-spec-1.0.0-Alpha3/ Removed: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/ Log: Release jbpm-spec-1.0.0-Alpha3 Copied: projects/spec/tags/jbpm-spec-1.0.0-Alpha3 (from rev 3407, projects/spec/branches/jbpm-spec-1.0.0-Alpha3)

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3407 - in projects/spec/branches/jbpm-spec-1.0.0-Alpha3: modules/api and 13 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-17 09:38:04 -0500 (Wed, 17 Dec 2008) New Revision: 3407 Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/api/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/cts/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/api10/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/jpdl32/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/stp/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/xpdl21/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/jboss42/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/jboss50/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/ri/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/client/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/server/pom.xml projects/spec/branches/jbpm-spec-1.0.0-Alpha3/pom.xml Log: version=1.0.0-Alpha3 Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/api/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/api/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/api/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -21,7 +21,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/cts/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/cts/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/cts/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -22,7 +22,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/api10/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/api10/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/api10/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -22,7 +22,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-dialects</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../pom.xml</relativePath> </parent> </project> \ No newline at end of file Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/jpdl32/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/jpdl32/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/jpdl32/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -22,7 +22,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-dialects</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -21,7 +21,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/stp/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/stp/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/stp/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -21,7 +21,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-dialects</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/xpdl21/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/xpdl21/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/dialects/xpdl21/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -22,7 +22,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-dialects</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../pom.xml</relativePath> </parent> </project> \ No newline at end of file Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/jboss42/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/jboss42/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/jboss42/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -24,7 +24,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-integration</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/jboss50/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/jboss50/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/jboss50/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -24,7 +24,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-integration</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/integration/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -24,7 +24,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/ri/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/ri/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/ri/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -24,7 +24,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/client/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/client/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/client/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-sample-airticket</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> </parent>  Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -5,12 +5,12 @@ <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-sample-airticket</artifactId> <packaging>pom</packaging> - +  <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/server/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/server/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/modules/samples/airticket/server/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -22,7 +22,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-sample-airticket</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/pom.xml =================================================================== --- projects/spec/branches/jbpm-spec-1.0.0-Alpha3/pom.xml 2008-12-17 14:22:42 UTC (rev 3406) +++ projects/spec/branches/jbpm-spec-1.0.0-Alpha3/pom.xml 2008-12-17 14:38:04 UTC (rev 3407) @@ -22,7 +22,7 @@ <artifactId>bpm-spec</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-Alpha3</version>  <parent>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3406 - projects/spec/branches.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-17 09:22:42 -0500 (Wed, 17 Dec 2008) New Revision: 3406 Added: projects/spec/branches/jbpm-spec-1.0.0-Alpha3/ Log: Branch jbpm-spec-1.0.0.Alpha3 Copied: projects/spec/branches/jbpm-spec-1.0.0-Alpha3 (from rev 3405, projects/spec/trunk)

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3405 - jbpm3/trunk/modules/enterprise/scripts.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-17 02:26:02 -0500 (Wed, 17 Dec 2008) New Revision: 3405 Modified: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml Log: Include inner classes in test war Modified: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml =================================================================== --- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-12-16 19:56:45 UTC (rev 3404) +++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-12-17 07:26:02 UTC (rev 3405) @@ -32,8 +32,8 @@ </classes> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jbpm/enterprise/config/AppServerConfigurationsTest.class"/> - <include name="org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.class"/> - <include name="org/jbpm/enterprise/jms/JmsMessageTest.class"/> + <include name="org/jbpm/enterprise/ejbtimer/EjbSchedulerTest*.class"/> + <include name="org/jbpm/enterprise/jms/JmsMessageTest*.class"/> <include name="org/jbpm/enterprise/jta/JtaDbPersistenceTest.class"/> </classes> <lib dir="${tests.output.dir}/test-dependencies">

17 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits December 2008