1:39 p.m.
Author: heiko.braun(a)jboss.com
Date: 2009-08-06 14:39:15 -0400 (Thu, 06 Aug 2009)
New Revision: 748
Added:
bpm-console/trunk/server/war/src/main/templates/
bpm-console/trunk/server/war/src/main/templates/WEB-INF/
bpm-console/trunk/server/war/src/main/templates/WEB-INF/jboss-web.xml
Removed:
bpm-console/trunk/server/war/src/main/webapp/WEB-INF/jboss-web.xml
Modified:
bpm-console/trunk/server/war/pom.xml
bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml
Log:
BPMC-10: Server JAAS domain from build profile
Modified: bpm-console/trunk/server/war/pom.xml
===================================================================
--- bpm-console/trunk/server/war/pom.xml 2009-08-06 17:42:29 UTC (rev 747)
+++ bpm-console/trunk/server/war/pom.xml 2009-08-06 18:39:15 UTC (rev 748)
@@ -163,10 +163,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-core</artifactId>
@@ -215,7 +215,99 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>src/main/templates</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
</plugins>
+
<finalName>gwt-console-server</finalName>
</build>
+
+ <!--
+ jBPM profile
+ -->
+ <profiles>
+ <profile>
+ <id>jbpm-server.profile</id>
+ <activation>
+ <property>
+ <name>!console.profile</name>
+ </property>
+ </activation>
+ <properties>
+ <server.jaas.domain>java:/jaas/jbpm-console</server.jaas.domain>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <classifier>jbpm</classifier>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>drools-server.profile</id>
+ <activation>
+ <property>
+ <name>console.profile</name>
+ <value>drools</value>
+ </property>
+ </activation>
+ <properties>
+ <server.jaas.domain>java:/jaas/drools-console</server.jaas.domain>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <classifier>drools</classifier>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>riftsaw-server.profile</id>
+ <activation>
+ <property>
+ <name>console.profile</name>
+ <value>riftsaw</value>
+ </property>
+ </activation>
+ <properties>
+ <server.jaas.domain>java:/jaas/bpel-console</server.jaas.domain>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <classifier>riftsaw</classifier>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Copied: bpm-console/trunk/server/war/src/main/templates/WEB-INF/jboss-web.xml (from rev
743, bpm-console/trunk/server/war/src/main/webapp/WEB-INF/jboss-web.xml)
===================================================================
--- bpm-console/trunk/server/war/src/main/templates/WEB-INF/jboss-web.xml
(rev 0)
+++ bpm-console/trunk/server/war/src/main/templates/WEB-INF/jboss-web.xml 2009-08-06
18:39:15 UTC (rev 748)
@@ -0,0 +1,13 @@
+<?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_2.dtd">
+
+<jboss-web>
+
+ <security-domain>${server.jaas.domain}</security-domain>
+
+ <context-root>gwt-console-server</context-root>
+
+</jboss-web>
Deleted: bpm-console/trunk/server/war/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- bpm-console/trunk/server/war/src/main/webapp/WEB-INF/jboss-web.xml 2009-08-06 17:42:29
UTC (rev 747)
+++ bpm-console/trunk/server/war/src/main/webapp/WEB-INF/jboss-web.xml 2009-08-06 18:39:15
UTC (rev 748)
@@ -1,13 +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_2.dtd">
-
-<jboss-web>
-
- <security-domain>java:/jaas/bpel-console</security-domain>
-
- <context-root>gwt-console-server</context-root>
-
-</jboss-web>
Modified: bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml 2009-08-06 17:42:29 UTC
(rev 747)
+++ bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml 2009-08-06 18:39:15 UTC
(rev 748)
@@ -52,7 +52,7 @@
<web-resource-name>Resteasy</web-resource-name>
<url-pattern>/rs/process/*</url-pattern>
<url-pattern>/rs/task/*</url-pattern>
- <!--url-pattern>/rs/form/*</url-pattern-->
+ <url-pattern>/rs/form/*</url-pattern>
<url-pattern>/rs/tasks/*</url-pattern>
<url-pattern>/rs/identity/*</url-pattern>
</web-resource-collection>