September 2008 - jbpm-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 12:11:14 -0400 (Thu, 04 Sep 2008) New Revision: 2112 Added: jbpm3/trunk/.classpath Log: Add root .classpath Added: jbpm3/trunk/.classpath =================================================================== --- jbpm3/trunk/.classpath (rev 0) +++ jbpm3/trunk/.classpath 2008-09-04 16:11:14 UTC (rev 2112) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath>

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2111 - in jbpm4/pvm/trunk: modules/core and 12 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-09-04 11:33:24 -0400 (Thu, 04 Sep 2008) New Revision: 2111 Modified: jbpm4/pvm/trunk/modules/core/pom.xml jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/ManagementService.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/job/Job.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/job/JobTestHelper.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/session/PvmDbSession.java jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java jbpm4/pvm/trunk/pom.xml jbpm4/pvm/trunk/readme.html Log: management service interface shaping Modified: jbpm4/pvm/trunk/modules/core/pom.xml =================================================================== --- jbpm4/pvm/trunk/modules/core/pom.xml 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/pom.xml 2008-09-04 15:33:24 UTC (rev 2111) @@ -188,8 +188,8 @@ </configuration> </execution> </executions> - </plugin> - <plugin> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/ManagementService.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/ManagementService.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/ManagementService.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -23,11 +23,12 @@ import java.util.List; +import org.jbpm.pvm.job.Job; import org.jbpm.pvm.job.Message; import org.jbpm.pvm.job.Timer; -/** operations targetted to system operators that need to keep +/** operations targeted to system operators that need to keep * the process engine up and running. This functionality is typically * exposed through a management web console. * @@ -35,6 +36,22 @@ */ public interface ManagementService { - List<Timer> getTimers(); - List<Message> getMessages(); + /** all the messages which are waiting to be executed. + * Messages that are already acquired will not show up in the list. */ + List<Message> getMessages(int firstResult, int maxResults); + + /** all the timers which are waiting for their due date. + * Timers that are already acquired will not show up in the list. */ + List<Timer> getTimers(int firstResult, int maxResults); + + /** all jobs for which all the retry attempts have failed and + * which are parked, waiting for operator intervention */ + List<Job> getJobsWithException(int firstResult, int maxResults); + + /** resets the retry count, clears the exception and executes the job. + * An exception is thrown out of this method in case the execution + * of the job fails. In case the async command executor is configured + * for this service, failing job execution will not result into an + * exception coming out of this method. */ + void executeJob(String jobId); } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -31,12 +31,17 @@ /** * @author Tom Baeyens */ -public class GetMessagesCmd implements Command<List<Message>> { +public class GetMessagesCmd extends QueryCommand<List<Message>> { private static final long serialVersionUID = 1L; + public GetMessagesCmd(int firstResult, int maxResults) { + super(firstResult, maxResults); + } + public List<Message> execute(Environment environment) throws Exception { - return environment.get(PvmDbSession.class).findMessages(); + PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); + return pvmDbSession.findMessages(firstResult, maxResults); } } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -30,12 +30,16 @@ /** * @author Tom Baeyens */ -public class GetTimersCmd implements Command<List<Timer>> { +public class GetTimersCmd extends QueryCommand<List<Timer>> { private static final long serialVersionUID = 1L; + public GetTimersCmd(int firstResult, int maxResults) { + super(firstResult, maxResults); + } + public List<Timer> execute(Environment environment) throws Exception { - return environment.get(PvmDbSession.class).findTimers(); + PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); + return pvmDbSession.findTimers(firstResult, maxResults); } - } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -96,18 +96,27 @@ return (ClientExecution) query.uniqueResult(); } - public List<Timer> findTimers() { + public List<Timer> findTimers(int firstResult, int maxResults) { // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml - return session.getNamedQuery("findTimers").list(); + Query query = session.getNamedQuery("findTimers"); + query.setFirstResult(firstResult); + query.setMaxResults(maxResults); + return query.list(); } - public List<Message> findMessages() { + public List<Message> findMessages(int firstResult, int maxResults) { // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml - return session.getNamedQuery("findMessages").list(); + Query query = session.getNamedQuery("findMessages"); + query.setFirstResult(firstResult); + query.setMaxResults(maxResults); + return query.list(); } - public List<Job> findDeadJobs() { + public List<Job> findJobsWithException(int firstResult, int maxResults) { // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml - return session.getNamedQuery("findDeadJobs").list(); + Query query = session.getNamedQuery("findJobsWithException"); + query.setFirstResult(firstResult); + query.setMaxResults(maxResults); + return query.list(); } } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -21,11 +21,6 @@ */ package org.jbpm.pvm.internal.spring; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import org.jbpm.pvm.env.Context; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.env.SpringEnvironmentFactory; import org.jbpm.pvm.internal.env.BasicEnvironment; Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -27,6 +27,7 @@ import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.GetMessagesCmd; import org.jbpm.pvm.internal.cmd.GetTimersCmd; +import org.jbpm.pvm.job.Job; import org.jbpm.pvm.job.Message; import org.jbpm.pvm.job.Timer; @@ -38,12 +39,21 @@ protected CommandService commandService; - public List<Message> getMessages() { - return commandService.execute(new GetMessagesCmd()); + public void executeJob(String jobId) { + // TODO } - public List<Timer> getTimers() { - return commandService.execute(new GetTimersCmd()); + public List<Job> getJobsWithException(int firstResult, int maxResults) { + // TODO + return null; } + public List<Message> getMessages(int firstResult, int maxResults) { + return commandService.execute(new GetMessagesCmd(firstResult, maxResults)); + } + + public List<Timer> getTimers(int firstResult, int maxResults) { + return commandService.execute(new GetTimersCmd(firstResult, maxResults)); + } + } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/job/Job.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/job/Job.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/job/Job.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -23,7 +23,7 @@ import java.util.Date; -import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.Execution; /** base class for timers and messages. * @@ -45,9 +45,9 @@ boolean isExclusive(); - ExecutionImpl getExecution(); + Execution getExecution(); - ExecutionImpl getProcessInstance(); + Execution getProcessInstance(); Date getLockExpirationTime(); Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/job/JobTestHelper.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/job/JobTestHelper.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/job/JobTestHelper.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -57,7 +57,6 @@ Long messageDbid = (Long) query.uniqueResult(); ExecuteJobCmd executeJobCommand = new ExecuteJobCmd(messageDbid); Job job = executeJobCommand.execute(environment); - job.getExecution().getNode().getName(); return job.getExecution(); } }); Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/session/PvmDbSession.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/session/PvmDbSession.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/session/PvmDbSession.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -59,12 +59,12 @@ Execution findExecutionByKey(String processDefinitionName, String executionKey); /** timers */ - List<Timer> findTimers(); + List<Timer> findTimers(int firstResult, int maxResults); /** timers */ - List<Message> findMessages(); + List<Message> findMessages(int firstResult, int maxResults); /** the jobs for which all the retries have failed and which will not be * picked up any more by the jobImpl executor */ - public List<Job> findDeadJobs(); + public List<Job> findJobsWithException(int firstResult, int maxResults); } Modified: jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml 2008-09-04 15:33:24 UTC (rev 2111) @@ -22,11 +22,13 @@ <property name="retries" column="RETRIES_" /> <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" column="PROCESSINSTANCE_" cascade="none" foreign-key="FK_JOB_PRINST" index="IDX_JOB_PRINST"/> - <many-to-one name="execution" + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" column="EXECUTION_" cascade="none" foreign-key="FK_JOB_EXE" @@ -77,7 +79,7 @@ ]]> </query> - <query name="findDeadJobs"> + <query name="findJobsWithException"> <![CDATA[ select job from org.jbpm.pvm.internal.job.JobImpl as job Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -33,8 +33,8 @@ public void testGetJobs() { ManagementService managementService = getEnvironmentFactory().get(ManagementService.class); - assertEquals(0, managementService.getTimers().size()); - assertEquals(0, managementService.getMessages().size()); + assertEquals(0, managementService.getTimers(0, 10).size()); + assertEquals(0, managementService.getMessages(0, 10).size()); } } Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -151,7 +151,7 @@ assertNull(child); // check that timers have been deleted - List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers(); + List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers(0, 10); assertNotNull(timers); assertTrue(timers.isEmpty()); @@ -185,7 +185,7 @@ assertNull(child); // check that timers have been deleted - List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers(); + List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers(0, 10); assertNotNull(timers); assertTrue(timers.isEmpty()); @@ -294,7 +294,7 @@ assertNull(child); // check that timers have been deleted - List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers(); + List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers(0, 10); assertNotNull(timers); assertTrue(timers.isEmpty()); @@ -331,7 +331,7 @@ assertNull(child); // check that timers have been deleted - List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers(); + List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers(0, 10); assertNotNull(timers); assertTrue(timers.isEmpty()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -53,8 +53,11 @@ private void cleanTimers() { ManagementService pvmService = Environment.getCurrent().get(ManagementService.class); JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class); - for (Timer jobImpl : pvmService.getTimers()) { - jobDbSession.delete(jobImpl); + List<Timer> timers = pvmService.getTimers(0, 10); + while (! timers.isEmpty()) { + for (Timer timer : timers) { + jobDbSession.delete(timer); + } } } Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -61,11 +61,11 @@ MessageSession messageSession = environment.get(MessageSession.class); CommandMessage commandMessage = new CommandMessage(new ObjectDescriptor(SimpleTestCommand.class)); messageSession.send(commandMessage); - List<Message> messages = environment.get(PvmDbSession.class).findMessages(); + List<Message> messages = environment.get(PvmDbSession.class).findMessages(0, 10); assertNotNull(messages); assertEquals(1, messages.size()); Thread.sleep(jobExecutorTimeoutMillis * 2); - messages = environment.get(PvmDbSession.class).findMessages(); + messages = environment.get(PvmDbSession.class).findMessages(0, 10); assertNotNull(messages); assertEquals("Job has been executed before the transaction is committed !!", 1, messages.size()); return null; Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-09-04 15:33:24 UTC (rev 2111) @@ -197,8 +197,8 @@ commandService.execute(new Command<Object>() { public Object execute(Environment environment) throws Exception { PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); - List<Job> deadJobs = pvmDbSession.findDeadJobs(); - assertEquals("there should be one dead jobImpl", 1, deadJobs.size()); + List<Job> deadJobs = pvmDbSession.findJobsWithException(0, 10); + assertEquals("there should be one dead job", 1, deadJobs.size()); Session session = environment.get(Session.class); List commands = session.createQuery("from org.jbpm.pvm.internal.model.CommentImpl").list(); @@ -235,7 +235,7 @@ commandService.execute(new Command<Object>() { public Object execute(Environment environment) throws Exception { PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); - List<Job> deadJobs = pvmDbSession.findDeadJobs(); + List<Job> deadJobs = pvmDbSession.findJobsWithException(0, 10); assertEquals("there should be one dead jobImpl", 1, deadJobs.size()); return null; } Modified: jbpm4/pvm/trunk/pom.xml =================================================================== --- jbpm4/pvm/trunk/pom.xml 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/pom.xml 2008-09-04 15:33:24 UTC (rev 2111) @@ -313,6 +313,7 @@ <quiet>true</quiet> <source>1.5</source> <verbose>false</verbose> + <noqualifier>all</noqualifier> <excludePackageNames>*.internal:*.test</excludePackageNames> </configuration> </plugin> Modified: jbpm4/pvm/trunk/readme.html =================================================================== --- jbpm4/pvm/trunk/readme.html 2008-09-04 15:07:29 UTC (rev 2110) +++ jbpm4/pvm/trunk/readme.html 2008-09-04 15:33:24 UTC (rev 2111) @@ -5,6 +5,14 @@ need <a href="http://maven.apache.org/download.html">maven 2.0.9</a> </p> +<h2>Eclipse</h2> +<p>File <code>eclipse/jbpmprofile.xml</code> contains the code formatting +profile for this codebase. To add to your list of profiles in your eclipse +installation, go to <b>Window</b> --> <b>Preferences</b> --> <b>Java</b> --> +<b>Code Style</b> --> <b>Formatter</b>. Then click the "Import" button and +point to the file <code>eclipse/jbpmprofile.xml</code>. +</p> + <h2>Build the jar</h2> <code>mvn -DskipTests clean package</code>

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2110 - jbpm3/trunk/hudson/hudson-home.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 11:07:29 -0400 (Thu, 04 Sep 2008) New Revision: 2110 Modified: jbpm3/trunk/hudson/hudson-home/command.sh Log: More echo Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 15:03:25 UTC (rev 2109) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 15:07:29 UTC (rev 2110) @@ -32,13 +32,13 @@ # cd $JBPMDIR cp profiles.xml.example profiles.xml -mvn $ENVIRONMENT dependency:tree | tee $WORKSPACE/dependency-tree.txt +mvn -U $ENVIRONMENT dependency:tree | tee $WORKSPACE/dependency-tree.txt # # Build distro # -echo "mvn -U $ENVIRONMENT -Pdistro clean package" -mvn -U $ENVIRONMENT -Pdistro clean package; MVN_STATUS=$? +echo "mvn $ENVIRONMENT -Pdistro clean package" +mvn $ENVIRONMENT -Pdistro clean package; MVN_STATUS=$? if [ $MVN_STATUS -ne 0 ]; then echo maven exit status $MVN_STATUS exit 1 @@ -57,8 +57,7 @@ # # Deploy distro # -AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml -cat $AUTO_INSTALL; +AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml; cat $AUTO_INSTALL; echo "java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar $AUTO_INSTALL" java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar $AUTO_INSTALL

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2109 - jbpm3/trunk/hudson/hudson-home.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 11:03:25 -0400 (Thu, 04 Sep 2008) New Revision: 2109 Modified: jbpm3/trunk/hudson/hudson-home/command.sh Log: More echo Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 14:57:28 UTC (rev 2108) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 15:03:25 UTC (rev 2109) @@ -32,12 +32,13 @@ # cd $JBPMDIR cp profiles.xml.example profiles.xml -mvn -Ddatabase=$DATABASE dependency:tree | tee $WORKSPACE/dependency-tree.txt +mvn $ENVIRONMENT dependency:tree | tee $WORKSPACE/dependency-tree.txt # # Build distro # -mvn -U -Pdistro clean package; MVN_STATUS=$? +echo "mvn -U $ENVIRONMENT -Pdistro clean package" +mvn -U $ENVIRONMENT -Pdistro clean package; MVN_STATUS=$? if [ $MVN_STATUS -ne 0 ]; then echo maven exit status $MVN_STATUS exit 1 @@ -46,7 +47,7 @@ # # build the tests # -echo mvn $ENVIRONMENT +echo "mvn $ENVIRONMENT process-test-classes" mvn $ENVIRONMENT process-test-classes 2>&1; MVN_STATUS=$? if [ $MVN_STATUS -ne 0 ]; then echo maven exit status $MVN_STATUS @@ -57,7 +58,9 @@ # Deploy distro # AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml -cat $AUTO_INSTALL; java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar $AUTO_INSTALL +cat $AUTO_INSTALL; +echo "java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar $AUTO_INSTALL" +java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar $AUTO_INSTALL # # start jbossas @@ -75,7 +78,8 @@ # # execute tests # -mvn -Ddatabase=$DATABASE -DtestFailureIgnore=true test 2>&1 | tee $WORKSPACE/tests.log +echo "mvn $ENVIRONMENT -DtestFailureIgnore=true test" +mvn $ENVIRONMENT -DtestFailureIgnore=true test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2108 - jbpm3/trunk/hudson/hudson-home.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 10:57:28 -0400 (Thu, 04 Sep 2008) New Revision: 2108 Modified: jbpm3/trunk/hudson/hudson-home/command.sh Log: Use common auto-install-template Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 14:52:05 UTC (rev 2107) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 14:57:28 UTC (rev 2108) @@ -25,7 +25,7 @@ unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD -ENVIRONMENT="-Ddatabase=$DATABASE -Djboss.bind.address=$JBOSS_BINDADDR -Djboss.id=$CONTAINER -Djboss.home=$JBOSS_HOME" +ENVIRONMENT="-Ddatabase=$DATABASE -Djboss.id=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR" # # log dependency tree

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2107 - jbpm3/trunk/modules/distribution/scripts.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 10:52:05 -0400 (Thu, 04 Sep 2008) New Revision: 2107 Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml Log: overwrite autoinstall template Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 14:48:29 UTC (rev 2106) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 14:52:05 UTC (rev 2107) @@ -98,7 +98,7 @@  <target name="build-installer" depends="configure"> - <copy todir="${filtered.resources.dir}" filtering="true"> + <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true"> <fileset dir="${resources.dir}/installer" /> <filterset> <filter token="database.is.hsqldb" value="${database.is.hsqldb}" />

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2106 - in jbpm3/trunk: modules/distribution and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 10:48:29 -0400 (Thu, 04 Sep 2008) New Revision: 2106 Modified: jbpm3/trunk/hudson/hudson-home/command.sh jbpm3/trunk/modules/distribution/pom.xml Log: Use common auto-install-template Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 14:41:42 UTC (rev 2105) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 14:48:29 UTC (rev 2106) @@ -46,6 +46,7 @@ # # build the tests # +echo mvn $ENVIRONMENT mvn $ENVIRONMENT process-test-classes 2>&1; MVN_STATUS=$? if [ $MVN_STATUS -ne 0 ]; then echo maven exit status $MVN_STATUS Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 14:41:42 UTC (rev 2105) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 14:48:29 UTC (rev 2106) @@ -137,8 +137,8 @@ <tasks> <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> <property name="database" value="${database}" /> - <property name="jboss.home" value="${jboss422.home}" /> - <property name="jboss.id" value="jboss422" /> + <property name="jboss.home" value="${jboss.home}" /> + <property name="jboss.id" value="${jboss.id}" /> <property name="product.name" value="${project.name}" /> <property name="product.short.name" value="${artifactId}" /> <property name="product.version" value="${project.version}" />

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2105 - in jbpm3/trunk: modules/distribution and 2 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 10:41:42 -0400 (Thu, 04 Sep 2008) New Revision: 2105 Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml Removed: jbpm3/trunk/modules/distribution/docs/ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml Modified: jbpm3/trunk/hudson/hudson-home/command.sh jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml Log: Use common auto-install-template Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 13:45:19 UTC (rev 2104) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 14:41:42 UTC (rev 2105) @@ -25,7 +25,7 @@ unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD -ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME" +ENVIRONMENT="-Ddatabase=$DATABASE -Djboss.bind.address=$JBOSS_BINDADDR -Djboss.id=$CONTAINER -Djboss.home=$JBOSS_HOME" # # log dependency tree @@ -46,7 +46,7 @@ # # build the tests # -mvn -Ddatabase=$DATABASE process-test-classes 2>&1; MVN_STATUS=$? +mvn $ENVIRONMENT process-test-classes 2>&1; MVN_STATUS=$? if [ $MVN_STATUS -ne 0 ]; then echo maven exit status $MVN_STATUS exit 1 @@ -55,9 +55,8 @@ # # Deploy distro # -sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml -sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; mv tmp.xml auto-install.xml -cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar auto-install.xml +AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml +cat $AUTO_INSTALL; java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar $AUTO_INSTALL # # start jbossas Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 14:41:42 UTC (rev 2105) @@ -136,13 +136,14 @@ <configuration> <tasks> <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="database" value="${database}" /> + <property name="jboss.home" value="${jboss422.home}" /> + <property name="jboss.id" value="jboss422" /> <property name="product.name" value="${project.name}" /> <property name="product.short.name" value="${artifactId}" /> <property name="product.version" value="${project.version}" /> - <property name="jboss422.home" value="${jboss422.home}" /> - <property name="jboss423.home" value="${jboss423.home}" /> - <property name="jboss500.home" value="${jboss500.home}" /> - <ant antfile="scripts/antrun-installer.xml" target="installer" /> + <property name="user.home" value="${user.home}" /> + <ant antfile="scripts/antrun-installer.xml" target="build-installer" /> </tasks> </configuration> </execution> Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 13:45:19 UTC (rev 2104) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 14:41:42 UTC (rev 2105) @@ -58,18 +58,8 @@ <target name="init"> <echo /> - <echo message="jboss422.home=${jboss422.home}" /> - <echo message="jboss423.home=${jboss423.home}" /> - <echo message="jboss500.home=${jboss500.home}" /> + <echo message="jboss.home=${jboss.home}" /> - <property name="jboss.server.instance" value="default" /> - <property name="jboss422.available.file" value="${jboss422.home}/client/jboss-client.jar" /> - <property name="jboss423.available.file" value="${jboss423.home}/client/jboss-client.jar" /> - <property name="jboss500.available.file" value="${jboss500.home}/client/jboss-client.jar" /> - - <available property="jboss422.available" file="${jboss422.available.file}" /> - <available property="jboss423.available" file="${jboss423.available.file}" /> - <available property="jboss500.available" file="${jboss500.available.file}" /> </target>  @@ -92,18 +82,32 @@ <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> + <condition property="database.is.hsqldb" value="true" else="false"> + <equals arg1="${database}" arg2="hsqldb"/> + </condition> + <condition property="database.is.mysql" value="true" else="false"> + <equals arg1="${database}" arg2="mysql"/> + </condition> + <condition property="database.is.postgresql" value="true" else="false"> + <equals arg1="${database}" arg2="postgresql"/> + </condition> </target>    - <target name="installer" depends="configure"> + <target name="build-installer" depends="configure"> <copy todir="${filtered.resources.dir}" filtering="true"> <fileset dir="${resources.dir}/installer" /> <filterset> - <filter token="jboss.home" value="${jboss422.home}" /> + <filter token="database.is.hsqldb" value="${database.is.hsqldb}" /> + <filter token="database.is.mysql" value="${database.is.mysql}" /> + <filter token="database.is.postgresql" value="${database.is.postgresql}" /> + <filter token="jboss.id" value="${jboss.id}" /> + <filter token="jboss.home" value="${jboss.home}" /> <filter token="product.version" value="${product.version}" /> + <filter token="user.home" value="${user.home}" /> </filterset> </copy> Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml 2008-09-04 13:45:19 UTC (rev 2104) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml 2008-09-04 14:41:42 UTC (rev 2105) @@ -1,23 +0,0 @@ -<AutomatedInstallation langpack="eng"> - <com.izforge.izpack.panels.HelloPanel /> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="jbossTargetServer" value="default" /> - <entry key="jbossSelection" value="CONTAINER" /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="installPath" value="JBOSS_HOME" /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.TreePacksPanel> - <pack name="jBPM3" index="0" selected="true" /> - <pack name="jBPM3 Hypersonic Database" index="1" selected="true" /> - <pack name="jBPM3 MySQL Database" index="2" selected="false" /> - <pack name="jBPM3 PostgreSQL Database" index="3" selected="false" /> - </com.izforge.izpack.panels.TreePacksPanel> - <com.izforge.izpack.panels.SummaryPanel /> - <com.izforge.izpack.panels.InstallPanel /> - <com.izforge.izpack.panels.FinishPanel /> -</AutomatedInstallation> \ No newline at end of file Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml 2008-09-04 13:45:19 UTC (rev 2104) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml 2008-09-04 14:41:42 UTC (rev 2105) @@ -1,23 +0,0 @@ -<AutomatedInstallation langpack="eng"> - <com.izforge.izpack.panels.HelloPanel /> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="jbossTargetServer" value="default" /> - <entry key="jbossSelection" value="CONTAINER" /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="installPath" value="JBOSS_HOME" /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.TreePacksPanel> - <pack name="jBPM3" index="0" selected="true" /> - <pack name="jBPM3 Hypersonic Database" index="1" selected="false" /> - <pack name="jBPM3 MySQL Database" index="2" selected="true" /> - <pack name="jBPM3 PostgreSQL Database" index="3" selected="false" /> - </com.izforge.izpack.panels.TreePacksPanel> - <com.izforge.izpack.panels.SummaryPanel /> - <com.izforge.izpack.panels.InstallPanel /> - <com.izforge.izpack.panels.FinishPanel /> -</AutomatedInstallation> \ No newline at end of file Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml 2008-09-04 13:45:19 UTC (rev 2104) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml 2008-09-04 14:41:42 UTC (rev 2105) @@ -1,23 +0,0 @@ -<AutomatedInstallation langpack="eng"> - <com.izforge.izpack.panels.HelloPanel /> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="jbossTargetServer" value="default" /> - <entry key="jbossSelection" value="CONTAINER" /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="installPath" value="JBOSS_HOME" /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.TreePacksPanel> - <pack name="jBPM3" index="0" selected="true" /> - <pack name="jBPM3 Hypersonic Database" index="1" selected="false" /> - <pack name="jBPM3 MySQL Database" index="2" selected="false" /> - <pack name="jBPM3 PostgreSQL Database" index="3" selected="true" /> - </com.izforge.izpack.panels.TreePacksPanel> - <com.izforge.izpack.panels.SummaryPanel /> - <com.izforge.izpack.panels.InstallPanel /> - <com.izforge.izpack.panels.FinishPanel /> -</AutomatedInstallation> \ No newline at end of file Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml 2008-09-04 14:41:42 UTC (rev 2105) @@ -0,0 +1,31 @@ +<AutomatedInstallation langpack="eng"> + <com.izforge.izpack.panels.HelloPanel /> + <com.izforge.izpack.panels.TargetPanel> + <installpath>@user.home@/jBPM-(a)product.version@</installpath> + </com.izforge.izpack.panels.TargetPanel> + <com.izforge.izpack.panels.TreePacksPanel> + <pack name="jBPM3 Standalone" index="0" selected="true" /> + <pack name="Optional Downloads" index="1" selected="false" /> + <pack name="Download JBoss-4.2.2" index="2" selected="false" /> + <pack name="Download Eclipse-3.4.0" index="3" selected="false" /> + <pack name="jBPM3 Server Components" index="4" selected="true" /> + <pack name="jBPM3 Databases" index="5" selected="true" /> + <pack name="jBPM3 Hypersonic Database" index="6" selected="@database.is.hsqldb@" /> + <pack name="jBPM3 MySQL Database" index="7" selected="@database.is.mysql@" /> + <pack name="jBPM3 PostgreSQL Database" index="8" selected="@database.is.postgresql@" /> + </com.izforge.izpack.panels.TreePacksPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossTargetServer" value="default" /> + <entry key="jbossSelection" value="@jboss.id@" /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="installPath" value="@jboss.home@" /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.SummaryPanel /> + <com.izforge.izpack.panels.InstallPanel /> + <com.izforge.izpack.panels.FinishPanel /> +</AutomatedInstallation> Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2104 - in jbpm3/trunk: modules/console and 9 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 09:45:19 -0400 (Thu, 04 Sep 2008) New Revision: 2104 Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml jbpm3/trunk/modules/jpdl/identity/src/main/etc/ jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml Removed: jbpm3/trunk/modules/console/scripts/ jbpm3/trunk/modules/console/src/main/resources/login/ jbpm3/trunk/modules/distribution/scripts/install-definition.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml Modified: jbpm3/trunk/modules/console/pom.xml jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml jbpm3/trunk/modules/enterprise/pom.xml jbpm3/trunk/modules/jpdl/identity/pom.xml jbpm3/trunk/pom.xml Log: Add installer download for jboss + eclipse Modified: jbpm3/trunk/modules/console/pom.xml =================================================================== --- jbpm3/trunk/modules/console/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/console/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -120,24 +120,6 @@ <showDeprecation>false</showDeprecation> </configuration> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>${project.build.finalName}</finalName> - <appendAssemblyId>true</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-service.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> \ No newline at end of file Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -35,13 +35,6 @@ </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-console</artifactId> - <classifier>service</classifier> - <version>${version}</version> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-enterprise</artifactId> <version>${version}</version> </dependency> @@ -75,10 +68,23 @@ </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-identity</artifactId> + <classifier>service</classifier> + <version>${version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-jpdl-integration</artifactId> <version>${version}</version> </dependency> + +  <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> <groupId>izpack</groupId> <artifactId>standalone-compiler</artifactId> </dependency> @@ -95,7 +101,7 @@ </dependency> </dependencies> -  +  <build> <plugins> <plugin> Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -103,6 +103,7 @@ <fileset dir="${resources.dir}/installer" /> <filterset> <filter token="jboss.home" value="${jboss422.home}" /> + <filter token="product.version" value="${product.version}" /> </filterset> </copy> @@ -120,7 +121,7 @@  <echo message="Running IzPack to build the installer..." /> - <izpack input="${basedir}/scripts/install-definition.xml" output="${output.dir}/${product.short.name}-${product.version}-izpack.jar" + <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/${product.short.name}-${product.version}-izpack.jar" installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" />  Deleted: jbpm3/trunk/modules/distribution/scripts/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> -<installation version="1.0"> -  - <info> - <appname>@{product.name}</appname> - <appversion>@{product.version}</appversion> - <uninstaller name="remove.task" write="yes" /> - </info> - - <guiprefs width="600" height="480" resizable="no"> - <laf name="kunststoff"> - <os family="unix" /> - </laf> - </guiprefs> - - <locale> - <langpack iso3="eng" /> - </locale> - -  - <variables> - <variable name="jboss422.home" value="@{jboss422.home}" /> - <variable name="jboss423.home" value="@{jboss423.home}" /> - <variable name="jboss500.home" value="@{jboss500.home}" /> - </variables> - <dynamicvariables> - <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> - <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> - <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> - </dynamicvariables> - <conditions> - <condition type="variable" id="isJBoss422"> - <name>jbossSelection</name> - <value>jboss422</value> - </condition> - <condition type="variable" id="isJBoss423"> - <name>jbossSelection</name> - <value>jboss423</value> - </condition> - <condition type="variable" id="isJBoss500"> - <name>jbossSelection</name> - <value>jboss500</value> - </condition> - </conditions> - - <resources> - <res id="userInputSpec.xml" src="@{filtered.resources.dir}/userInputSpec.xml" /> - </resources> - - <panels> - <panel classname="HelloPanel" /> - <panel classname="UserInputPanel" /> - <panel classname="UserInputPanel" /> -  - <panel classname="TreePacksPanel" /> - <panel classname="SummaryPanel" /> - <panel classname="InstallPanel" /> - <panel classname="FinishPanel" /> - </panels> - - <packs> -  - <pack name="jBPM3" required="yes" installGroups="Main" preselected="yes"> - <description>The jBPM Main Components</description> - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> - <include name="jboss-bpm-api.jar" /> - <include name="jbpm-jpdl-core.jar" /> - <include name="jbpm-jpdl-identity.jar" /> - <include name="jbpm-jpdl-integration.jar" /> - </fileset> - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true"> - <include name="jbpm-enterprise.jar" /> - </fileset> - <file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war" - unpack="true" override="true" /> - <file src="@{deploy.artifacts.dir}/lib/jbpm-console-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - unpack="true" override="true" /> - <file src="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"/> - </pack> - -  - <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" preselected="yes"> - <description>The Hypersonic Database</description> - <fileset dir="@{resources.dir}/database" targetdir="${installPath}/server/${jbossTargetServer}/data"> - <include name="hypersonic/jbpmDB.*" /> - </fileset> - <file src="@{resources.dir}/database/jbpm-hsqldb-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml" - target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> - </pack> - -  - <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" preselected="no"> - <description>The MySQL Database</description> - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> - <include name="mysql-connector-java.jar" /> - </fileset> - <file src="@{resources.dir}/database/jbpm-mysql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.mysql.xml" - target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> - </pack> - -  - <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" preselected="no"> - <description>The PostgreSQL Database</description> - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> - <include name="postgresql-jdbc3.jar" /> - </fileset> - <file src="@{resources.dir}/database/jbpm-postgresql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml" - target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> - </pack> - </packs> -</installation> \ No newline at end of file Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,14 @@ +<antactions> + <pack name="Download JBoss-4.2.2"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-jboss"/> + </antcall> + </pack> + <pack name="Download Eclipse-3.4.0"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-eclipse"/> + </antcall> + </pack> +</antactions> \ No newline at end of file Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<project> + + <target name="download-jboss"> + <get src="http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip" dest="${install.path}/Uninstaller/jboss-4.2.2.GA.zip" usetimestamp="true"/> + <unzip src="${install.path}/Uninstaller/jboss-4.2.2.GA.zip" dest="${install.path}"/> + </target> + <target name="download-eclipse"> + <get src="http://download.eclipse.org/technology/epp/downloads/release/ganymede/R/e..." + dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/> + <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/> + </target> + +</project> \ No newline at end of file Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml (from rev 2100, jbpm3/trunk/modules/distribution/scripts/install-definition.xml) =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,173 @@ +<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> +<installation version="1.0"> +  + <info> + <appname>@{product.name}</appname> + <appversion>@{product.version}</appversion> + <uninstaller name="remove.task" write="yes" /> + </info> + <guiprefs width="600" height="480" resizable="no"> + <laf name="kunststoff"> + <os family="unix" /> + </laf> + </guiprefs> + <locale> + <langpack iso3="eng" /> + </locale> + +  + <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" /> + <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" /> + +  + <listeners> + <listener installer="AntActionInstallerListener" /> + </listeners> + +  + <resources> + <res id="AntActionsSpec.xml" src="@{filtered.resources.dir}/ant-actions-spec.xml" /> + <res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" /> + <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" /> + </resources> + +  + <variables> + <variable name="jboss422.home" value="@{jboss422.home}" /> + <variable name="jboss423.home" value="@{jboss423.home}" /> + <variable name="jboss500.home" value="@{jboss500.home}" /> + </variables> + +  + <dynamicvariables> + <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> + <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> + <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> + <variable name="installPath" value="$INSTALL_PATH/jboss-4.2.2.GA" condition="isJBoss422Download" /> + <variable name="jbossTargetServer" value="default" condition="isJBoss422Download" /> + </dynamicvariables> + +  + <conditions> + <condition type="packselection" id="isJBoss422Download"> + <packid>Download JBoss-4.2.2</packid> + </condition> + <condition type="variable" id="isJBoss422"> + <name>jbossSelection</name> + <value>jboss422</value> + </condition> + <condition type="variable" id="isJBoss423"> + <name>jbossSelection</name> + <value>jboss423</value> + </condition> + <condition type="variable" id="isJBoss500"> + <name>jbossSelection</name> + <value>jboss500</value> + </condition> + </conditions> + +  + <panels> + <panel classname="HelloPanel" /> + <panel classname="TargetPanel" /> + <panel classname="TreePacksPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="SummaryPanel" /> + <panel classname="InstallPanel" /> + <panel classname="FinishPanel" /> +  + </panels> + +  + <packs> +  + <pack name="jBPM3 Standalone" required="yes" preselected="no"> + <description>The jBPM3 Standalone Components</description> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/jbpm3/lib" override="true"> + <include name="jboss-bpm-api.jar" /> + <include name="jbpm-enterprise.jar" /> + <include name="jbpm-jpdl-core.jar" /> + <include name="jbpm-jpdl-identity.jar" /> + <include name="jbpm-jpdl-integration.jar" /> + </fileset> + </pack> + +  + <pack name="Optional Downloads" required="no" preselected="no"> + <description>Optional jBPM3 Downloads</description> + </pack> + +  + <pack name="Download JBoss-4.2.2" required="no" parent="Optional Downloads" preselected="no"> + <description>Download and Install JBoss-4.2.2</description> + <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller"/> + </pack> + +  + <pack name="Download Eclipse-3.4.0" required="no" parent="Optional Downloads" preselected="no"> + <description>Download and Install Eclipse-3.4.0</description> + <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/tmp"/> + </pack> + +  + <pack name="jBPM3 Server Components" required="yes" preselected="yes"> + <description>The jBPM3 Server Components</description> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true"> + <include name="jboss-bpm-api.jar" /> + <include name="jbpm-jpdl-core.jar" /> + <include name="jbpm-jpdl-identity.jar" /> + <include name="jbpm-jpdl-integration.jar" /> + </fileset> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true"> + <include name="jbpm-enterprise.jar" /> + </fileset> + <file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war" + unpack="true" override="true" /> + <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + unpack="true" override="true" /> + <file src="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" /> + </pack> + +  + <pack name="jBPM3 Databases" required="no" preselected="no"> + <description>The jBPM3 Supported Databases.</description> + </pack> + +  + <pack name="jBPM3 Hypersonic Database" required="no" parent="jBPM3 Databases" preselected="yes"> + <description>The Hypersonic Database</description> + <fileset dir="@{resources.dir}/database" targetdir="${installPath}/server/${jbossTargetServer}/data"> + <include name="hypersonic/jbpmDB.*" /> + </fileset> + <file src="@{resources.dir}/database/jbpm-hsqldb-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml" target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + </pack> + +  + <pack name="jBPM3 MySQL Database" required="no" parent="jBPM3 Databases" preselected="no"> + <description>The MySQL Database</description> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true"> + <include name="mysql-connector-java.jar" /> + </fileset> + <file src="@{resources.dir}/database/jbpm-mysql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.mysql.xml" target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + </pack> + +  + <pack name="jBPM3 PostgreSQL Database" required="no" parent="jBPM3 Databases" preselected="no"> + <description>The PostgreSQL Database</description> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true"> + <include name="postgresql-jdbc3.jar" /> + </fileset> + <file src="@{resources.dir}/database/jbpm-postgresql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml" target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + </pack> + </packs> +</installation> \ No newline at end of file Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1 @@ +$USER_HOME/jBPM-(a)product.version@ \ No newline at end of file Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml (from rev 2100, jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml) =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,22 @@ +<userInput> + <panel order="0"> + <createForUnselectedPack name="Download JBoss-4.2.2" /> + <field type="radio" variable="jbossSelection"> + <description align="left" txt="Please choose your target server" /> + <spec> + <choice txt="JBoss-4.2.2" value="jboss422" set="true" /> + <choice txt="JBoss-4.2.3" value="jboss423" /> + <choice txt="JBoss-5.0.0" value="jboss500" /> + </spec> + </field> + <field type="text" variable="jbossTargetServer"> + <spec txt="Server:" size="15" set="default" /> + </field> + </panel> + <panel order="1"> + <createForUnselectedPack name="Download JBoss-4.2.2" /> + <field type="dir" align="left" variable="installPath"> + <spec txt="Install Path:" size="25" set="${jboss.home}" /> + </field> + </panel> +</userInput> \ No newline at end of file Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -1,23 +0,0 @@ -<userInput> - <panel order="0"> - <createForPack name="jBPM3" /> - <field type="radio" variable="jbossSelection"> - <description align="left" txt="Please choose your target server" /> - <spec> - <choice txt="JBoss-4.2.2" value="jboss422" set="true" /> - <choice txt="JBoss-4.2.3" value="jboss423" /> - <choice txt="JBoss-5.0.0" value="jboss500" /> - </spec> - </field> - <field type="text" variable="jbossTargetServer"> - <spec txt="Server:" size="15" set="default" /> - </field> - </panel> -  - <panel order="1"> - <createForPack name="jBPM3" /> - <field type="dir" align="left" variable="installPath"> - <spec txt="Install Path:" size="25" set="${jboss.home}" /> - </field> - </panel> -</userInput> \ No newline at end of file Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -143,7 +143,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>config-assembly</id> + <id>assembly-config</id> <phase>package</phase> <goals> <goal>single</goal> @@ -157,7 +157,7 @@ </configuration> </execution> <execution> - <id>dependency-assembly</id> + <id>assembly-test-dependencies</id> <phase>generate-test-resources</phase> <goals> <goal>directory-single</goal> Modified: jbpm3/trunk/modules/jpdl/identity/pom.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -68,6 +68,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> + <id>assembly-config</id> <phase>package</phase> <goals> <goal>single</goal> @@ -80,6 +81,20 @@ </descriptors> </configuration> </execution> + <execution> + <id>assembly-service</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-service.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> <plugin> Added: jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml (rev 0) +++ jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,17 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>service</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/etc</directory> + <outputDirectory>/META-INF</outputDirectory> + <includes> + <include>jboss-service.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml (rev 0) +++ jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<server> +  + <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="org.jboss.jbpm:service=LoginConfig"> + <attribute name="PolicyConfig" serialDataType="jbxb"> + <jaas:policy xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd" xmlns:jaas="urn:jboss:security-config:4.1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <jaas:application-policy name="jbpm-console"> + <jaas:authentication> + <jaas:login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule" flag="required"> + <jaas:module-option name="dsJndiName">java:/JbpmDS</jaas:module-option> + <jaas:module-option name="principalsQuery"> SELECT PASSWORD_ FROM JBPM_ID_USER WHERE NAME_=? </jaas:module-option> + <jaas:module-option name="rolesQuery"> + SELECT g.NAME_ ,'Roles' FROM JBPM_ID_USER u, JBPM_ID_MEMBERSHIP m, JBPM_ID_GROUP g + WHERE g.TYPE_='security-role' AND m.GROUP_ = g.ID_ AND m.USER_ = u.ID_ AND u.NAME_=? </jaas:module-option> + </jaas:login-module> + </jaas:authentication> + </jaas:application-policy> + </jaas:policy> + </attribute> + <depends optional-attribute-name="LoginConfigService"> jboss.security:service=XMLLoginConfig</depends> + <depends optional-attribute-name="SecurityManagerService"> jboss.security:service=JaasSecurityManager</depends> + </mbean> +</server> \ No newline at end of file Property changes on: jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -259,7 +259,6 @@ <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>${apache.ant.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cactus</groupId>

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2103 - jbpm3/trunk/modules/enterprise.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-09-04 07:58:50 -0400 (Thu, 04 Sep 2008) New Revision: 2103 Modified: jbpm3/trunk/modules/enterprise/pom.xml Log: removing cactus version (again!) after inadvertedly committing it Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-04 06:50:59 UTC (rev 2102) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) @@ -60,7 +60,6 @@ <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId> - <version>1.8.0</version> <scope>test</scope> <exclusions> <exclusion> @@ -79,7 +78,6 @@ <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.integration.shared.api</artifactId> - <version>1.8.0</version> <scope>test</scope> <exclusions> <exclusion>

17 years, 7 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits September 2008