4:29 a.m.
Author: ryanzhang
Date: 2010-08-17 05:29:44 -0400 (Tue, 17 Aug 2010)
New Revision: 6601
Removed:
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/web.xml
Modified:
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/build.xml
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/pom.xml
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_jbpm_console_ui.xml
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/web.xml
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml
Log:
All the changes has been aligned to the latest release
Modified:
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/build.xml
===================================================================
---
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/build.xml 2010-08-17
07:43:03 UTC (rev 6600)
+++
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/build.xml 2010-08-17
09:29:44 UTC (rev 6601)
@@ -1,18 +1,14 @@
<project name="SOA jbpm console builder">
<target name="build">
- <copy todir="${module_base_dir}/target/work"
file="${module_base_dir}/../console/target/jsf-console-${project.version}.war"
/>
- <unzip
src="${module_base_dir}/target/work/jsf-console-${project.version}.war"
dest="${module_base_dir}/target/work/console-war"/>
<delete file="${module_base_dir}/target/work/console-war/WEB-INF/web.xml"
/>
- <copy todir="${module_base_dir}/target/work/console-war/" >
- <fileset dir="${module_base_dir}/resource/jbpm-console/"
includes="**/*" excludes="web.xml" />
+ <copy todir="${module_base_dir}/target/work/console-war/"
overwrite="true">
+ <fileset dir="${module_base_dir}/resource/jbpm-console/"
includes="**/*" />
</copy>
- <copy todir="${module_base_dir}/target/work/console-war/WEB-INF"
file="resource/jbpm-console/web.xml" />
- <unzip src="../gpd-deployer/target/gpd-deployer-${project.version}.war"
dest="${module_base_dir}/target/work/gpd-war"/>
<delete file="${module_base_dir}/target/work/gpd-war/WEB-INF/web.xml"
/>
<copy todir="${module_base_dir}/target/work/gpd-war/WEB-INF"
file="${module_base_dir}/resource/gpd-console/web.xml" />
-
</target>
+
<target name="assemble">
<copy preservelastmodified="true"
todir="${module_base_dir}/target/dist/jbpm-console.war">
<fileset dir="${module_base_dir}/target/work/console-war"
includes="**/*" />
Modified:
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/pom.xml
===================================================================
---
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/pom.xml 2010-08-17
07:43:03 UTC (rev 6600)
+++
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/pom.xml 2010-08-17
09:29:44 UTC (rev 6601)
@@ -30,12 +30,24 @@
</properties>
<dependencies>
- <dependency>
+ <dependency>
<groupId>${soa_common_build_src.groupId}</groupId>
<artifactId>${soa_common_build_src.artifactId}</artifactId>
<version>${soa_common_build_src.version}</version>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <version>3.2.9</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gpd-deployer</artifactId>
+ <version>3.2.9</version>
+ <type>war</type>
+ </dependency>
</dependencies>
<!-- Plugins -->
@@ -63,6 +75,40 @@
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>unpack-jsf-console</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/work/console-war</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-gpd-deployer</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/work/gpd-war</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gpd-deployer</artifactId>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
Modified:
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_jbpm_console_ui.xml
===================================================================
---
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_jbpm_console_ui.xml 2010-08-17
07:43:03 UTC (rev 6600)
+++
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_jbpm_console_ui.xml 2010-08-17
09:29:44 UTC (rev 6601)
@@ -2,7 +2,7 @@
<!-- change logo and make style unify with soa platform -->
<target name="apply.patch">
<replace file="${module_base_dir}/target/work/console-war/login.jsp"
>
- <replacetoken><![CDATA[<a href="/"><img
src="/console-war/JBossLogo.jpg" alt="JBoss SOA
Platform"/></a>
+ <replacetoken><![CDATA[<a href="/"><img
src="/jbpm-console/JBossLogo.jpg" alt="JBoss SOA
Platform"/></a>
]]></replacetoken>
<replacevalue></replacevalue>
</replace>
Modified:
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/web.xml
===================================================================
---
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/web.xml 2010-08-17
07:43:03 UTC (rev 6600)
+++
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/web.xml 2010-08-17
09:29:44 UTC (rev 6601)
@@ -26,8 +26,6 @@
<description>If you are deploying to JBoss AS, be sure to specify the
security domain in jboss-web.xml.</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
<description>Optionally customize the role name to require a login before
Modified:
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml
===================================================================
---
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml 2010-08-17
07:43:03 UTC (rev 6600)
+++
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml 2010-08-17
09:29:44 UTC (rev 6601)
@@ -1,7 +1,8 @@
<?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
@@ -12,7 +13,7 @@
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
- <jndi-name>java:/JbpmDS</jndi-name>
+ <jndi-name>java:JbpmDS</jndi-name>
</resource-ref>
<resource-ref>
@@ -25,7 +26,6 @@
<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>
<jndi-name>queue/JbpmJobQueue</jndi-name>
Deleted:
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/web.xml
===================================================================
---
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/web.xml 2010-08-17
07:43:03 UTC (rev 6600)
+++
projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/web.xml 2010-08-17
09:29:44 UTC (rev 6601)
@@ -1,157 +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>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>
-
- <!-- Mapping for all plain pages. -->
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
- <!-- This mapping is for the process images. -->
- <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>
-
- <!-- A simple JSP to redirect to the basic search page. -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
- <!--
- This role list should be changed to include all the relevant roles for your
- environment.
- -->
- <security-role>
- <role-name>admin</role-name>
- </security-role>
- <security-role>
- <role-name>user</role-name>
- </security-role>
-
- <!--
- 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>
- <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>
-
- <!-- Example Login page - lists sample users -->
- <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>
-
- <!-- 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>
- <!== Login configuration option #1 -->
-
- <!-- Login configuration option #2 - use basic auth ==>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>jBPM Administration Console</realm-name>
- </login-config>
- <!== Login configuration option #2 -->
-
- <!-- Job executor launcher ==>
- <listener>
- <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>
- <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>
- <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-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>
- <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>
-
<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>