September 2010 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r6650 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: hibernate and 1 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-09-05 03:15:02 -0400 (Sun, 05 Sep 2010) New Revision: 6650 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetHistoryVariableNamesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java Log: JBPM-2927 move hibernate package from get*cmd to dbSession. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetHistoryVariableNamesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetHistoryVariableNamesCmd.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetHistoryVariableNamesCmd.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -24,43 +24,36 @@ import java.util.HashSet; import java.util.Set; -import org.hibernate.Query; -import org.hibernate.Session; import org.jbpm.api.cmd.Command; import org.jbpm.api.cmd.Environment; import org.jbpm.pvm.internal.history.model.HistoryVariableImpl; +import org.jbpm.pvm.internal.session.DbSession; /** * Command responsible for retrieving variable names stored as history records for given process instance id - * - * + * + * * @author Maciej Swiderski * */ public class GetHistoryVariableNamesCmd implements Command<Set<String>> { - + /** - * + * */ private static final long serialVersionUID = 1L; - + private String processInstanceId; - + public GetHistoryVariableNamesCmd(String processInstanceId) { this.processInstanceId = processInstanceId; } @SuppressWarnings("unchecked") public Set<String> execute(Environment environment) throws Exception { - Session dbsession = environment.get(Session.class); - - String hql =! "select hv.variableName from " + HistoryVariableImpl.class.getName() + " hv where hv.processInstanceId = '" + processInstanceId + "'"; - - Query query = dbsession.createQuery(hql); - - Set<String> historyVariables = new HashSet<String>(query.list()); - - return historyVariables; + DbSession dbSession = environment.get(DbSession.class); + + return dbSession.findHistoryVariableNames(processInstanceId); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -23,13 +23,10 @@ import java.util.List; -import org.hibernate.Criteria; -import org.hibernate.Session; -import org.hibernate.criterion.Restrictions; - import org.jbpm.api.JbpmException; import org.jbpm.api.cmd.Environment; import org.jbpm.api.task.Participation; +import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.ParticipationImpl; import org.jbpm.pvm.internal.util.CollectionUtil; @@ -37,14 +34,14 @@ * @author Tom Baeyens */ public class GetParticipantsCmd extends AbstractCommand<List<Participation>> { - + private static final long serialVersionUID = 1L; protected String taskId; protected String swimlaneId; - + public GetParticipantsCmd(String taskId, String swimlaneId) { - if (taskId==null) { + if (taskId == null) { throw new JbpmException("taskId is null"); } this.taskId = taskId; @@ -52,17 +49,7 @@ } public List<Participation> execute(Environment environment) throws Exception { - Criteria criteria = environment.get(Session.class).createCriteria(ParticipationImpl.class); - - if (taskId!=null) { - criteria.add(Restrictions.eq("task.dbid", Long.parseLong(taskId))); - } else if (swimlaneId!=null) { - criteria.add(Restrictions.eq("swimlane.dbid", Long.parseLong(swimlaneId))); - } else { - throw new JbpmException("no task nor swimlane specified"); - } - - List<?> participations = criteria.list(); - return CollectionUtil.checkList(participations, Participation.class); + DbSession dbSession = environment.get(DbSession.class); + return dbSession.findParticipants(taskId, swimlaneId); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -23,11 +23,9 @@ import java.util.List; -import org.hibernate.Session; -import org.hibernate.criterion.Restrictions; - import org.jbpm.api.cmd.Environment; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.pvm.internal.util.CollectionUtil; @@ -35,20 +33,17 @@ * @author Tom Baeyens */ public class GetSubTasksCmd extends AbstractCommand<List<Task>> { - + private static final long serialVersionUID = 1L; String parentTaskId; - + public GetSubTasksCmd(String parentTaskId) { this.parentTaskId = parentTaskId; } public List<Task> execute(Environment environment) throws Exception { - List<?> tasks = environment.get(Session.class).createCriteria(TaskImpl.class) - .createAlias("superTask", "super") - .add(Restrictions.eq("super.dbid", Long.parseLong(parentTaskId))) - .list(); - return CollectionUtil.checkList(tasks, Task.class); + DbSession dbSession = environment.get(DbSession.class); + return dbSession.findSubTasks(parentTaskId); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -24,9 +24,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import org.hibernate.Criteria; import org.hibernate.LockMode; +import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -36,6 +40,7 @@ import org.jbpm.api.JbpmException; import org.jbpm.api.job.Timer; import org.jbpm.api.history.HistoryComment; +import org.jbpm.api.task.Participation; import org.jbpm.api.task.Task; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.client.ClientExecution; @@ -530,4 +535,37 @@ } } } + + /** query. */ + public Set<String> findHistoryVariableNames(String processInstanceId) { + String hql = "select hv.variableName from " + HistoryVariableImpl.class.getName() + " hv where hv.processInstanceId = '" + processInstanceId + "'"; + + Query query = session.createQuery(hql); + Set<String> historyVariables = new HashSet<String>(query.list()); + + return historyVariables; + } + + public List<Participation> findParticipants(String taskId, String swimlaneId) { + Criteria criteria = session.createCriteria(ParticipationImpl.class); + + if (taskId != null) { + criteria.add(Restrictions.eq("task.dbid", Long.parseLong(taskId))); + } else if (swimlaneId != null) { + criteria.add(Restrictions.eq("swimlane.dbid", Long.parseLong(swimlaneId))); + } else { + throw new JbpmException("no task nor swimlane specified"); + } + + List<?> participations = criteria.list(); + return CollectionUtil.checkList(participations, Participation.class); + } + + public List<Task> findSubTasks(String parentTaskId) { + List<?> tasks = session.createCriteria(TaskImpl.class) + .createAlias("superTask", "super") + .add(Restrictions.eq("super.dbid", Long.parseLong(parentTaskId))) + .list(); + return CollectionUtil.checkList(tasks, Task.class); + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -22,10 +22,13 @@ package org.jbpm.pvm.internal.session; import java.util.List; +import java.util.Set; import org.jbpm.api.Execution; import org.jbpm.api.job.Timer; import org.jbpm.api.history.HistoryComment; +import org.jbpm.api.task.Participation; +import org.jbpm.api.task.Task; import org.jbpm.pvm.internal.client.ClientExecution; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.job.StartProcessTimer; @@ -121,4 +124,9 @@ Long initializeNextId(long blocksize); void initializeSchemaVersion(); Long getMaxDbid(); + + /** query. */ + Set<String> findHistoryVariableNames(String processInstanceId); + List<Participation> findParticipants(String taskId, String swimlaneId); + List<Task> findSubTasks(String parentTaskId); }

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6649 - in jbpm3/branches/jbpm-3.2-soa: modules/core and 5 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-03 00:49:46 -0400 (Fri, 03 Sep 2010) New Revision: 6649 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml jbpm3/branches/jbpm-3.2-soa/pom.xml Log: exclude xml-apis and xerces versions as transitive deps; declare xerces dep only under jdk 1.4 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -27,12 +27,9 @@ <dependencies>  <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> - <dependency> <groupId>bsh</groupId> <artifactId>bsh</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -41,12 +38,6 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -55,14 +46,16 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> + <optional>true</optional> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency>  <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> <scope>provided</scope> @@ -82,12 +75,17 @@ <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>provided</scope> + </dependency>  <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>hsqldb</groupId> @@ -189,13 +187,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -120,13 +120,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -38,16 +38,6 @@ <artifactId>jboss-j2ee</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <scope>provided</scope> - </dependency>  <dependency> @@ -55,7 +45,6 @@ <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.jboss.client</groupId> <artifactId>jbossall-client</artifactId> @@ -179,13 +168,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -52,6 +52,11 @@  <dependency> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> <scope>test</scope> @@ -62,11 +67,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -131,13 +131,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -52,6 +52,11 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + <scope>test</scope> + </dependency> </dependencies>  @@ -91,13 +96,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -37,13 +37,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> @@ -68,26 +63,17 @@ <artifactId>desmoj</artifactId> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - </dependency> - <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> - <exclusions> - <exclusion> - <groupId>eclipse</groupId> - <artifactId>jdtcore</artifactId> - </exclusion> - </exclusions> </dependency>  <dependency> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -145,6 +145,12 @@ <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.drools</groupId> @@ -152,12 +158,12 @@ <version>4.0.7</version> <exclusions> <exclusion> + <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <groupId>xerces</groupId> </exclusion> <exclusion> + <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> </exclusion> </exclusions> </dependency> @@ -207,16 +213,46 @@ <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> <version>1.4.5</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> <version>3.5.3</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>eclipse</groupId> + <artifactId>jdtcore</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <version>1.1.1</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.client</groupId> @@ -367,6 +403,14 @@ </plugin> <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <source>1.4</source> + <quiet>true</quiet> + </configuration> + </plugin> + + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args}</argLine> @@ -463,11 +507,9 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - </configuration> <executions> <execution> + <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> @@ -500,11 +542,9 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - </configuration> <executions> <execution> + <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> @@ -535,19 +575,9 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <version>${xerces.version}</version> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>${xerces.version}</version> + <version>2.8.1</version> </dependency> - <dependency> - <groupId>org.mvel</groupId> - <artifactId>mvel</artifactId> - <version>${mvel.version}</version> - </dependency> </dependencies> </dependencyManagement> </profile>

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6648 - in jbpm3/branches/jbpm-3.2-soa: modules/enterprise and 3 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-02 19:20:21 -0400 (Thu, 02 Sep 2010) New Revision: 6648 Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/console/ConsoleAvailabilityTest.java jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/WEB-INF/web.xml jbpm3/branches/jbpm-3.2-soa/pom.xml Log: JBPM-2858 abandon assembly/cactus plugin combination in favor of a pure assembly solution not affected by the plugin dependency exclusion limitation Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) @@ -52,14 +52,8 @@  <dependency> <groupId>org.apache.cactus</groupId> - <artifactId>cactus.core.framework.javaEE.13-14</artifactId> + <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -102,6 +96,8 @@ <goal>single</goal> </goals> <configuration> + <finalName>enterprise</finalName> + <outputDirectory>${project.build.directory}/test-libs</outputDirectory> <descriptors> <descriptor>scripts/assembly-test-war.xml</descriptor> </descriptors> @@ -138,24 +134,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.cactus</groupId> - <artifactId>cactus.integration.maven2</artifactId> - <configuration> - <srcFile>${project.build.directory}/${project.artifactId}-${project.version}-test.war</srcFile> - <destFile>${project.build.directory}/test-libs/enterprise-test.war</destFile> - </configuration> - <executions> - <execution> - <id>cactify-test-war</id> - <phase>process-test-classes</phase> - <goals> - <goal>cactifywar</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml 2010-09-02 23:20:21 UTC (rev 6648) @@ -15,17 +15,30 @@ <format>war</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> <fileSet> <directory>src/test/webapp</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory /> </fileSet> <fileSet> <directory>target/test-classes</directory> - <outputDirectory>/WEB-INF/classes</outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> <include>org/jbpm/enterprise/**</include> </includes> </fileSet> </fileSets> + + <dependencySets> + <dependencySet> + <outputDirectory>WEB-INF/lib</outputDirectory> + <scope>test</scope> + <includes> + <include>aspectj:aspectjrt</include> + <include>org.apache.cactus:cactus.core.framework.uberjar.javaEE.14</include> + <include>junit:junit</include> + </includes> + </dependencySet> + </dependencySets> </assembly> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/console/ConsoleAvailabilityTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/console/ConsoleAvailabilityTest.java 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/console/ConsoleAvailabilityTest.java 2010-09-02 23:20:21 UTC (rev 6648) @@ -36,24 +36,11 @@ * Verify if the console has been deployed successfully */ public void testConsoleDeployment() throws IOException { - String host = "localhost"; - int port = 8080; + URL contextUrl = new URL(System.getProperty("cactus.contextURL")); + URL consoleUrl = new URL(contextUrl, "/jbpm-console"); + System.out.println("Console URL: " + consoleUrl); - String bindAddress = System.getProperty("jboss.bind.address"); - if (bindAddress != null) { - int colonIndex = bindAddress.lastIndexOf(':'); - if (colonIndex != -1) { - host = bindAddress.substring(0, colonIndex); - port = Integer.parseInt(bindAddress.substring(colonIndex + 1)); - } - else - host = bindAddress; - } - - URL url = new URL("http", host, port, "/jbpm-console"); - System.out.println("Console URL: " + url); - - int responseCode = doGet(url); + int responseCode = doGet(consoleUrl); assertEquals(HttpURLConnection.HTTP_OK, responseCode); } Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/WEB-INF/web.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/WEB-INF/web.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/WEB-INF/web.xml 2010-09-02 23:20:21 UTC (rev 6648) @@ -2,6 +2,16 @@ <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> + <servlet-name>ServletRedirector</servlet-name> + <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ServletRedirector</servlet-name> + <url-pattern>/ServletRedirector</url-pattern> + </servlet-mapping> + <ejb-local-ref> <ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name> <ejb-ref-type>Session</ejb-ref-type> Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) @@ -41,7 +41,6 @@  <properties> - <cactus.version>1.8.1</cactus.version> <cargo.version>1.0.3</cargo.version>  @@ -98,16 +97,17 @@ </dependency> <dependency> <groupId>org.apache.cactus</groupId> - <artifactId>cactus.core.framework.javaEE.13-14</artifactId> - <version>${cactus.version}</version> + <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>org.mortbay.jetty</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo</artifactId> - <version>${cargo.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> <version>${cargo.version}</version> </dependency> @@ -392,78 +392,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.cactus</groupId> - <artifactId>cactus.integration.maven2</artifactId> - <version>${cactus.version}</version> - <dependencies> - <dependency> - <groupId>org.apache.cactus</groupId> - <artifactId>cactus.integration.shared.api</artifactId> - <version>${cactus.version}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.cactus</groupId> - <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId> - <version>${cactus.version}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${cargo.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${cargo.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>${cargo.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> <groupId>org.codehaus.izpack</groupId> <artifactId>izpack-maven-plugin</artifactId> <version>1.0-alpha-5</version>

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6647 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/cmd and 7 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-09-02 10:53:46 -0400 (Thu, 02 Sep 2010) New Revision: 6647 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/OptimisticLockingException.java Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CheckDbCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/AcquireDbidBlockCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/DatabaseDbidGenerator.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/id/DbidGeneratorTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/svc/RetryInterceptorTest.java Log: JBPM-2927 remove staleStateException from retryInterceptor and DatabaseDbidGenerator. replace org.hibernate.Session to DbSession in PropertyImpl. Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java =================================================================== --- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -28,6 +28,7 @@ import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cfg.ConfigurationImpl; import org.jbpm.pvm.internal.id.PropertyImpl; +import org.jbpm.pvm.internal.session.DbSession; /** * @author Alejandro Guizar @@ -53,8 +54,9 @@ public Void execute(Environment environment) throws Exception { Session session = environment.get(Session.class); + DbSession dbSession = environment.get(DbSession.class); DbHelper.executeSqlResource("create/jbpm." + database + ".create.sql", session); - PropertyImpl.createProperties(session); + PropertyImpl.createProperties(dbSession); return null; } }); Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java =================================================================== --- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -109,6 +109,7 @@ } public JbpmVersion execute(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); Session session = environment.get(Session.class); if (!propertiesTableExists) { try { @@ -120,7 +121,7 @@ } } else { - String dbVersion = PropertyImpl.getDbVersion(session); + String dbVersion = PropertyImpl.getDbVersion(dbSession); if (dbVersion == null) { throw new JbpmException("property table exists, but no db version property is present"); } @@ -145,6 +146,7 @@ } protected void executeVoid(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); Session session = environment.get(Session.class); log.info("upgrading from " + databaseVersion + " to " @@ -161,9 +163,9 @@ // in that case, the next part is skipped if (!propertiesTableExists) { DbHelper.executeSqlResource("upgrade-4.1-to-4.2/jbpm." + database + ".upgrade.sql", session); - PropertyImpl.initializeNextDbid(session); + PropertyImpl.initializeNextDbid(dbSession); // we set the version to 4.1 as the next transaction might fail - PropertyImpl.setDbVersionTo41(session); + PropertyImpl.setDbVersionTo41(dbSession); } } // transaction is now committed as the next transaction requires the NextDbid @@ -182,6 +184,7 @@ } protected void executeVoid(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); Session session = environment.get(Session.class); if (databaseVersion.compareTo(JbpmVersion.V_4_2) < 0) { @@ -196,7 +199,7 @@ } } - PropertyImpl.setDbVersionToLibraryVersion(session); + PropertyImpl.setDbVersionToLibraryVersion(dbSession); } } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CheckDbCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CheckDbCmd.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CheckDbCmd.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.cmd; -import org.hibernate.Session; import org.jbpm.api.JbpmException; import org.jbpm.api.cmd.Command; import org.jbpm.api.cmd.Environment; @@ -43,7 +42,6 @@ public Object execute(Environment environment) throws Exception { DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class); - Session session = EnvironmentImpl.getFromCurrent(Session.class); // if table JBPM4_PROPERTIES doesn't exist, if (!dbSession.propertiesTableExists()) { @@ -57,17 +55,17 @@ } } else { - Long nextDbid = PropertyImpl.getNextDbid(session); + Long nextDbid = PropertyImpl.getNextDbid(dbSession); // if there is no next.dbid property specified if (nextDbid == null) { // (this only happens in the test suite) // initialize the dbid property. - PropertyImpl.setNextDbid(session, 1); + PropertyImpl.setNextDbid(dbSession, 1); } } // verify if DB version matches with library version, - String dbVersion = PropertyImpl.getDbVersion(session); + String dbVersion = PropertyImpl.getDbVersion(dbSession); if (log.isInfoEnabled()) { log.info("jBPM version info: library[" + ProcessEngineImpl.JBPM_LIBRARY_VERSION + "], schema[" + dbVersion + "]"); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/AcquireDbidBlockCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/AcquireDbidBlockCmd.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/AcquireDbidBlockCmd.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -1,10 +1,8 @@ package org.jbpm.pvm.internal.id; -import org.hibernate.Session; -import org.hibernate.criterion.Restrictions; - import org.jbpm.api.cmd.Command; import org.jbpm.api.cmd.Environment; +import org.jbpm.pvm.internal.session.DbSession; /** * @author Tom Baeyens @@ -20,17 +18,14 @@ } public Long execute(Environment environment) throws Exception { - Session session = environment.get(Session.class); + DbSession dbSession = environment.get(DbSession.class); - PropertyImpl property = (PropertyImpl) session.createCriteria(PropertyImpl.class) - .add(Restrictions.eq("key", PropertyImpl.NEXT_DBID_KEY)) - .uniqueResult(); - + PropertyImpl property = PropertyImpl.getProperty(dbSession, PropertyImpl.NEXT_DBID_KEY); long nextId = Long.parseLong(property.getValue()); property.setValue(Long.toString(nextId + blocksize)); - session.flush(); + dbSession.flush(); return nextId; } -} \ No newline at end of file +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/DatabaseDbidGenerator.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/DatabaseDbidGenerator.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/DatabaseDbidGenerator.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -23,7 +23,6 @@ import java.util.Random; -import org.hibernate.StaleStateException; import org.jbpm.api.JbpmException; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.CommandService; @@ -33,9 +32,9 @@ * @author Tom Baeyens */ public class DatabaseDbidGenerator extends DbidGenerator { - + private static Log log = Log.getLog(DatabaseDbidGenerator.class.getName()); - + static Random random = new Random(); // configuration @@ -43,22 +42,26 @@ long blocksize = 10000; int maxAttempts = 3; - // runtime state + // runtime state long lastId = -2; long nextId = -1; - + + protected Class<?> targetExceptionClass; + public synchronized long getNextId() { // if no more ids available - if (lastId<nextId) { + if (lastId < nextId) { // acquire a next block of ids - log.debug("last id "+lastId+" was consumed. acquiring new block..."); + if (log.isDebugEnabled()) { + log.debug("last id " + lastId + " was consumed. acquiring new block..."); + } // reset the id block lastId = -2; nextId = -1; - - // try couple of times + + // try couple of times try { acquireDbidBlock(); } catch (Exception e) { @@ -72,26 +75,34 @@ protected void acquireDbidBlock() { for ( int attempts = maxAttempts; (attempts>0) && (nextId==-1) ; attempts-- ) { try { - // acquire block + // acquire block nextId = commandService.execute(new AcquireDbidBlockCmd(blocksize)); lastId = nextId + blocksize - 1; - - log.debug("acquired new id block ["+nextId+"-"+lastId+"]"); - - } catch (StaleStateException e) { - // optimistic locking exception indicating another thread tried to - // acquire a block of ids concurrently + + if (log.isDebugEnabled()) { + log.debug("acquired new id block [" + nextId + "-" + lastId + "]"); + } + + } catch (RuntimeException ex) { + if (!this.isCausedByOptimisticLockingFailure(ex)) { + throw ex; + } + + // optimistic locking exception indicating another thread tried to + // acquire a block of ids concurrently attempts--; - + // if no attempts left - if (attempts==0) { + if (attempts == 0) { // fail the surrounding transaction - throw new JbpmException("couldn't acquire block of ids, tried "+maxAttempts+" times"); + throw new JbpmException("couldn't acquire block of ids, tried " + maxAttempts + " times"); } - + // if there are still attempts left, first wait a bit int millis = 20 + random.nextInt(200); - log.debug("optimistic locking failure while trying to acquire id block. retrying in "+millis+" millis"); + if (log.isDebugEnabled()) { + log.debug("optimistic locking failure while trying to acquire id block. retrying in " + millis + " millis"); + } try { Thread.sleep(millis); } catch (InterruptedException e1) { @@ -100,14 +111,40 @@ } } } - + + /** + * fix for JBPM-2864. + * If this exception is caused by StaleStateException, then we should retry. + */ + protected boolean isCausedByOptimisticLockingFailure( + Throwable throwable) { + if (targetExceptionClass == null) { + log.warn("didnot config a targetExceptionClass, won't retry."); + return false; + } + + while (throwable != null) { + if (targetExceptionClass.isAssignableFrom(throwable.getClass())) { + return true; + } else { + throwable = throwable.getCause(); + } + } + + return false; + } + public void reset() { initialize(); // resetting the DatabaseIdGenerator means just reinitializing the id } - + public void initialize() { nextId = commandService.execute(new InitializePropertiesCmd(blocksize)); lastId = nextId + blocksize - 1; log.debug("initial id block ["+nextId+"-"+lastId+"]"); } + + public void setTargetExceptionClass(Class<?> targetExceptionClass) { + this.targetExceptionClass = targetExceptionClass; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -21,8 +21,6 @@ */ package org.jbpm.pvm.internal.id; -import org.hibernate.Session; - import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.env.EnvironmentImpl; import org.jbpm.pvm.internal.processengine.ProcessEngineImpl; @@ -55,68 +53,67 @@ this.value = value; } - public static Long getNextDbid(Session session) { - String dbidPropertyValue = getPropertyValue(session, PropertyImpl.NEXT_DBID_KEY); + public static Long getNextDbid(DbSession dbSession) { + String dbidPropertyValue = getPropertyValue(dbSession, PropertyImpl.NEXT_DBID_KEY); if (dbidPropertyValue != null) { return Long.valueOf(dbidPropertyValue); } return null; } - public static void setNextDbid(Session session, long nextDbid) { - setPropertyValue(session, PropertyImpl.NEXT_DBID_KEY, Long.toString(nextDbid)); + public static void setNextDbid(DbSession dbSession, long nextDbid) { + setPropertyValue(dbSession, PropertyImpl.NEXT_DBID_KEY, Long.toString(nextDbid)); } - public static String getDbVersion(Session session) { - String dbVersionPropertyValue = getPropertyValue(session, PropertyImpl.DB_VERSION_KEY); + public static String getDbVersion(DbSession dbSession) { + String dbVersionPropertyValue = getPropertyValue(dbSession, PropertyImpl.DB_VERSION_KEY); if (dbVersionPropertyValue != null) { return dbVersionPropertyValue; } return null; } - public static void setDbVersionToLibraryVersion(Session session) { - setPropertyValue(session, PropertyImpl.DB_VERSION_KEY, ProcessEngineImpl.JBPM_LIBRARY_VERSION); + public static void setDbVersionToLibraryVersion(DbSession dbSession) { + setPropertyValue(dbSession, PropertyImpl.DB_VERSION_KEY, ProcessEngineImpl.JBPM_LIBRARY_VERSION); } - public static void createProperties(Session session) { - setDbVersionToLibraryVersion(session); - setNextDbid(session, 1); + public static void createProperties(DbSession dbSession) { + setDbVersionToLibraryVersion(dbSession); + setNextDbid(dbSession, 1); } - public static void initializeNextDbid(Session session) { - DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class); + public static void initializeNextDbid(DbSession dbSession) { long nextDbid = dbSession.getMaxDbid() + 1; - setNextDbid(session, nextDbid); + setNextDbid(dbSession, nextDbid); if (log.isInfoEnabled()) { log.info("nextDbid is initialized to " + nextDbid); } } - protected static String getPropertyValue(Session session, String propertyKey) { - PropertyImpl dbidProperty = getProperty(session, propertyKey); + protected static String getPropertyValue(DbSession dbSession, String propertyKey) { + PropertyImpl dbidProperty = getProperty(dbSession, propertyKey); if (dbidProperty == null) { return null; } return dbidProperty.getValue(); } - protected static void setPropertyValue(Session session, String propertyKey, String propertyValue) { - PropertyImpl property = getProperty(session, propertyKey); + protected static void setPropertyValue(DbSession dbSession, String propertyKey, String propertyValue) { + PropertyImpl property = getProperty(dbSession, propertyKey); if (property == null) { property = new PropertyImpl(propertyKey, propertyValue); - session.save(property); + dbSession.save(property); } else { property.setValue(propertyValue); } } - protected static PropertyImpl getProperty(Session session, String key) { - return (PropertyImpl) session.get(PropertyImpl.class, key); + protected static PropertyImpl getProperty(DbSession dbSession, String key) { + return (PropertyImpl) dbSession.get(PropertyImpl.class, key); } - public static void setDbVersionTo41(Session session) { - setPropertyValue(session, DB_VERSION_KEY, "4.1"); + public static void setDbVersionTo41(DbSession dbSession) { + setPropertyValue(dbSession, DB_VERSION_KEY, "4.1"); } // getters and setters ////////////////////////////////////////////////////// Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -25,8 +25,6 @@ import org.jbpm.api.cmd.Command; import org.jbpm.internal.log.Log; -import org.hibernate.StaleStateException; - /** retries the command execution in case hibernate throws optimistic locking * (StaleObjectException) exceptions. * @@ -41,14 +39,16 @@ long delay = 50; long delayFactor = 4; + protected Class<?> targetExceptionClass; + public <T> T execute(Command<T> command) { // TODO JBPM-2196 unify the retry code with the JtaTransactionInterceptor int attempt = 1; long sleepTime = delay; - while (attempt<=retries) { - if (attempt>1) { + while (attempt <= retries) { + if (attempt > 1) { log.trace("retrying..."); } try { @@ -83,8 +83,13 @@ */ protected boolean isCausedByOptimisticLockingFailure( Throwable throwable) { + if (targetExceptionClass == null) { + log.warn("didnot config a targetExceptionClass, the retryInterceptor is disabled."); + return false; + } + while (throwable != null) { - if (throwable instanceof StaleStateException) { + if (targetExceptionClass.isAssignableFrom(throwable.getClass())) { return true; } else { throwable = throwable.getCause(); @@ -112,4 +117,8 @@ public void setDelayFactor(long delayFactor) { this.delayFactor = delayFactor; } + + public void setTargetExceptionClass(Class<?> targetExceptionClass) { + this.targetExceptionClass = targetExceptionClass; + } } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/OptimisticLockingException.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/OptimisticLockingException.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/OptimisticLockingException.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -0,0 +1,41 @@ +/* + * 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.pvm.internal.tx; + +import org.jbpm.api.JbpmException; + + +/** + * @author Tom Baeyens + */ +public class OptimisticLockingException extends JbpmException { + + private static final long serialVersionUID = 1L; + + public OptimisticLockingException(String message) { + super(message); + } + + public OptimisticLockingException(String message, Throwable cause) { + super(message, cause); + } +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -21,6 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; +import org.hibernate.StaleStateException; import org.jbpm.pvm.internal.svc.RetryInterceptor; import org.jbpm.pvm.internal.tx.JtaRetryInterceptor; import org.jbpm.pvm.internal.util.XmlUtil; @@ -30,7 +31,7 @@ import org.w3c.dom.Element; /** parses a descriptor for creating a {@link RetryInterceptor}. - * + * * See schema docs for more details. * * @author Tom Baeyens @@ -43,15 +44,16 @@ public Object parse(Element element, Parse parse, Parser parser) { RetryInterceptor retryInterceptor = null; - + String type = XmlUtil.attribute(element, "type"); if ("jta".equals(type)) { retryInterceptor = new JtaRetryInterceptor(); } else { retryInterceptor = new RetryInterceptor(); + retryInterceptor.setTargetExceptionClass(StaleStateException.class); } - - + + if (element.hasAttribute("retries")) { String retriesText = element.getAttribute("retries"); try { Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2010-09-02 14:53:46 UTC (rev 6647) @@ -6,7 +6,7 @@ <import resource="jbpm.mail.templates.xml" /> <process-engine-context> - + <repository-service /> <repository-cache /> <execution-service /> @@ -16,30 +16,31 @@ <task-service /> <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator"> + <field name="targetExceptionClass"><class class-name="org.hibernate.StaleStateException" /></field> <field name="commandService"><ref object="newTxRequiredCommandService" /></field> </object> <object class="org.jbpm.pvm.internal.id.DatabaseIdComposer" init="eager" /> - + <object class="org.jbpm.pvm.internal.el.JbpmElFactoryImpl" /> <types resource="jbpm.variable.types.xml" /> <address-resolver /> - + </process-engine-context> <transaction-context> <repository-session /> <db-session /> - + <message-session /> <timer-session /> - + <history-sessions> <object class="org.jbpm.pvm.internal.history.HistorySessionImpl" /> </history-sessions> - + <mail-session> <mail-server> <session-properties resource="jbpm.mail.properties" /> Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/id/DbidGeneratorTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/id/DbidGeneratorTest.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/id/DbidGeneratorTest.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -36,16 +36,16 @@ * @author Tom Baeyens */ public class DbidGeneratorTest extends TestCase { - + private static Log log = Log.getLog(DbidGeneratorTest.class.getName()); - + public void testDbidGenerator() { ProcessEngine processEngine = new Configuration().buildProcessEngine(); - + DbidGenerator dbidGenerator = processEngine.get(DbidGenerator.class); - + assertEquals(1, dbidGenerator.getNextId()); - + processEngine.execute(new Command<Void>() { private static final long serialVersionUID = 1L; public Void execute(Environment environment) throws Exception { @@ -57,7 +57,7 @@ return null; } }); - + for (int i=2; i<10020; i++) { assertEquals(i, dbidGenerator.getNextId()); if ((i%1000) == 0) { @@ -76,7 +76,7 @@ log.debug("just got dbid "+i+"..."); } } - // the following 'user' exception will cause the user transaction to + // the following 'user' exception will cause the user transaction to // roll back, but the dbid-transaction should have been committed throw new RuntimeException("user exception"); } @@ -104,7 +104,7 @@ log.debug("just got dbid "+i+"..."); } } - // the following 'user' exception will cause the user transaction to + // the following 'user' exception will cause the user transaction to // roll back, but the dbid-transaction should have been committed throw new RuntimeException("user exception"); } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/svc/RetryInterceptorTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/svc/RetryInterceptorTest.java 2010-09-02 12:32:06 UTC (rev 6646) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/svc/RetryInterceptorTest.java 2010-09-02 14:53:46 UTC (rev 6647) @@ -45,11 +45,13 @@ public void testShouldRetryStaleStateException() { RetryInterceptor retryInterceptor = new RetryInterceptor(); + retryInterceptor.setTargetExceptionClass(StaleStateException.class); assertTrue(retryInterceptor.isCausedByOptimisticLockingFailure(new StaleStateException("test"))); } public void testShouldRetry() { RetryInterceptor retryInterceptor = new RetryInterceptor(); + retryInterceptor.setTargetExceptionClass(StaleStateException.class); assertTrue(retryInterceptor.isCausedByOptimisticLockingFailure( new HibernateOptimisticLockingFailureException(new StaleStateException("test")) ));

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6646 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-09-02 08:32:06 -0400 (Thu, 02 Sep 2010) New Revision: 6646 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java Log: JBPM-2931 simpleDateFormat is not thread safe. so create instances each times. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java 2010-09-02 10:48:30 UTC (rev 6645) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java 2010-09-02 12:32:06 UTC (rev 6646) @@ -37,26 +37,28 @@ public class DateToStringConverter implements Converter { private static final long serialVersionUID = 1L; - - DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS"); - + + private String format = "yyyy-MM-dd HH:mm:ss,SSS"; + public Object convert(Object o, ScopeInstanceImpl scopeInstance, Variable variable) { - return dateFormat.format((Date)o); + DateFormat dateFormat = new SimpleDateFormat(format); + return dateFormat.format((Date) o); } public Object revert(Object o, ScopeInstanceImpl scopeInstance, Variable variable) { try { - return dateFormat.parseObject((String)o); + DateFormat dateFormat = new SimpleDateFormat(format); + return dateFormat.parseObject((String) o); } catch (ParseException e) { - throw new JbpmException("invalid date format in date variable: "+o, e); + throw new JbpmException("invalid date format in date variable: " + o, e); } } public boolean supports(Object value, ScopeInstanceImpl scopeInstance, Variable variable) { - return ((value!=null) && (value instanceof Date)); + return ((value != null) && (value instanceof Date)); } public void setFormat(String format) { - dateFormat = new SimpleDateFormat(format); + this.format = format; } }

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6645 - jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-09-02 06:48:30 -0400 (Thu, 02 Sep 2010) New Revision: 6645 Added: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml Log: Add overlay_jbpm_jpdl_jar.xml patches for soa-distribution Added: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml 2010-09-02 10:48:30 UTC (rev 6645) @@ -0,0 +1,18 @@ +<project name="Generate the customer jbpm.cfg.xml" default="apply.patch"> +  + <property name="module_work_dir" value="${module_base_dir}/target/work" /> + <property name="jbpm_config" value="${module_work_dir}/patch_jbpm_cfg/org/jbpm/default.jbpm.cfg.xml" /> + + + <target name="apply.patch" > + <unjar src="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" dest="${module_work_dir}/patch_jbpm_cfg/" overwrite="true"/> + + +  + <replace file="${jbpm_config}" token='' value='' value='==== Logging Service (end) -->' /> + + <delete file="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" /> + <jar destfile="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" basedir="${module_work_dir}/patch_jbpm_cfg/" /> + </target> +</project>

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6644 - in jbpm3/branches/jbpm-3.2-soa/modules: core/scripts and 2 other directories.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-09-02 06:20:47 -0400 (Thu, 02 Sep 2010) New Revision: 6644 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/build-common.xml jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/build.xml jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_database_sql.xml jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_jsf_console.xml jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/remove_uninstaller.xml jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/remove_unneeded_docs.xml Log: Update soa-distribution patches and build process, including move soa profile out form core module Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-09-02 10:02:50 UTC (rev 6643) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-09-02 10:20:47 UTC (rev 6644) @@ -177,37 +177,6 @@  <profiles> -  - <profile> - <id>soa</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>gen-config-soa</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="database" value="${database}" /> - <ant antfile="scripts/antrun-config.xml" target="gen-hibernate-config" /> - <ant antfile="scripts/antrun-config.xml" target="gen-jbpm-config-soa" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> -  + <project name="SOA common routines"> <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.path}"/>  + f=new File(properties['module_base_dir'] + "/pre-patch") + if (f.exists()){ + f.eachFileMatch(~/.*\.xml/){ + println "patch:"+it + ant.ant(antfile:it, target:"apply.patch"){ + property(name:"module_base_dir", value:properties['module_base_dir']) + property(name:"groovy.path", value:properties['groovy.path']) + } + } + } +  ant.ant(antfile:"build.xml", dir:properties['module_base_dir'], target:"build"){ property(name:"module_base_dir", value:properties['module_base_dir']) property(name:"project.version", value:properties['project.version']) }  - println("hello, post-patch") f=new File(properties['module_base_dir'] + "/post-patch") if (f.exists()){ f.eachFileMatch(~/.*\.xml/){ println "patch:"+it ant.ant(antfile:it, target:"apply.patch"){ property(name:"module_base_dir", value:properties['module_base_dir']) + property(name:"groovy.path", value:properties['groovy.path']) } } } @@ -34,6 +49,82 @@ </groovy> </target> +  + <target name="url.fetch"> + <groovy> + def u_base_url=properties['base_url'] + def u_filename=properties['filename'] + def u_cache_dir=properties['cache_dir'] + def u_username=properties['username'] + def u_password=properties['password'] + + def u_cache_file="${u_cache_dir}/${u_filename}" + def u_cache_file_md5="${u_cache_dir}/${u_filename}.MD5" + def u_url_md5="${u_base_url}/${u_filename}.MD5" + def u_url_md5_l="${u_base_url}/${u_filename}.md5" + def u_url_md5_all="${u_base_url}/MD5SUM" + + def ant=new AntBuilder() + + if(properties['md5_sum'] != null && (properties['md5_sum'].toBoolean() == true)) + do_md5_sum=true + else + do_md5_sum=false + if(!(new File(properties['cache_dir']).exists())){ + ant.mkdir(dir:properties['cache_dir']) + } + if(do_md5_sum && !new File("${u_cache_file_md5}").exists()){ +printf("username is %s\n", "${u_username}"); + if ("${u_username}" == "null" || "${u_username}" == "") { + ant.get(src:"${u_url_md5_all}", dest:"${u_cache_file_md5}", verbose:"no", ignoreerrors:"yes") + ant.get(src:"${u_url_md5_l}", dest:"${u_cache_file_md5}", verbose:"no", ignoreerrors:"yes") + ant.get(src:"${u_url_md5}", dest:"${u_cache_file_md5}", verbose:"no", ignoreerrors:"yes") + } else { + ant.get(src:"${u_url_md5_all}", dest:"${u_cache_file_md5}", verbose:"no", username:"${u_username}", password:"${u_password}", ignoreerrors:"yes") + ant.get(src:"${u_url_md5_l}", dest:"${u_cache_file_md5}", verbose:"no", username:"${u_username}", password:"${u_password}", ignoreerrors:"yes") + ant.get(src:"${u_url_md5}", dest:"${u_cache_file_md5}", verbose:"no", username:"${u_username}", password:"${u_password}", ignoreerrors:"yes") + } + } + + if(!new File("${u_cache_file}").exists()){ + if ("${u_username}" == "null" || "${u_username}" == "") { + ant.get(src:"${u_base_url}/${u_filename}", dest:"${u_cache_file}", verbose:"no") +printf("Null\n"); + } else { + ant.get(src:"${u_base_url}/${u_filename}", dest:"${u_cache_file}", verbose:"no", username:"${u_username}", password:"${u_password}") +printf("Full\n"); + } + } + + if (do_md5_sum) { + printf("Checksumming file : %s\n", u_filename) + def fmd5=new File("${u_cache_file_md5}") + def md5Value="" + fmd5.eachLine(){ + if (it.contains("${u_filename}")) { + md5Value=(it.split())[0] + } else if (!it.contains(" ")) { + md5Value=it; + } + } + printf("Expecting checksum : %s\n", md5Value) + ant.checksum(file:"${u_cache_file}", algorithm:"md5", property:"antmd5Value") + printf("Received checksum : %s\n", ant.getProject().getProperty('antmd5Value')) + if(ant.getProject().getProperty('antmd5Value') != md5Value){ + ant.fail(message:"${u_cache_file} checksum verification failed!") + } + } + </groovy> + </target> +  -  - <mkdir dir="${module_base_dir}/target/dist/javadocs"/> - <unzip src="${jbpm_install_path}/docs/jbpm-enterprise-javadoc.jar" - dest="${module_base_dir}/target/dist/javadocs/enterprise"/> - <unzip src="${jbpm_install_path}/docs/jbpm-identity-javadoc.jar" dest="${module_base_dir}/target/dist/javadocs/identity"/> - <unzip src="${jbpm_install_path}/docs/jbpm-jpdl-javadoc.jar" dest="${module_base_dir}/target/dist/javadocs/jbpm-jpdl"/> +  + <copy todir="${module_base_dir}/target/dist/javadocs" overwrite="true"> + <fileset dir="${module_base_dir}/target/work/javadocs" includes="**/*" /> + </copy> + <zip destfile="${module_base_dir}/target/${module_build_finalName}.zip" > <zipfileset dir="${module_base_dir}/target/dist" prefix="jbpm" includes="**/*" /> </zip> Modified: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/pom.xml 2010-09-02 10:02:50 UTC (rev 6643) +++ jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/pom.xml 2010-09-02 10:20:47 UTC (rev 6644) @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <name>jBPM3- Build distribution for SOA-P </name> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-soa</artifactId> + <artifactId>jbpm-soa-distribution</artifactId> <packaging>pom</packaging>  @@ -79,9 +79,8 @@ <artifactItems> <artifactItem> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> - <version>3.2.10-SNAPSHOT</version> - <classifier>soa</classifier> + <artifactId>jsf-console-soa-distribution</artifactId> + <version>${project.version}</version> <type>war</type> </artifactItem> </artifactItems> @@ -96,39 +95,11 @@ <version>1.3</version> <dependencies> <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> - <version>3.2.10-SNAPSHOT</version> - <classifier>soa</classifier> - <type>war</type> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> <version>1.7.0</version> </dependency> </dependencies> - <executions> <execution> <id>SOA-P build process</id> Modified: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_database_sql.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_database_sql.xml 2010-09-02 10:02:50 UTC (rev 6643) +++ jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_database_sql.xml 2010-09-02 10:20:47 UTC (rev 6644) @@ -5,9 +5,6 @@ <fileset dir="${module_base_dir}/target/work/jbpm-installed/database"> <include name="**/jbpm.jpdl.*.update322.sql"/> </fileset> - <fileset dir="${module_base_dir}/target/work/jbpm-jpdl/database"> - <include name="**/jbpm.jpdl.*.update322.sql"/> - </fileset> </delete> </target> Modified: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml 2010-09-02 10:02:50 UTC (rev 6643) +++ jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml 2010-09-02 10:20:47 UTC (rev 6644) @@ -31,13 +31,5 @@ <property name="hibernate.current_session_context_class">jta</property>]]></replacevalue> </replace> -  -  - <replace file="${module_base_dir}/target/work/jbpm-jpdl/config/hibernate.cfg.xml"> - <replacetoken><![CDATA[JTA transaction properties (begin) ===]]></replacetoken> - <replacevalue><![CDATA[JTA transaction properties (begin) === - <property name="jta.UserTransaction">UserTransaction</property> - <property name="hibernate.current_session_context_class">jta</property>]]></replacevalue> - </replace> </target> </project> Modified: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_jsf_console.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_jsf_console.xml 2010-09-02 10:02:50 UTC (rev 6643) +++ jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/overlay_jsf_console.xml 2010-09-02 10:20:47 UTC (rev 6644) @@ -1,15 +1,14 @@ -<project name="overlay_jsf_console" default="apply.patch"> +<project name="overlay jsf console with SOA version" default="apply.patch"> + <property name="module_work_dir" value="${module_base_dir}/target/work" /> <target name="apply.patch" > - <delete> - <fileset dir="${module_base_dir}/target/work/jbpm-installed/lib"> - <include name="jsf-console.war"/> - </fileset> - </delete> - <copy tofile="${module_base_dir}/target/work/jbpm-installed/lib/jsf-console.war" overwrite="yes" > - <fileset dir="${module_base_dir}/target/dependency/"> - <include name="jsf-console*.war"/> - </fileset> + <delete file="${module_work_dir}/jbpm-installed/lib/jsf-console.war" /> + <copy tofile="${module_work_dir}/jbpm-installed/lib/jsf-console.war" overwrite="true" > + <fileset dir="${module_base_dir}/target/dependency/" includes="jsf-console*" /> </copy> + + <delete dir="${module_work_dir}/jboss/server/default/deploy/jbpm/jsf-console.war" /> + <unwar src="${module_work_dir}/jbpm-installed/lib/jsf-console.war" dest="${module_work_dir}/jboss/server/default/deploy/jbpm/jsf-console.war" overwrite="true" /> + </target> </project> Modified: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/remove_uninstaller.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/remove_uninstaller.xml 2010-09-02 10:02:50 UTC (rev 6643) +++ jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/remove_uninstaller.xml 2010-09-02 10:20:47 UTC (rev 6644) @@ -1,7 +1,7 @@ <project name="remove_uninstall" default="apply.patch"> <target name="apply.patch" >  - <delete dir="${module_base_dir}/target/work/jbpm-jpdl/Uninstaller"/> - <delete file="${module_base_dir}/target/work/jbpm-jpdl/.installationinformation"/> + <delete dir="${module_base_dir}/target/work/jbpm-installed/Uninstaller"/> + <delete file="${module_base_dir}/target/work/jbpm-installed/.installationinformation"/> </target> </project> Modified: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/remove_unneeded_docs.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/remove_unneeded_docs.xml 2010-09-02 10:02:50 UTC (rev 6643) +++ jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/post-patch/remove_unneeded_docs.xml 2010-09-02 10:20:47 UTC (rev 6644) @@ -1,7 +1,12 @@ <project name="patchname" default="apply.patch"> - <property name="package_root" value="${module_base_dir}/target/work/jbpm-jpdl" /> + <property name="package_root" value="${module_base_dir}/target/work/jbpm-installed" /> <target name="apply.patch"> + <unzip src="${package_root}/docs/jbpm-enterprise-javadoc.jar" + dest="${module_base_dir}/target/work/javadocs/enterprise"/> + <unzip src="${package_root}/docs/jbpm-identity-javadoc.jar" dest="${module_base_dir}/target/work/javadocs/identity"/> + <unzip src="${package_root}/docs/jbpm-jpdl-javadoc.jar" dest="${module_base_dir}/target/work/javadocs/jbpm-jpdl"/> +  <delete dir="${package_root}/docs"/>

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6643 - in projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution: post-patch and 3 other directories.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-09-02 06:02:50 -0400 (Thu, 02 Sep 2010) New Revision: 6643 Removed: projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/web.xml Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/build.xml projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/pom.xml projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/post-patch/patch_jbpm_console_ui.xml projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/gpd-console/web.xml projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/WEB-INF/web.xml Log: Update soa-distribution patches and build file Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/build.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/build.xml 2010-09-02 07:14:31 UTC (rev 6642) +++ projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/build.xml 2010-09-02 10:02:50 UTC (rev 6643) @@ -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-3.2-soa/soa-distribution/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/pom.xml 2010-09-02 07:14:31 UTC (rev 6642) +++ projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/pom.xml 2010-09-02 10:02:50 UTC (rev 6643) @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <name>jBPM3 - Build SOA-P distribution</name> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console-soa</artifactId> + <artifactId>jsf-console-soa-distribution</artifactId> <packaging>pom</packaging>  @@ -23,48 +23,94 @@ <relativePath>../pom.xml</relativePath> </parent> - <properties> + <properties> <soa_common_build_src.groupId>org.jboss.jbosssoa</soa_common_build_src.groupId> <soa_common_build_src.artifactId>soa-common-build-src</soa_common_build_src.artifactId> <soa_common_build_src.version>1.0.0</soa_common_build_src.version> </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>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>gpd-deployer</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> </dependencies> -  +  <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-soa-common-build-src</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <outputDirectory>${project.basedir}</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>${soa_common_build_src.groupId}</groupId> - <artifactId>${soa_common_build_src.artifactId}</artifactId> - <version>${soa_common_build_src.version}</version> - <type>zip</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-soa-common-build-src</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${soa_common_build_src.groupId}</groupId> + <artifactId>${soa_common_build_src.artifactId}</artifactId> + <version>${soa_common_build_src.version}</version> + <type>zip</type> + </artifactItem> + </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> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -102,53 +148,50 @@ </dependencies> <executions> - <execution> - <id>SOA build process</id> - <phase>process-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="build-common.xml" target="soa.routine.build" dir="${project.basedir}" - inheritAll="false"> - <property name="module_base_dir" value="${project.basedir}" /> - <property name="module_build_finalName" value="${project.build.finalName}" /> - <property name="project.version" value="${project.version}" /> - <property name="groovy.path" - value="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/${project.build.finalName}.zip</file> - <type>zip</type> - </artifact> - <artifact> - <file>${project.build.directory}/${project.build.finalName}.war</file> - <type>war</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> + <execution> + <id>SOA build process</id> + <phase>process-classes</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="build-common.xml" target="soa.routine.build" dir="${project.basedir}" inheritAll="false"> + <property name="module_base_dir" value="${project.basedir}"/> + <property name="module_build_finalName" value="${project.build.finalName}"/> + <property name="project.version" value="${project.version}"/> + <property name="groovy.path" value="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" /> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/${project.build.finalName}.zip</file> + <type>zip</type> + </artifact> + <artifact> + <file>${project.build.directory}/${project.build.finalName}.war</file> + <type>war</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/post-patch/patch_jbpm_console_ui.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/post-patch/patch_jbpm_console_ui.xml 2010-09-02 07:14:31 UTC (rev 6642) +++ projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/post-patch/patch_jbpm_console_ui.xml 2010-09-02 10:02:50 UTC (rev 6643) @@ -2,7 +2,7 @@  <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-3.2-soa/soa-distribution/resource/gpd-console/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/gpd-console/web.xml 2010-09-02 07:14:31 UTC (rev 6642) +++ projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/gpd-console/web.xml 2010-09-02 10:02:50 UTC (rev 6643) @@ -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-3.2-soa/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml 2010-09-02 07:14:31 UTC (rev 6642) +++ projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml 2010-09-02 10:02:50 UTC (rev 6643) @@ -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>  <message-destination-ref> <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> <jndi-name>queue/JbpmJobQueue</jndi-name> Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/WEB-INF/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/WEB-INF/web.xml 2010-09-02 07:14:31 UTC (rev 6642) +++ projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/WEB-INF/web.xml 2010-09-02 10:02:50 UTC (rev 6643) @@ -5,49 +5,49 @@ <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-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> </servlet>  <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> </servlet-mapping>  <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/app/pi/*</url-pattern> + <servlet-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> + <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> + <description> Facelets debug output </description> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>false</param-value> </context-param>  <welcome-file-list> - <welcome-file>index.jsp</welcome-file> + <welcome-file>index.jsp</welcome-file> </welcome-file-list>  <security-role> - <role-name>admin</role-name> + <role-name>admin</role-name> </security-role> <security-role> - <role-name>user</role-name> + <role-name>user</role-name> </security-role>  <security-constraint> - <web-resource-collection> - <web-resource-name>Secure Area</web-resource-name> - <url-pattern>/app/*</url-pattern> - <http-method>GET</http-method> - <http-method>POST</http-method> - </web-resource-collection> - <auth-constraint> - <role-name>user</role-name> - </auth-constraint> + <web-resource-collection> + <web-resource-name>Secure Area</web-resource-name> + <url-pattern>/app/*</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>user</role-name> + </auth-constraint> </security-constraint> -  +  <login-config> - <auth-method>FORM</auth-method> - <form-login-config> - <form-login-page>/login.jsp</form-login-page> - <form-error-page>/login.jsp?error=1</form-error-page> - </form-login-config> + <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>   @@ -102,13 +100,15 @@ </listener> <!== Job executor launcher --> - <listener> - <description>Closes the jBPM configuration on destruction, releasing resources. +  +  +  +  +  </web-app> Deleted: projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/web.xml 2010-09-02 07:14:31 UTC (rev 6642) +++ projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/resource/jbpm-console/web.xml 2010-09-02 10:02:50 UTC (rev 6643) @@ -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> - -  - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - -  - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/app/pi/*</url-pattern> - </servlet-mapping> - - <context-param> - <description> Use Documents Saved as *.xhtml </description> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <description> Facelets debug output </description> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>false</param-value> - </context-param> - -  - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - -  - <security-role> - <role-name>admin</role-name> - </security-role> - <security-role> - <role-name>user</role-name> - </security-role> - -  - <security-constraint> - <web-resource-collection> - <web-resource-name>Secure Area</web-resource-name> - <url-pattern>/app/*</url-pattern> - <http-method>GET</http-method> - <http-method>POST</http-method> - </web-resource-collection> - <auth-constraint> - <role-name>user</role-name> - </auth-constraint> - </security-constraint> - -  - <login-config> - <auth-method>FORM</auth-method> - <form-login-config> - <form-login-page>/login.jsp</form-login-page> - <form-error-page>/login.jsp?error=1</form-error-page> - </form-login-config> - </login-config> - -  - -  - -  - -  - -  - -  - -  - -  - -</web-app>

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6642 - jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-09-02 03:14:31 -0400 (Thu, 02 Sep 2010) New Revision: 6642 Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml Log: fix a typo in soa-distribution patch Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml 2010-09-02 06:32:27 UTC (rev 6641) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml 2010-09-02 07:14:31 UTC (rev 6642) @@ -10,7 +10,7 @@  <replace file="${jbpm_config}" token='' value='' value='=== Logging Service (begin) -->' /> + <replace file="${jbpm_config}" token='' value='==== Logging Service (end) -->' /> <delete file="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" /> <jar destfile="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" basedir="${module_work_dir}/patch_jbpm_cfg/" />

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6641 - jbpm3/branches/jbpm-3.2-soa.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-02 02:32:27 -0400 (Thu, 02 Sep 2010) New Revision: 6641 Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml Log: JBPM-2858 migrate enterprise tests to cactus maven2 plugin Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-01 07:18:28 UTC (rev 6640) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-02 06:32:27 UTC (rev 6641) @@ -42,6 +42,7 @@  <properties> <cactus.version>1.8.1</cactus.version> + <cargo.version>1.0.3</cargo.version>  <db2jcc.version>3.1.57</db2jcc.version> @@ -101,6 +102,21 @@ <version>${cactus.version}</version> </dependency> <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo</artifactId> + <version>${cargo.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + <version>${cargo.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${cargo.version}</version> + </dependency> + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.7.0</version> @@ -183,9 +199,9 @@ </exclusions> </dependency> <dependency> - <groupId>org.codehaus.izpack</groupId> - <artifactId>izpack-standalone-compiler</artifactId> - <version>4.3.2</version> + <groupId>org.codehaus.izpack</groupId> + <artifactId>izpack-standalone-compiler</artifactId> + <version>4.3.2</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> @@ -322,7 +338,6 @@ <artifactId>jconnect</artifactId> <version>${jconnect.version}</version> </dependency> - </dependencies> </dependencyManagement> @@ -377,9 +392,75 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.cactus</groupId> - <artifactId>cactus.integration.maven2</artifactId> - <version>${cactus.version}</version> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.integration.maven2</artifactId> + <version>${cactus.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.integration.shared.api</artifactId> + <version>${cactus.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>org.mortbay.jetty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId> + <version>${cactus.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>org.mortbay.jetty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + <version>${cargo.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${cargo.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>${cargo.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> </plugin> <plugin>

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits September 2010