[jbpm-commits] JBoss JBPM SVN: r6092 - in projects/jsf-console/branches/jsf-console-3.3.1.SP: console and 14 other directories.

Author: alex.guizar(a)jboss.com Date: 2010-01-18 18:27:37 -0500 (Mon, 18 Jan 2010) New Revision: 6092 Added: projects/jsf-console/branches/jsf-console-3.3.1.SP/.project projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.classpath projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.project projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/pom.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/web.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/index.html projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/jbpm.css projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/.project Removed: projects/jsf-console/branches/jsf-console-3.3.1.SP/console/.classpath projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/java/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.classpath projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.project projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/pom.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/web.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/index.html projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/jbpm.css Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/ projects/jsf-console/branches/jsf-console-3.3.1.SP/console/.project projects/jsf-console/branches/jsf-console-3.3.1.SP/console/pom.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/webapp/WEB-INF/jboss-web.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/webapp/WEB-INF/web.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/jbpm4jsf/.classpath projects/jsf-console/branches/jsf-console-3.3.1.SP/jbpm4jsf/pom.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/pom.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/ projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/pom.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/src/main/webapp/WEB-INF/jboss-web.xml projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/src/main/webapp/WEB-INF/web.xml Log: SOA-1586: secure gpd deployer, patch for jsf-console 3.3.1.GA Property changes on: projects/jsf-console/branches/jsf-console-3.3.1.SP ___________________________________________________________________ Name: svn:ignore + .settings Added: projects/jsf-console/branches/jsf-console-3.3.1.SP/.project =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/.project (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/.project 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jsf-console-parent</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/console/.classpath =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/console/.classpath 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/console/.classpath 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/console/.project =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/console/.project 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/console/.project 2010-01-18 23:27:37 UTC (rev 6092) @@ -6,7 +6,6 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> @@ -17,7 +16,6 @@ </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/console/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/console/pom.xml 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/console/pom.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ====================================================================== --> +<!-- jBPM: Workflow in Java --> <!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> <!-- Distributable under LGPL license. --> <!-- See terms of license at http://www.gnu.org. --> -<!-- --> <!-- ====================================================================== --> <!-- $Id$ --> -<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"> + +<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> <groupId>org.jbpm.jbpm3</groupId> @@ -27,11 +27,11 @@ <!-- Dependencies --> <dependencies> - <!-- jBPM Dependencies --> + <!-- Compile Dependencies --> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console-jbpm4jsf</artifactId> - <version>${version}</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> @@ -39,93 +39,53 @@ </exclusion> </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> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> <!-- Provided Dependencies --> <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> </dependencies> - <!-- Plugins --> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <showDeprecation>false</showDeprecation> - </configuration> - </plugin> - </plugins> - <finalName>jsf-console</finalName> - </build> - <profiles> <profile> <id>soa</id> + + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>soa-webapp</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + </dependencies> + <build> - <plugins> + <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <classifier>soa</classifier> - </configuration> - </execution> - </executions> <configuration> + <classifier>soa</classifier> + <primaryArtifact>false</primaryArtifact> <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> - <!-- empty groupId/artifactId detected as the current build --> - </overlay> + <!-- empty groupId/artifactId means the current build --> + </overlay> </overlays> </configuration> - </plugin> + </plugin> </plugins> </build> </profile> - </profiles> </project> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/webapp/WEB-INF/jboss-web.xml 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/webapp/WEB-INF/jboss-web.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,10 +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> <!-- - Specify the security domain to use. This will be java:/jaas/<name> where + Specify the security domain to use. This will be java:/jaas/<name> where <name> is one of the names configured in your login-config.xml. --> <security-domain>java:/jaas/jbpm-console</security-domain> @@ -20,11 +21,11 @@ <jndi-name>java:JmsXA</jndi-name> </resource-ref> - <ejb-ref> + <ejb-local-ref> <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> - <jndi-name>java:ejb/TimerEntityBean</jndi-name> - </ejb-ref> - + <local-jndi-name>java:jbpm/TimerEntityBean</local-jndi-name> + </ejb-local-ref> + <!-- workaround for "mapped-name is required" exception in JBoss 5.0.0.CR1 --> <message-destination-ref> <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/webapp/WEB-INF/web.xml 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/console/src/main/webapp/WEB-INF/web.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,17 +1,10 @@ <?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"> +<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"> - <!-- - * Force initialization of the hibernate sessions in jbpm. - * This will create the DB tables on new installations. - * If that's not needed the listener can be removed. - --> - <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> + <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> @@ -30,13 +23,13 @@ </servlet-mapping> <context-param> - <description> Use Documents Saved as *.xhtml </description> + <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> + <description>Facelets debug output</description> <param-name>facelets.DEVELOPMENT</param-name> <param-value>false</param-value> </context-param> @@ -46,21 +39,9 @@ <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> - <!-- - This role list should be changed to include all the relevant roles for your - environment. + This role list should be changed to include all the relevant roles for your + environment. --> <security-role> <role-name>admin</role-name> @@ -70,8 +51,9 @@ </security-role> <!-- - Security constraints - optionally customize the role name to require a login before access is allowed to the application. Also, be sure to edit jboss-web.xml to - configure the security domain if you are deploying inside JBoss AS. + Security constraints - optionally customize the role name to require a login + before access is allowed. Also, be sure to edit jboss-web.xml to configure + the security domain if you are deploying inside JBoss AS. --> <security-constraint> <web-resource-collection> @@ -85,7 +67,7 @@ </auth-constraint> </security-constraint> - <!-- Example Login page - lists user names --> + <!-- Example Login page - lists sample users --> <login-config> <auth-method>FORM</auth-method> <form-login-config> @@ -94,79 +76,69 @@ </form-login-config> </login-config> - <!-- Login configuration option #1 - use the login page ==> - <login-config> - <auth-method>FORM</auth-method> + <!-- Login configuration option #1 - use the login page ==> + <login-config> + <auth-method>FORM</auth-method> <form-login-config> - <form-login-page>/ua/login.jsf</form-login-page> - <form-error-page>/ua/login.jsf?error=true</form-error-page> - </form-login-config> - </login-config> + <form-login-page>/ua/login.jsf</form-login-page> + <form-error-page>/ua/login.jsf?error=true</form-error-page> + </form-login-config> + </login-config> <!== Login configuration option #1 --> - <!-- - Login configuration option #2 - use basic auth ==> - <login-config> - <auth-method>BASIC</auth-method> + <!-- Login configuration option #2 - use basic auth ==> + <login-config> + <auth-method>BASIC</auth-method> <realm-name>jBPM Administration Console</realm-name> - </login-config> + </login-config> <!== Login configuration option #2 --> - <!-- Job executor launcher ==> - <listener> - <description> - Starts the job executor on servlet context initialization and stops it on servlet context destruction. - </description> - <listener-class>org.jbpm.web.JobExecutorLauncher</listener-class> - </listener> <!== Job executor launcher --> - + <!-- Job executor launcher ==> <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> + Starts the job executor on initialization and stops it on destruction. + </description> + <listener-class>org.jbpm.web.JobExecutorLauncher</listener-class> + </listener> + <!== Job executor launcher --> + + <listener> + <description>Closes the jBPM configuration on destruction, releasing 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> + <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> + <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-local-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> + <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home> + <local>org.jbpm.ejb.LocalTimerEntity</local> + </ejb-local-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> + <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> Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer) Property changes on: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer ___________________________________________________________________ Name: svn:ignore + .settings target Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.classpath =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath 2010-01-18 15:01:34 UTC (rev 6088) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.classpath 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.classpath (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath) =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.classpath (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.classpath 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.project =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project 2010-01-18 15:01:34 UTC (rev 6088) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.project 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>gpd-deployer</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.project (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project) =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.project (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/.project 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>gpd-deployer</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml 2010-01-18 15:01:34 UTC (rev 6088) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/pom.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- jBPM: Workflow in Java --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<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 - GPD Deployer</name> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>gpd-deployer</artifactId> - <packaging>war</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console-parent</artifactId> - <version>3.2.8</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <!-- Provided Dependencies --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/pom.xml (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml) =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/pom.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/pom.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- jBPM: Workflow in Java --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<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 - GPD Deployer</name> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>gpd-deployer</artifactId> + <packaging>war</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jsf-console-parent</artifactId> + <version>3.3.1.GA</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <!-- Provided Dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src) Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main) Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java) Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org) Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm) Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web) Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2010-01-18 15:01:34 UTC (rev 6088) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,168 +0,0 @@ -/* - * 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.web; - -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.net.MalformedURLException; -import java.util.zip.ZipInputStream; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.fileupload.FileItemIterator; -import org.apache.commons.fileupload.FileItemStream; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; -import org.jbpm.graph.def.ProcessDefinition; - -public class ProcessUploadServlet extends javax.servlet.http.HttpServlet { - - private static final long serialVersionUID = 1L; - - private JbpmConfiguration jbpmConfiguration; - - public void init() throws ServletException { - String jbpmCfgResource = getServletContext().getInitParameter("jbpm.configuration.resource"); - jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource); - } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - if (log.isTraceEnabled()) log.trace("handling status request"); - - PrintWriter out = response.getWriter(); - writeHeader(out); - out.println("<p>GPD deployer is operational</p>"); - writeTrailer(out); - } - - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - if (log.isTraceEnabled()) log.trace("handling upload request"); - - try { - InputStream processStream = parseRequest(request, response); - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try { - ProcessDefinition processDefinition = parseProcessArchive(processStream); - deployProcessDefinition(processDefinition, response); - } - finally { - jbpmContext.close(); - } - } - catch (FileUploadException e) { - response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage()); - } - } - - private void writeHeader(PrintWriter out) throws MalformedURLException { - out.println("<html>"); - out.println("<head>"); - out.println("<title>Process Deployment</title>"); - out.print("<link rel='stylesheet' type='text/css' href='"); - out.print(getServletContext().getContextPath()); - out.println("/jbpm.css'/>"); - out.println("</head>"); - out.println("<body>"); - } - - private void writeTrailer(PrintWriter out) { - out.println("</body>"); - out.println("</html>"); - } - - private InputStream parseRequest(HttpServletRequest request, - HttpServletResponse response) throws IOException, FileUploadException { - // check if request is multipart content - if (!ServletFileUpload.isMultipartContent(request)) - throw new FileUploadException("request does not carry multipart content"); - - // Create a new file upload handler - ServletFileUpload upload = new ServletFileUpload(); - // Parse the request - for (FileItemIterator i = upload.getItemIterator(request); i.hasNext();) { - FileItemStream part = i.next(); - if (!part.isFormField()) { - if (log.isTraceEnabled()) - log.trace("retrieved file " + part.getName()); - return part.openStream(); - } - } - - // no file found, bang - throw new FileUploadException("request contains no file"); - } - - private ProcessDefinition parseProcessArchive(InputStream processStream) - throws IOException { - ZipInputStream processArchiveStream = new ZipInputStream(processStream); - try { - ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processArchiveStream); - if (log.isTraceEnabled()) - log.trace("parsed process definition " + processDefinition.getName()); - return processDefinition; - } - finally { - processArchiveStream.close(); - } - } - - private void deployProcessDefinition(ProcessDefinition processDefinition, - HttpServletResponse response) throws IOException { - String processName = processDefinition.getName(); - JbpmContext jbpmContext = jbpmConfiguration.getCurrentJbpmContext(); - try { - jbpmContext.deployProcessDefinition(processDefinition); - - if (log.isTraceEnabled()) - log.trace("deployed process definition " + processName); - - PrintWriter out = response.getWriter(); - writeHeader(out); - out.println("<h3>Deployment report</h3>"); - out.print("<p>Process <em>"); - out.print(processName); - out.println("</em> was deployed successfully</p>"); - out.print("<p><a href='"); - out.print(getServletContext().getContextPath()); - out.println("/index.html'>Deploy another process</a></p>"); - writeTrailer(out); - } - catch (RuntimeException e) { - jbpmContext.setRollbackOnly(); - - log.error("failed to deploy process definition " + processName, e); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to deploy process"); - } - } - - private static final Log log = LogFactory.getLog(ProcessUploadServlet.class); -} \ No newline at end of file Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java) =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,168 @@ +/* + * 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.web; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.MalformedURLException; +import java.util.zip.ZipInputStream; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.fileupload.FileItemIterator; +import org.apache.commons.fileupload.FileItemStream; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.jbpm.JbpmConfiguration; +import org.jbpm.JbpmContext; +import org.jbpm.graph.def.ProcessDefinition; + +public class ProcessUploadServlet extends javax.servlet.http.HttpServlet { + + private static final long serialVersionUID = 1L; + + private JbpmConfiguration jbpmConfiguration; + + public void init() throws ServletException { + String jbpmCfgResource = getServletContext().getInitParameter("jbpm.configuration.resource"); + jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource); + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + if (log.isTraceEnabled()) log.trace("handling status request"); + + PrintWriter out = response.getWriter(); + writeHeader(out); + out.println("<p>GPD deployer is operational</p>"); + writeTrailer(out); + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + if (log.isTraceEnabled()) log.trace("handling upload request"); + + try { + InputStream processStream = parseRequest(request, response); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + ProcessDefinition processDefinition = parseProcessArchive(processStream); + deployProcessDefinition(processDefinition, response); + } + finally { + jbpmContext.close(); + } + } + catch (FileUploadException e) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage()); + } + } + + private void writeHeader(PrintWriter out) throws MalformedURLException { + out.println("<html>"); + out.println("<head>"); + out.println("<title>Process Deployment</title>"); + out.print("<link rel='stylesheet' type='text/css' href='"); + out.print(getServletContext().getContextPath()); + out.println("/jbpm.css'/>"); + out.println("</head>"); + out.println("<body>"); + } + + private void writeTrailer(PrintWriter out) { + out.println("</body>"); + out.println("</html>"); + } + + private InputStream parseRequest(HttpServletRequest request, + HttpServletResponse response) throws IOException, FileUploadException { + // check if request is multipart content + if (!ServletFileUpload.isMultipartContent(request)) + throw new FileUploadException("request does not carry multipart content"); + + // Create a new file upload handler + ServletFileUpload upload = new ServletFileUpload(); + // Parse the request + for (FileItemIterator i = upload.getItemIterator(request); i.hasNext();) { + FileItemStream part = i.next(); + if (!part.isFormField()) { + if (log.isTraceEnabled()) + log.trace("retrieved file " + part.getName()); + return part.openStream(); + } + } + + // no file found, bang + throw new FileUploadException("request contains no file"); + } + + private ProcessDefinition parseProcessArchive(InputStream processStream) + throws IOException { + ZipInputStream processArchiveStream = new ZipInputStream(processStream); + try { + ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processArchiveStream); + if (log.isTraceEnabled()) + log.trace("parsed process definition " + processDefinition.getName()); + return processDefinition; + } + finally { + processArchiveStream.close(); + } + } + + private void deployProcessDefinition(ProcessDefinition processDefinition, + HttpServletResponse response) throws IOException { + String processName = processDefinition.getName(); + JbpmContext jbpmContext = jbpmConfiguration.getCurrentJbpmContext(); + try { + jbpmContext.deployProcessDefinition(processDefinition); + + if (log.isTraceEnabled()) + log.trace("deployed process definition " + processName); + + PrintWriter out = response.getWriter(); + writeHeader(out); + out.println("<h3>Deployment report</h3>"); + out.print("<p>Process <em>"); + out.print(processName); + out.println("</em> was deployed successfully</p>"); + out.print("<p><a href='"); + out.print(getServletContext().getContextPath()); + out.println("/index.html'>Deploy another process</a></p>"); + writeTrailer(out); + } + catch (RuntimeException e) { + jbpmContext.setRollbackOnly(); + + log.error("failed to deploy process definition " + processName, e); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to deploy process"); + } + } + + private static final Log log = LogFactory.getLog(ProcessUploadServlet.class); +} \ No newline at end of file Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp) Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF) Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml 2010-01-18 15:01:34 UTC (rev 6088) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,17 +0,0 @@ -<?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> - <!-- - Specify the security domain to use. This will be java:/jaas/<name> where - <name> is one of the names configured in your login-config.xml. - --> - <security-domain>java:/jaas/jbpm-console</security-domain> - - <resource-ref> - <res-ref-name>jdbc/JbpmDataSource</res-ref-name> - <jndi-name>java:JbpmDS</jndi-name> - </resource-ref> -</jboss-web> Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml) =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,17 @@ +<?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> + <!-- + Specify the security domain to use. This will be java:/jaas/<name> where + <name> is one of the names configured in your login-config.xml. + --> + <security-domain>java:/jaas/jbpm-console</security-domain> + + <resource-ref> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <jndi-name>java:JbpmDS</jndi-name> + </resource-ref> +</jboss-web> Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/web.xml 2010-01-18 15:01:34 UTC (rev 6088) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/web.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,51 +0,0 @@ -<?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"> - <servlet> - <description>Server counterpart for the Graphical Process Designer - deployment feature.</description> - <servlet-name>GPD Deployer Servlet</servlet-name> - <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>GPD Deployer Servlet</servlet-name> - <url-pattern>/upload/*</url-pattern> - </servlet-mapping> - - <security-role> - <description>This role list should be changed to include all the relevant - roles for your environment.</description> - <role-name>admin</role-name> - </security-role> - - <security-constraint> - <web-resource-collection> - <web-resource-name>Secure Area</web-resource-name> - <description>If you are deploying to JBoss AS, be sure to specify the - security domain in jboss-web.xml.</description> - <url-pattern>/upload/*</url-pattern> - <http-method>POST</http-method> - </web-resource-collection> - <auth-constraint> - <description>Optionally customize the role name to require a login before - access is allowed to the application.</description> - <role-name>admin</role-name> - </auth-constraint> - </security-constraint> - - <login-config> - <auth-method>BASIC</auth-method> - <realm-name>jBPM GPD Deployer</realm-name> - </login-config> - - <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> -</web-app> Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/web.xml (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/web.xml) =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/web.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/WEB-INF/web.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,51 @@ +<?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"> + <servlet> + <description>Server counterpart for the Graphical Process Designer + deployment feature.</description> + <servlet-name>GPD Deployer Servlet</servlet-name> + <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>GPD Deployer Servlet</servlet-name> + <url-pattern>/upload/*</url-pattern> + </servlet-mapping> + + <security-role> + <description>This role list should be changed to include all the relevant + roles for your environment.</description> + <role-name>admin</role-name> + </security-role> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Secure Area</web-resource-name> + <description>If you are deploying to JBoss AS, be sure to specify the + security domain in jboss-web.xml.</description> + <url-pattern>/upload/*</url-pattern> + <http-method>POST</http-method> + </web-resource-collection> + <auth-constraint> + <description>Optionally customize the role name to require a login before + access is allowed to the application.</description> + <role-name>admin</role-name> + </auth-constraint> + </security-constraint> + + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>jBPM GPD Deployer</realm-name> + </login-config> + + <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> +</web-app> Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/index.html =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/index.html 2010-01-18 15:01:34 UTC (rev 6088) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/index.html 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,13 +0,0 @@ -<html> -<head> -<title>Process Deployment</title> -<link rel="stylesheet" type="text/css" href="jbpm.css" /> -</head> -<body> -<h3>Deploy a Process</h3> -<form action="upload" method="post" enctype="multipart/form-data"> -<p>Process archive: <input type="file" name="process-archive" /></p> -<p><input type="submit" name="deploy-button" value="Deploy" /></p> -</form> -</body> -</html> \ No newline at end of file Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/index.html (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/index.html) =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/index.html (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/index.html 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,13 @@ +<html> +<head> +<title>Process Deployment</title> +<link rel="stylesheet" type="text/css" href="jbpm.css" /> +</head> +<body> +<h3>Deploy a Process</h3> +<form action="upload" method="post" enctype="multipart/form-data"> +<p>Process archive: <input type="file" name="process-archive" /></p> +<p><input type="submit" name="deploy-button" value="Deploy" /></p> +</form> +</body> +</html> \ No newline at end of file Deleted: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/jbpm.css =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/jbpm.css 2010-01-18 15:01:34 UTC (rev 6088) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/jbpm.css 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,567 +0,0 @@ -/********************************************************** - General styles -***********************************************************/ -body { - font-weight:normal; - font-family:verdana,sans-serif; - font-size:10pt; - background-repeat:no-repeat; - margin:0; - border-width:0; - padding:0; -} - -html { - background-attachment:scroll; - background-repeat:no-repeat; - margin:0; - padding:0; - border-width:0; -} - -button, input, select, option, textarea { - font-family:arial,helvetica,sans-serif; - font-weight:normal; - font-size:10pt; - line-height:normal; -} - -select { - vertical-align:top; -} - -form { - display:inline; -} - -h1, h2, h3, h4, h5, h6 { - display:inline; -} - -h1 { - font-size:16pt; -} - -h2 { - font-size:14pt; -} - -h3 { - font-size:12pt; -} - -h4 { - font-size:10pt; -} - -h5 { - font-size:8pt; -} - -h6 { - font-size:6pt; -} - -a { - cursor: pointer; - color: rgb(110, 110, 170); - text-decoration: underline; -} - -a:hover { - color: rgb(160, 160, 255); -} - -div.hr { - border-style:none; - border-width:0; - background:#c0c0c0; - margin-left:3px; - margin-right:3px; - height:2px; - font-size:0; - margin-top:6px; - margin-bottom:10px; -} - -b { - font-weight:bold; -} - -table.layout { - margin:0; - padding:0; - border-collapse:collapse; -} - -table.layout td { - margin:0; - padding:0; -} - -table.layout td.layoutmenu { - vertical-align:top; - margin:0; - padding:0; - width:240px; - background:#dddddd; - border-right-width:1px; - border-right-style:solid; - border-right-color:#000000; - border-top-width:1px; - border-top-style:solid; - border-top-color:#000000; - border-bottom-width:1px; - border-bottom-style:solid; - border-bottom-color:#000000; - border-collapse:collapse; -} - -table.layout td.layoutbody { - vertical-align:top; - padding:10px; - background:#ffffff; - width:100%; - border-top-width:1px; - border-top-style:solid; - border-top-color:#000000; - border-bottom-width:1px; - border-bottom-style:solid; - border-bottom-color:#000000; - border-collapse:collapse; -} - -table.layout td.layoutheader { - background:#dddddd; - border-top-width:1px; - border-top-style:solid; - border-top-color:#000000; - border-bottom-width:1px; - border-bottom-style:solid; - border-bottom-color:#000000; - border-collapse:collapse; -} - -table.layout td.layoutfooter { - text-align:center; - font-size:10px; - background:#dddddd; - border-top-width:1px; - border-top-style:solid; - border-top-color:#000000; - border-bottom-width:1px; - border-bottom-style:solid; - border-bottom-color:#000000; - border-collapse:collapse; -} - -table.leftmenu { - border-width:0; - border-bottom-width:1px; - border-collapse:collapse; - border-color:#000000; - width:200px; -} - -tr.leftmenuheader th.nf { - border-top-width:1px; - border-top-style:solid; - border-top-color:#000000; -} - -tr.leftmenuheader th { - padding-left:3px; - padding-right:3px; - background-color:#990000; - color:#ffff99; - font-size:12px; - border-bottom-width:1px; - border-bottom-style:solid; - border-bottom-color:#000000; -} - -tr.leftmenu th { - vertical-align:top; - padding:3px; - text-align:left; - text-decoration:none; - font-size:11px; - white-space:nowrap; - background:#444444; - color:#ffffff; -} - -tr.leftmenu td { - vertical-align:top; - padding:3px; - text-align:left; - text-decoration:none; - font-size:12px; - white-space:nowrap; - background:#dddddd; -} - -tr.leftmenu td ul { - /*list-style-position:inside;*/ - margin:0; - padding:0; - padding-left:16px; - vertical-align:bottom; - list-style-image:url( "../images/bullet.gif" ); -} - -.statusSuspended { - color:#aa6600; - font-weight:bold; -} - -.statusRunning { - color:#00cc00; - font-weight:bold; -} - -.statusEnded { - color:#cc0000; - font-weight:bold; -} - -.statusNotstarted { - color:#0066aa; - font-weight:bold; -} - -a.headermenu { - padding-left:8px; - padding-right:8px; - text-decoration:none; - color:#cc0000; - border-left-width:1px; - border-left-style:solid; - border-left-color:#888888; -} - -a.headermenufirst { - padding-left:8px; - padding-right:8px; - text-decoration:none; - color:#cc0000; -} - -a.headermenu:hover, a.headermenufirst:hover { - background:#ffffff; - color:#cc0000; -} - -table.results { - border-width:1px; - border-style:solid; - border-color:#000000; - border-collapse:collapse; - margin-left:auto; - margin-right:auto; -} - -table.results td, table.results th { - padding:3px; - font-size:11px; -} - -table.results thead tr { - cursor:default; -} - -table.results thead tr th { - text-align:left; - background-color:#990000; - color:#ffff99; - font-size:12px; - border-bottom-style:solid; - border-bottom-width:1px; - border-bottom-color:#000000; -} - -table.results thead tr th b { - font-weight:normal; -} - -table.results thead tr td { - text-align:left; - background-color:#dddddd; - color:#990000; - font-weight:bold; - border-bottom-style:solid; - border-bottom-width:1px; - border-bottom-color:#000000; -} - -table.results tbody.results tr { - background-color:#dddddd; -} - -table.results tbody.results tr.even { - background-color:#ddddbb; -} - -table.results tbody.results tr.odd { - background-color:#ffffdd; -} - -table.results tbody.filter td { - text-align:left; - font-size:10px; - padding-bottom:1px; - padding-top:1px; - font-weight:normal; - background-color:#cccccc; - border-bottom-style:solid; - border-bottom-width:1px; - border-bottom-color:#000000; -} - -table.results td { - border-right-width:1px; - border-right-style:solid; - border-right-color:#000000; -} - -table.results tbody.results th { - padding:3px; - text-align:left; - text-decoration:none; - font-size:11px; - white-space:nowrap; - background:#444444; - color:#ffffff; -} - -table.results tbody.action tr { - background-color:#dddddd; -} - -table.results tbody.action tr td { - border-top-color:#000000; - border-top-style:solid; - border-top-width:1px; -} - -table.msgs { - margin-left:auto; - margin-right:auto; - margin-bottom:15px; - border-width:1px; - border-style:solid; - border-collapse:collapse; - border-color:#000000; - font-size:10px; - width:400px; -} - -table.msgs td { - padding-left:8px; - padding-right:8px; - border-bottom-width:1px; - border-bottom-color:#000000; - border-bottom-style:dotted; -} - -table.msgs thead th { - font-size:11px; -} - -table.error thead th { - background-color:#cc0000; - color:#ffffff; -} - -table.fatal thead th { - background-color:#cc0000; - color:#ffffff; -} - -table.warn thead th { - background-color:#cccc00; - color:#ffffff; -} - -table.info thead th { - background-color:#0000cc; - color:#ffffff; -} - -.hidden { - display:none; -} - -div.pbox, div.pbox_s, div.pbox_e { - position:absolute; - border-width:1px; - border-style:solid; -} - -div.pbox { - border-color:#0000ff; -} - -div.pbox_s { - border-color:#aa6600; -} - -div.pbox_e { - border-color:#cc0000; -} - -div.pboxs, div.pboxs_s, div.pboxs_e { - position:absolute; - border-right-width:1px; - border-right-style:solid; - border-bottom-width:1px; - border-bottom-style:solid; -} - -div.pboxs { - border-right-color:#9999ff; - border-bottom-color:#9999ff; -} - -div.pboxs_s { - border-right-color:#ffaa99; - border-bottom-color:#ffaa99; -} - -div.pboxs_e { - border-right-color:#660000; - border-bottom-color:#660000; -} - -div.pboxce { - position:absolute; - overflow:hidden; -} - -div.pboxc, div.pboxc_s, div.pboxc_e { - cursor:default; - font-size:10px; - white-space:nowrap; - color:#ffffff; - padding-left:3px; - padding-right:3px; - border-width:1px; - border-style:solid; -} - -div.pboxc { - border-color:#0000ff; - background-color:#0000ff; -} - -div.pboxc_s { - border-color:#aa6600; - background-color:#aa6600; -} - -div.pboxc_e { - border-color:#cc0000; - background-color:#cc0000; -} - -div.pboxc a, div.pboxc_s a, div.pboxc_e a { - color:#ffffff; - text-decoration:none; -} - -div.pboxc a:hover, div.pboxc_s a:hover, div.pboxc_e a:hover { - text-decoration:underline; -} - -span.comment { - display:block; - padding-top:3px; - padding-bottom:3px; - padding-left:4px; - padding-right:4px; - border-width:1px; - border-color:#990000; - border-style:solid; - border-collapse:collapse; - margin-left:5px; - margin-right:5px; - background-color:#ffffff; - font-family:arial,helvetica,sans-serif; - margin-top:4px; - margin-bottom:4px; - overflow:auto; -} - -textarea.comment { - width:480px; - height:80px; -} - -/* task forms */ - -table.dataform { - border-style:solid; - border-width:1px; - border-collapse:collapse; - border-color:#000000; - margin-left:auto; - margin-right:auto; -} - -table.dataform td, table.dataform th { - padding-top:3px; - padding-bottom:3px; - padding-left:5px; - padding-right:5px; -} - -table.dataform thead tr th { - text-align:left; - background-color:#990000; - color:#ffff99; - font-weight:bold; - border-bottom-style:solid; - border-bottom-width:1px; - border-bottom-color:#000000; -} - -table.dataform tbody th { - text-align:left; - text-decoration:none; - font-size:11px; - white-space:nowrap; - background:#444444; - color:#ffffff; - border-bottom-style:solid; - border-bottom-width:1px; - border-bottom-color:#000000; - border-collapse:collapse; - width:130px; -} - -table.dataform tbody td { - text-align:left; - text-decoration:none; - font-size:11px; - white-space:nowrap; - background:#dddddd; - color:#000000; - border-bottom-style:solid; - border-bottom-width:1px; - border-bottom-color:#000000; - border-collapse:collapse; - width:260px; -} - -a.pager { - color:#aaaaff; -} - -a.pager:hover { - color:#ffffff; -} - -span.pager { - font-weight:normal; - color:#999999; -} \ No newline at end of file Copied: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/jbpm.css (from rev 6088, projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/jbpm.css) =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/jbpm.css (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/webapp/jbpm.css 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,567 @@ +/********************************************************** + General styles +***********************************************************/ +body { + font-weight:normal; + font-family:verdana,sans-serif; + font-size:10pt; + background-repeat:no-repeat; + margin:0; + border-width:0; + padding:0; +} + +html { + background-attachment:scroll; + background-repeat:no-repeat; + margin:0; + padding:0; + border-width:0; +} + +button, input, select, option, textarea { + font-family:arial,helvetica,sans-serif; + font-weight:normal; + font-size:10pt; + line-height:normal; +} + +select { + vertical-align:top; +} + +form { + display:inline; +} + +h1, h2, h3, h4, h5, h6 { + display:inline; +} + +h1 { + font-size:16pt; +} + +h2 { + font-size:14pt; +} + +h3 { + font-size:12pt; +} + +h4 { + font-size:10pt; +} + +h5 { + font-size:8pt; +} + +h6 { + font-size:6pt; +} + +a { + cursor: pointer; + color: rgb(110, 110, 170); + text-decoration: underline; +} + +a:hover { + color: rgb(160, 160, 255); +} + +div.hr { + border-style:none; + border-width:0; + background:#c0c0c0; + margin-left:3px; + margin-right:3px; + height:2px; + font-size:0; + margin-top:6px; + margin-bottom:10px; +} + +b { + font-weight:bold; +} + +table.layout { + margin:0; + padding:0; + border-collapse:collapse; +} + +table.layout td { + margin:0; + padding:0; +} + +table.layout td.layoutmenu { + vertical-align:top; + margin:0; + padding:0; + width:240px; + background:#dddddd; + border-right-width:1px; + border-right-style:solid; + border-right-color:#000000; + border-top-width:1px; + border-top-style:solid; + border-top-color:#000000; + border-bottom-width:1px; + border-bottom-style:solid; + border-bottom-color:#000000; + border-collapse:collapse; +} + +table.layout td.layoutbody { + vertical-align:top; + padding:10px; + background:#ffffff; + width:100%; + border-top-width:1px; + border-top-style:solid; + border-top-color:#000000; + border-bottom-width:1px; + border-bottom-style:solid; + border-bottom-color:#000000; + border-collapse:collapse; +} + +table.layout td.layoutheader { + background:#dddddd; + border-top-width:1px; + border-top-style:solid; + border-top-color:#000000; + border-bottom-width:1px; + border-bottom-style:solid; + border-bottom-color:#000000; + border-collapse:collapse; +} + +table.layout td.layoutfooter { + text-align:center; + font-size:10px; + background:#dddddd; + border-top-width:1px; + border-top-style:solid; + border-top-color:#000000; + border-bottom-width:1px; + border-bottom-style:solid; + border-bottom-color:#000000; + border-collapse:collapse; +} + +table.leftmenu { + border-width:0; + border-bottom-width:1px; + border-collapse:collapse; + border-color:#000000; + width:200px; +} + +tr.leftmenuheader th.nf { + border-top-width:1px; + border-top-style:solid; + border-top-color:#000000; +} + +tr.leftmenuheader th { + padding-left:3px; + padding-right:3px; + background-color:#990000; + color:#ffff99; + font-size:12px; + border-bottom-width:1px; + border-bottom-style:solid; + border-bottom-color:#000000; +} + +tr.leftmenu th { + vertical-align:top; + padding:3px; + text-align:left; + text-decoration:none; + font-size:11px; + white-space:nowrap; + background:#444444; + color:#ffffff; +} + +tr.leftmenu td { + vertical-align:top; + padding:3px; + text-align:left; + text-decoration:none; + font-size:12px; + white-space:nowrap; + background:#dddddd; +} + +tr.leftmenu td ul { + /*list-style-position:inside;*/ + margin:0; + padding:0; + padding-left:16px; + vertical-align:bottom; + list-style-image:url( "../images/bullet.gif" ); +} + +.statusSuspended { + color:#aa6600; + font-weight:bold; +} + +.statusRunning { + color:#00cc00; + font-weight:bold; +} + +.statusEnded { + color:#cc0000; + font-weight:bold; +} + +.statusNotstarted { + color:#0066aa; + font-weight:bold; +} + +a.headermenu { + padding-left:8px; + padding-right:8px; + text-decoration:none; + color:#cc0000; + border-left-width:1px; + border-left-style:solid; + border-left-color:#888888; +} + +a.headermenufirst { + padding-left:8px; + padding-right:8px; + text-decoration:none; + color:#cc0000; +} + +a.headermenu:hover, a.headermenufirst:hover { + background:#ffffff; + color:#cc0000; +} + +table.results { + border-width:1px; + border-style:solid; + border-color:#000000; + border-collapse:collapse; + margin-left:auto; + margin-right:auto; +} + +table.results td, table.results th { + padding:3px; + font-size:11px; +} + +table.results thead tr { + cursor:default; +} + +table.results thead tr th { + text-align:left; + background-color:#990000; + color:#ffff99; + font-size:12px; + border-bottom-style:solid; + border-bottom-width:1px; + border-bottom-color:#000000; +} + +table.results thead tr th b { + font-weight:normal; +} + +table.results thead tr td { + text-align:left; + background-color:#dddddd; + color:#990000; + font-weight:bold; + border-bottom-style:solid; + border-bottom-width:1px; + border-bottom-color:#000000; +} + +table.results tbody.results tr { + background-color:#dddddd; +} + +table.results tbody.results tr.even { + background-color:#ddddbb; +} + +table.results tbody.results tr.odd { + background-color:#ffffdd; +} + +table.results tbody.filter td { + text-align:left; + font-size:10px; + padding-bottom:1px; + padding-top:1px; + font-weight:normal; + background-color:#cccccc; + border-bottom-style:solid; + border-bottom-width:1px; + border-bottom-color:#000000; +} + +table.results td { + border-right-width:1px; + border-right-style:solid; + border-right-color:#000000; +} + +table.results tbody.results th { + padding:3px; + text-align:left; + text-decoration:none; + font-size:11px; + white-space:nowrap; + background:#444444; + color:#ffffff; +} + +table.results tbody.action tr { + background-color:#dddddd; +} + +table.results tbody.action tr td { + border-top-color:#000000; + border-top-style:solid; + border-top-width:1px; +} + +table.msgs { + margin-left:auto; + margin-right:auto; + margin-bottom:15px; + border-width:1px; + border-style:solid; + border-collapse:collapse; + border-color:#000000; + font-size:10px; + width:400px; +} + +table.msgs td { + padding-left:8px; + padding-right:8px; + border-bottom-width:1px; + border-bottom-color:#000000; + border-bottom-style:dotted; +} + +table.msgs thead th { + font-size:11px; +} + +table.error thead th { + background-color:#cc0000; + color:#ffffff; +} + +table.fatal thead th { + background-color:#cc0000; + color:#ffffff; +} + +table.warn thead th { + background-color:#cccc00; + color:#ffffff; +} + +table.info thead th { + background-color:#0000cc; + color:#ffffff; +} + +.hidden { + display:none; +} + +div.pbox, div.pbox_s, div.pbox_e { + position:absolute; + border-width:1px; + border-style:solid; +} + +div.pbox { + border-color:#0000ff; +} + +div.pbox_s { + border-color:#aa6600; +} + +div.pbox_e { + border-color:#cc0000; +} + +div.pboxs, div.pboxs_s, div.pboxs_e { + position:absolute; + border-right-width:1px; + border-right-style:solid; + border-bottom-width:1px; + border-bottom-style:solid; +} + +div.pboxs { + border-right-color:#9999ff; + border-bottom-color:#9999ff; +} + +div.pboxs_s { + border-right-color:#ffaa99; + border-bottom-color:#ffaa99; +} + +div.pboxs_e { + border-right-color:#660000; + border-bottom-color:#660000; +} + +div.pboxce { + position:absolute; + overflow:hidden; +} + +div.pboxc, div.pboxc_s, div.pboxc_e { + cursor:default; + font-size:10px; + white-space:nowrap; + color:#ffffff; + padding-left:3px; + padding-right:3px; + border-width:1px; + border-style:solid; +} + +div.pboxc { + border-color:#0000ff; + background-color:#0000ff; +} + +div.pboxc_s { + border-color:#aa6600; + background-color:#aa6600; +} + +div.pboxc_e { + border-color:#cc0000; + background-color:#cc0000; +} + +div.pboxc a, div.pboxc_s a, div.pboxc_e a { + color:#ffffff; + text-decoration:none; +} + +div.pboxc a:hover, div.pboxc_s a:hover, div.pboxc_e a:hover { + text-decoration:underline; +} + +span.comment { + display:block; + padding-top:3px; + padding-bottom:3px; + padding-left:4px; + padding-right:4px; + border-width:1px; + border-color:#990000; + border-style:solid; + border-collapse:collapse; + margin-left:5px; + margin-right:5px; + background-color:#ffffff; + font-family:arial,helvetica,sans-serif; + margin-top:4px; + margin-bottom:4px; + overflow:auto; +} + +textarea.comment { + width:480px; + height:80px; +} + +/* task forms */ + +table.dataform { + border-style:solid; + border-width:1px; + border-collapse:collapse; + border-color:#000000; + margin-left:auto; + margin-right:auto; +} + +table.dataform td, table.dataform th { + padding-top:3px; + padding-bottom:3px; + padding-left:5px; + padding-right:5px; +} + +table.dataform thead tr th { + text-align:left; + background-color:#990000; + color:#ffff99; + font-weight:bold; + border-bottom-style:solid; + border-bottom-width:1px; + border-bottom-color:#000000; +} + +table.dataform tbody th { + text-align:left; + text-decoration:none; + font-size:11px; + white-space:nowrap; + background:#444444; + color:#ffffff; + border-bottom-style:solid; + border-bottom-width:1px; + border-bottom-color:#000000; + border-collapse:collapse; + width:130px; +} + +table.dataform tbody td { + text-align:left; + text-decoration:none; + font-size:11px; + white-space:nowrap; + background:#dddddd; + color:#000000; + border-bottom-style:solid; + border-bottom-width:1px; + border-bottom-color:#000000; + border-collapse:collapse; + width:260px; +} + +a.pager { + color:#aaaaff; +} + +a.pager:hover { + color:#ffffff; +} + +span.pager { + font-weight:normal; + color:#999999; +} \ No newline at end of file Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/jbpm4jsf/.classpath =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/jbpm4jsf/.classpath 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/jbpm4jsf/.classpath 2010-01-18 23:27:37 UTC (rev 6092) @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/jbpm4jsf/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/jbpm4jsf/pom.xml 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/jbpm4jsf/pom.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ====================================================================== --> +<!-- jBPM: Workflow in Java --> <!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> <!-- Distributable under LGPL license. --> <!-- See terms of license at http://www.gnu.org. --> -<!-- --> <!-- ====================================================================== --> <!-- $Id$ --> @@ -14,7 +12,6 @@ <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 - 4JSF</name> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console-jbpm4jsf</artifactId> @@ -30,14 +27,8 @@ <!-- Dependencies --> <dependencies> - <!-- jBPM Dependencies --> + <!-- Compile Dependencies --> <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-identity</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.jboss.gravel</groupId> <artifactId>gravel</artifactId> </dependency> @@ -45,26 +36,35 @@ <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> </dependency> + + <!-- Provided Dependencies --> <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-identity</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>runtime</scope> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> + + <!-- Runtime Dependencies --> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>runtime</scope> + </dependency> </dependencies> <!-- Plugins --> @@ -73,9 +73,11 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <showDeprecation>false</showDeprecation> + <source>1.5</source> + <target>1.5</target> </configuration> </plugin> + <plugin> <groupId>net.sourceforge.maven-taglib</groupId> <artifactId>maven-taglib-plugin</artifactId> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/pom.xml 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/pom.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, the OpenSource J2EE webOS --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> +<!-- ====================================================================== --> +<!-- jBPM: Workflow in Java --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ====================================================================== --> - <!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ --> -<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"> +<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ --> + +<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</name> <groupId>org.jbpm.jbpm3</groupId> @@ -27,9 +27,9 @@ <!-- Modules --> <modules> - <module>soa</module> <module>console</module> <module>jbpm4jsf</module> + <module>gpd-deployer</module> </modules> <!-- Properties --> @@ -40,7 +40,7 @@ <javax.el.version>1.2</javax.el.version> <javax.faces.version>1.2_03</javax.faces.version> <javax.servlet.version>2.5</javax.servlet.version> - <jbpm.version>3.3.1-SNAPSHOT</jbpm.version> + <jbpm.version>3.2.8</jbpm.version> <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <junit.version>3.8.1</junit.version> <sun.facelets.version>1.1.15.B1</sun.facelets.version> @@ -49,6 +49,7 @@ <!-- DependencyManagement --> <dependencyManagement> <dependencies> + <!-- jBPM Dependencies --> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> @@ -59,6 +60,8 @@ <artifactId>jbpm-identity</artifactId> <version>${jbpm.version}</version> </dependency> + + <!-- Thirdparty Dependencies --> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> @@ -107,4 +110,27 @@ </dependencies> </dependencyManagement> + <!-- Plugins --> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + </plugins> + </build> + + <!-- Profiles --> + <profiles> + <profile> + <id>soa</id> + + <modules> + <module>soa</module> + </modules> + </profile> + </profiles> </project> Property changes on: projects/jsf-console/branches/jsf-console-3.3.1.SP/soa ___________________________________________________________________ Name: svn:ignore + target .settings Added: projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/.project =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/.project (rev 0) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/.project 2010-01-18 23:27:37 UTC (rev 6092) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>soa-webapp</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/pom.xml 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/pom.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ====================================================================== --> +<!-- jBPM: Workflow in Java --> <!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> <!-- Distributable under LGPL license. --> <!-- See terms of license at http://www.gnu.org. --> -<!-- --> <!-- ====================================================================== --> <!-- $Id: pom.xml 3298 2008-12-09 21:33:53Z thomas.diesler(a)jboss.com $ --> -<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"> + +<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> @@ -24,10 +24,4 @@ <version>3.3.1.GA</version> <relativePath>../pom.xml</relativePath> </parent> - - <!-- Dependencies --> - <dependencies> - - </dependencies> - </project> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/src/main/webapp/WEB-INF/jboss-web.xml 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/src/main/webapp/WEB-INF/jboss-web.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -20,10 +20,10 @@ <jndi-name>java:JmsXA</jndi-name> </resource-ref> - <ejb-ref> + <ejb-local-ref> <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> - <jndi-name>java:ejb/TimerEntityBean</jndi-name> - </ejb-ref> + <local-jndi-name>java:jbpm/TimerEntityBean</local-jndi-name> + </ejb-local-ref> <!-- workaround for "mapped-name is required" exception in JBoss 5.0.0.CR1 --> <message-destination-ref> Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/src/main/webapp/WEB-INF/web.xml 2010-01-18 21:58:11 UTC (rev 6091) +++ projects/jsf-console/branches/jsf-console-3.3.1.SP/soa/src/main/webapp/WEB-INF/web.xml 2010-01-18 23:27:37 UTC (rev 6092) @@ -1,17 +1,10 @@ <?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"> +<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"> - <!-- - * Force initialization of the hibernate sessions in jbpm. - * This will create the DB tables on new installations. - * If that's not needed the listener can be removed. - --> - <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> + <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> @@ -30,13 +23,13 @@ </servlet-mapping> <context-param> - <description> Use Documents Saved as *.xhtml </description> + <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> + <description>Facelets debug output</description> <param-name>facelets.DEVELOPMENT</param-name> <param-value>false</param-value> </context-param> @@ -46,21 +39,9 @@ <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> - <!-- - This role list should be changed to include all the relevant roles for your - environment. + This role list should be changed to include all the relevant roles for your + environment. --> <security-role> <role-name>admin</role-name> @@ -70,8 +51,9 @@ </security-role> <!-- - Security constraints - optionally customize the role name to require a login before access is allowed to the application. Also, be sure to edit jboss-web.xml to - configure the security domain if you are deploying inside JBoss AS. + Security constraints - optionally customize the role name to require a login + before access is allowed. Also, be sure to edit jboss-web.xml to configure + the security domain if you are deploying inside JBoss AS. --> <security-constraint> <web-resource-collection> @@ -85,7 +67,7 @@ </auth-constraint> </security-constraint> - <!-- Example Login page - lists user names --> + <!-- SOA-P Login page --> <login-config> <auth-method>FORM</auth-method> <form-login-config> @@ -104,8 +86,7 @@ </login-config> <!== Login configuration option #1 --> - <!-- - Login configuration option #2 - use basic auth ==> + <!-- Login configuration option #2 - use basic auth ==> <login-config> <auth-method>BASIC</auth-method> <realm-name>jBPM Administration Console</realm-name> @@ -115,58 +96,49 @@ <!-- Job executor launcher ==> <listener> <description> - Starts the job executor on servlet context initialization and stops it on servlet context destruction. + Starts the job executor on initialization and stops it on destruction. </description> <listener-class>org.jbpm.web.JobExecutorLauncher</listener-class> - </listener> <!== Job executor launcher --> + </listener> + <!== Job executor launcher --> <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> + <description>Closes the jBPM configuration on destruction, releasing 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. + <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> + 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> + <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-local-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> + <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home> + <local>org.jbpm.ejb.LocalTimerEntity</local> + </ejb-local-ref> <message-destination-ref> - <description> - The message service sends job messages to the queue referenced here. To ensure + <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-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>