JBoss JBPM SVN: r2072 - in jbpm3/trunk/modules/enterprise: src/test/java/org/jbpm and 5 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 21:50:36 -0400 (Tue, 02 Sep 2008)
New Revision: 2072
Added:
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/ArchiveDeployer.java
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestHelper.java
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestSetup.java
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/JBossArchiveDeployer.java
jbpm3/trunk/modules/enterprise/src/test/resources/jndi.properties
jbpm3/trunk/modules/enterprise/src/test/resources/tst.policy
Modified:
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/AppServerConfigurationsTest.java
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
Log:
Deploy enterprise-test.war as part of the test setup
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-02 13:33:34 UTC (rev 2071)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-03 01:50:36 UTC (rev 2072)
@@ -63,6 +63,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <!-- verify that this version works for all target containers -->
+ <version>4.2.2.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.integration.shared.api</artifactId>
<scope>test</scope>
@@ -147,35 +154,7 @@
</excludes>
</configuration>
</plugin>
- <!--
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-tests</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <fileName>${project.build.directory}/test-libs/enterprise-test.war</fileName>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-tests</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy</goal>
- </goals>
- <configuration>
- <fileName>${project.build.directory}/test-libs/enterprise-test.war</fileName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
Added: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/ArchiveDeployer.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/ArchiveDeployer.java (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/ArchiveDeployer.java 2008-09-03 01:50:36 UTC (rev 2072)
@@ -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;
+
+import java.net.URL;
+
+/**
+ * An archive deployer
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 16-May-2006
+ */
+public interface ArchiveDeployer
+{
+ /** Deploy the given archive
+ */
+ void deploy(URL archive) throws Exception;
+
+ /** Undeploy the given archive
+ */
+ void undeploy(URL archive) throws Exception;
+}
Property changes on: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/ArchiveDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestHelper.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestHelper.java (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestHelper.java 2008-09-03 01:50:36 UTC (rev 2072)
@@ -0,0 +1,145 @@
+/*
+ * 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;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Hashtable;
+
+import javax.management.MBeanServerConnection;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * An integration test helper that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class IntegrationTestHelper
+{
+ private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
+ private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
+
+ private static MBeanServerConnection server;
+ private static String testArchiveDir;
+ private static String testResourcesDir;
+
+ /** Deploy the given archive
+ */
+ public void deploy(String archive) throws Exception
+ {
+ URL url = getArchiveFile(archive).toURL();
+ getDeployer().deploy(url);
+ }
+
+ /** Undeploy the given archive
+ */
+ public void undeploy(String archive) throws Exception
+ {
+ URL url = getArchiveFile(archive).toURL();
+ getDeployer().undeploy(url);
+ }
+
+ @SuppressWarnings("unchecked")
+ public static MBeanServerConnection getServer()
+ {
+ if (server == null)
+ {
+ Hashtable jndiEnv = null;
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ jndiEnv = iniCtx.getEnvironment();
+ server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
+ }
+ catch (NamingException ex)
+ {
+ throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex);
+ }
+ }
+ return server;
+ }
+
+ private ArchiveDeployer getDeployer()
+ {
+ return new JBossArchiveDeployer(getServer());
+ }
+
+ /** Try to discover the URL for the deployment archive */
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return getArchiveFile(archive).toURL();
+ }
+
+ /** Try to discover the File for the deployment archive */
+ public File getArchiveFile(String archive)
+ {
+ File file = new File(archive);
+ if (file.exists())
+ return file;
+
+ file = new File(getTestArchiveDir() + "/" + archive);
+ if (file.exists())
+ return file;
+
+ String notSet = (getTestArchiveDir() == null ? " System property '" + SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set." : "");
+ throw new IllegalArgumentException("Cannot obtain '" + getTestArchiveDir() + "/" + archive + "'." + notSet);
+ }
+
+ /** Try to discover the URL for the test resource */
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return getResourceFile(resource).toURL();
+ }
+
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ if (file.exists())
+ return file;
+
+ file = new File(getTestResourcesDir() + "/" + resource);
+ if (file.exists())
+ return file;
+
+ throw new IllegalArgumentException("Cannot obtain '" + getTestResourcesDir() + "/" + resource + "'");
+ }
+
+ public static String getTestArchiveDir()
+ {
+ if (testArchiveDir == null)
+ testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs");
+
+ return testArchiveDir;
+ }
+
+ public static String getTestResourcesDir()
+ {
+ if (testResourcesDir == null)
+ testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-resource");
+
+ return testResourcesDir;
+ }
+}
Property changes on: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestSetup.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestSetup.java (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestSetup.java 2008-09-03 01:50:36 UTC (rev 2072)
@@ -0,0 +1,159 @@
+/*
+ * 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;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.management.MBeanServerConnection;
+import javax.naming.NamingException;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * A test setup that deploys/undeploys archives
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class IntegrationTestSetup extends TestSetup
+{
+ private IntegrationTestHelper delegate = new IntegrationTestHelper();
+ private String[] archives = new String[0];
+ private ClassLoader originalClassLoader;
+
+ public IntegrationTestSetup(Class<?> testClass, String archiveList)
+ {
+ super(new TestSuite(testClass));
+ getArchiveArray(archiveList);
+ }
+
+ public IntegrationTestSetup(Test test, String archiveList)
+ {
+ super(test);
+ getArchiveArray(archiveList);
+ }
+
+ public IntegrationTestSetup(Test test)
+ {
+ super(test);
+ }
+
+ public File getArchiveFile(String archive)
+ {
+ return delegate.getArchiveFile(archive);
+ }
+
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getArchiveFile(archive).toURL();
+ }
+
+ public File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
+
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return delegate.getResourceFile(resource).toURL();
+ }
+
+ private void getArchiveArray(String archiveList)
+ {
+ if (archiveList != null)
+ {
+ StringTokenizer st = new StringTokenizer(archiveList, ", ");
+ archives = new String[st.countTokens()];
+
+ for (int i = 0; i < archives.length; i++)
+ archives[i] = st.nextToken();
+ }
+ }
+
+ protected void setUp() throws Exception
+ {
+ List<URL> clientJars = new ArrayList<URL>();
+ for (int i = 0; i < archives.length; i++)
+ {
+ String archive = archives[i];
+ try
+ {
+ delegate.deploy(archive);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ delegate.undeploy(archive);
+ }
+
+ if (archive.endsWith("-client.jar"))
+ {
+ URL archiveURL = getArchiveURL(archive);
+ clientJars.add(archiveURL);
+ }
+ }
+
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ originalClassLoader = parent;
+
+ // add client jars to the class loader
+ if (!clientJars.isEmpty())
+ {
+ URL[] urls = new URL[clientJars.size()];
+ for (int i = 0; i < clientJars.size(); i++)
+ {
+ urls[i] = clientJars.get(i);
+ }
+ URLClassLoader cl = new URLClassLoader(urls, parent);
+ Thread.currentThread().setContextClassLoader(cl);
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ try
+ {
+ for (int i = 0; i < archives.length; i++)
+ {
+ String archive = archives[archives.length - i - 1];
+ delegate.undeploy(archive);
+ }
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(originalClassLoader);
+ }
+ }
+
+ public MBeanServerConnection getServer() throws NamingException
+ {
+ return IntegrationTestHelper.getServer();
+ }
+}
Property changes on: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/IntegrationTestSetup.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/JBossArchiveDeployer.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/JBossArchiveDeployer.java (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/JBossArchiveDeployer.java 2008-09-03 01:50:36 UTC (rev 2072)
@@ -0,0 +1,60 @@
+/*
+ * 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;
+
+import java.net.URL;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+/**
+ * An archive deployer that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class JBossArchiveDeployer implements ArchiveDeployer
+{
+ private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
+
+ private MBeanServerConnection server;
+
+ public JBossArchiveDeployer(MBeanServerConnection server)
+ {
+ this.server = server;
+ }
+
+ public void deploy(URL url) throws Exception
+ {
+ invokeMainDeployer("deploy", url);
+ }
+
+ public void undeploy(URL url) throws Exception
+ {
+ invokeMainDeployer("undeploy", url);
+ }
+
+ private void invokeMainDeployer(String methodName, URL url) throws Exception
+ {
+ server.invoke(new ObjectName(MAIN_DEPLOYER), methodName, new Object[] { url }, new String[] { "java.net.URL" });
+ }
+}
Property changes on: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/JBossArchiveDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/AppServerConfigurationsTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/AppServerConfigurationsTest.java 2008-09-02 13:33:34 UTC (rev 2071)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/AppServerConfigurationsTest.java 2008-09-03 01:50:36 UTC (rev 2072)
@@ -21,33 +21,45 @@
*/
package org.jbpm.enterprise;
+import junit.framework.Test;
+
import org.apache.cactus.ServletTestCase;
+import org.jbpm.IntegrationTestSetup;
import org.jbpm.JbpmConfiguration;
import org.jbpm.msg.jms.JmsMessageServiceFactoryImpl;
import org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory;
import org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory;
import org.jbpm.svc.Services;
-public class AppServerConfigurationsTest extends ServletTestCase {
-
+public class AppServerConfigurationsTest extends ServletTestCase
+{
JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
- public void testUnavailabilityOfTheJobExecutor() {
+ public static Test suite() throws Exception
+ {
+ return new IntegrationTestSetup(AppServerConfigurationsTest.class, "enterprise-test.war");
+ }
+
+ public void testUnavailabilityOfTheJobExecutor()
+ {
assertNull(jbpmConfiguration.getJobExecutor());
}
- public void testJtaDbPersistenceFactoryConfiguration() {
+ public void testJtaDbPersistenceFactoryConfiguration()
+ {
assertSame(JtaDbPersistenceServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE).getClass());
- JtaDbPersistenceServiceFactory persistenceServiceFactory = (JtaDbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+ JtaDbPersistenceServiceFactory persistenceServiceFactory = (JtaDbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
assertFalse(persistenceServiceFactory.isTransactionEnabled());
assertTrue(persistenceServiceFactory.isCurrentSessionEnabled());
}
- public void testJmsMessageServiceFactoryConfiguration() {
+ public void testJmsMessageServiceFactoryConfiguration()
+ {
assertSame(JmsMessageServiceFactoryImpl.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_MESSAGE).getClass());
}
- public void testEjbSchedulerServiceFactoryConfiguration() {
+ public void testEjbSchedulerServiceFactoryConfiguration()
+ {
assertSame(EntitySchedulerServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_SCHEDULER).getClass());
}
}
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java 2008-09-02 13:33:34 UTC (rev 2071)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java 2008-09-03 01:50:36 UTC (rev 2072)
@@ -30,10 +30,13 @@
import javax.naming.InitialContext;
+import junit.framework.Test;
+
import org.apache.cactus.ServletTestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
+import org.jbpm.IntegrationTestSetup;
import org.jbpm.JbpmContext;
import org.jbpm.command.Command;
import org.jbpm.command.DeployProcessCommand;
@@ -50,6 +53,11 @@
static int nbrOfConcurrentProcessExecutions = 20;
static int maxWaitTime = 30000;
+ public static Test suite() throws Exception
+ {
+ return new IntegrationTestSetup(AsyncProcessingTest.class, "enterprise-test.war");
+ }
+
protected void setUp() throws Exception {
InitialContext initialContext = new InitialContext();
RemoteCommandServiceHome localCommandServiceHome = (RemoteCommandServiceHome) initialContext.lookup("ejb/CommandServiceBean");
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java 2008-09-02 13:33:34 UTC (rev 2071)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java 2008-09-03 01:50:36 UTC (rev 2072)
@@ -26,11 +26,15 @@
import javax.naming.NamingException;
import javax.transaction.UserTransaction;
+import junit.framework.Test;
+
import org.apache.cactus.ServletTestCase;
+import org.jbpm.IntegrationTestSetup;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.scheduler.ejbtimer.EjbSchedulerTest;
public class JtaDbPersistenceTest extends ServletTestCase {
@@ -40,6 +44,11 @@
private static long definitionId;
+ public static Test suite() throws Exception
+ {
+ return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war");
+ }
+
protected void setUp() throws Exception {
jbpmConfiguration = JbpmConfiguration.getInstance();
getUserTransaction();
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-02 13:33:34 UTC (rev 2071)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-03 01:50:36 UTC (rev 2072)
@@ -23,7 +23,10 @@
import javax.naming.InitialContext;
+import junit.framework.Test;
+
import org.apache.cactus.ServletTestCase;
+import org.jbpm.IntegrationTestSetup;
import org.jbpm.JbpmContext;
import org.jbpm.command.Command;
import org.jbpm.command.DeployProcessCommand;
@@ -43,6 +46,11 @@
private static LocalCommandServiceHome commandServiceHome;
+ public static Test suite() throws Exception
+ {
+ return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war");
+ }
+
protected void setUp() throws Exception {
if (commandServiceHome == null) {
InitialContext initialContext = new InitialContext();
Added: jbpm3/trunk/modules/enterprise/src/test/resources/jndi.properties
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/resources/jndi.properties (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/test/resources/jndi.properties 2008-09-03 01:50:36 UTC (rev 2072)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
Added: jbpm3/trunk/modules/enterprise/src/test/resources/tst.policy
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/resources/tst.policy (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/test/resources/tst.policy 2008-09-03 01:50:36 UTC (rev 2072)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2071 - jbpm3/trunk/modules/distribution/scripts.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 09:33:34 -0400 (Tue, 02 Sep 2008)
New Revision: 2071
Modified:
jbpm3/trunk/modules/distribution/scripts/install-definition.xml
Log:
Remove database conditions
Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 12:58:05 UTC (rev 2070)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 13:33:34 UTC (rev 2071)
@@ -44,18 +44,6 @@
<name>jbossSelection</name>
<value>jboss500</value>
</condition>
- <condition type="variable" id="isHypersonic">
- <name>databaseSelection</name>
- <value>hsqldb</value>
- </condition>
- <condition type="variable" id="isMySQL">
- <name>databaseSelection</name>
- <value>mysql</value>
- </condition>
- <condition type="variable" id="isPostgreSQL">
- <name>databaseSelection</name>
- <value>postgresql</value>
- </condition>
</conditions>
<resources>
@@ -95,7 +83,7 @@
</pack>
<!-- jBPM Hypersonic Database -->
- <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" preselected="yes" condition="isHypersonic">
+ <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.*" />
@@ -106,7 +94,7 @@
</pack>
<!-- jBPM MySQL Database -->
- <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" preselected="no" condition="isMySQL">
+ <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">
@@ -118,7 +106,7 @@
</pack>
<!-- jBPM PostgreSQL Database -->
- <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" preselected="no" condition="isPostgreSQL">
+ <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">
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2070 - jbpm3/trunk/modules/jpdl/core/src/main/resources.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 08:58:05 -0400 (Tue, 02 Sep 2008)
New Revision: 2070
Modified:
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml
Log:
Move auto create to common
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-02 12:30:53 UTC (rev 2069)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-02 12:58:05 UTC (rev 2070)
@@ -4,6 +4,8 @@
<!-- ################################### -->
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+ <property name="hibernate.hbm2ddl.auto">create</property>
<!-- DataSource properties (begin) ===
<property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-02 12:30:53 UTC (rev 2069)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-02 12:58:05 UTC (rev 2070)
@@ -7,6 +7,5 @@
<property name="hibernate.connection.url">jdbc:hsqldb:mem:jbpm</property>
<property name="hibernate.connection.username">sa</property>
<property name="hibernate.connection.password"></property>
- <property name="hibernate.hbm2ddl.auto">create</property>
<!-- JDBC connection properties (end) -->
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml 2008-09-02 12:30:53 UTC (rev 2069)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml 2008-09-02 12:58:05 UTC (rev 2070)
@@ -8,6 +8,5 @@
<property name="hibernate.connection.username">jbpmtest</property>
<property name="hibernate.connection.password"></property>
<property name="hibernate.query.substitutions">true 1, false 0</property>
- <property name="hibernate.hbm2ddl.auto">create</property>
<!-- JDBC connection properties (end) -->
\ No newline at end of file
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml 2008-09-02 12:30:53 UTC (rev 2069)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml 2008-09-02 12:58:05 UTC (rev 2070)
@@ -7,6 +7,5 @@
<property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/jbpmtest</property>
<property name="hibernate.connection.username">jbpmtest</property>
<property name="hibernate.connection.password"></property>
- <property name="hibernate.hbm2ddl.auto">create</property>
<!-- JDBC connection properties (end) -->
\ No newline at end of file
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2069 - in jbpm3/trunk/modules: jpdl/core/scripts and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 08:30:53 -0400 (Tue, 02 Sep 2008)
New Revision: 2069
Modified:
jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/scripts/install-definition.xml
jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
Log:
Enable JTA transaction properties
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-02 11:33:42 UTC (rev 2068)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-02 12:30:53 UTC (rev 2069)
@@ -77,10 +77,21 @@
<!-- ================================================================== -->
<target name="configure" depends="init">
- <property name="hibernate.cfg.xml" value="${deploy.artifacts.resources}/jbpm-config/hibernate.cfg.xml"/>
- <macro-disable file="${hibernate.cfg.xml}" section="JDBC connection properties"/>
- <macro-enable file="${hibernate.cfg.xml}" section="DataSource properties"/>
+ <property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.hsqldb.xml"/>
+ <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/>
+ <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/>
+ <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/>
+ <property name="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.mysql.xml"/>
+ <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/>
+ <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/>
+ <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/>
+
+ <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.postgresql.xml"/>
+ <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/>
+ <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/>
+ <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/>
+
</target>
<!-- ================================================================== -->
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-02 11:33:42 UTC (rev 2068)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-02 12:30:53 UTC (rev 2069)
@@ -16,14 +16,21 @@
<unpack>false</unpack>
</dependencySet>
<dependencySet>
- <outputDirectory>resources/jbpm-config</outputDirectory>
+ <outputDirectory>resources/jbpm-core-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jbpm-enterprise:jar:config</include>
<include>*:jbpm-jpdl-core:jar:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>resources/jbpm-enterprise-config</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jbpm-enterprise:jar:config</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
</dependencySets>
<fileSets>
Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 11:33:42 UTC (rev 2068)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 12:30:53 UTC (rev 2069)
@@ -66,6 +66,7 @@
<panel classname="HelloPanel" />
<panel classname="UserInputPanel" />
<panel classname="UserInputPanel" />
+ <!-- http://jira.codehaus.org/browse/IZPACK-154 -->
<panel classname="TreePacksPanel" />
<panel classname="SummaryPanel" />
<panel classname="InstallPanel" />
@@ -90,7 +91,7 @@
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-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"/>
+ <file src="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"/>
</pack>
<!-- jBPM Hypersonic Database -->
@@ -100,7 +101,7 @@
<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-config/hibernate.cfg.hsqldb.xml"
+ <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>
@@ -112,7 +113,7 @@
<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-config/hibernate.cfg.mysql.xml"
+ <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>
@@ -124,7 +125,7 @@
<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-config/hibernate.cfg.postgresql.xml"
+ <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>
Modified: jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 11:33:42 UTC (rev 2068)
+++ jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 12:30:53 UTC (rev 2069)
@@ -49,6 +49,7 @@
</macrodef>
<target name="concat">
+
<macro-database-cfg database="hsqldb"/>
<macro-database-cfg database="mysql"/>
<macro-database-cfg database="postgresql"/>
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2068 - jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 07:33:42 -0400 (Tue, 02 Sep 2008)
New Revision: 2068
Modified:
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
Log:
cat auto-install.xml
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-02 11:31:26 UTC (rev 2067)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-02 11:33:42 UTC (rev 2068)
@@ -39,8 +39,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; cp tmp.xml auto-install.xml
-java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml
+sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
+cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml
#
# start jbossas
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2067 - in jbpm3/trunk: hudson/hudson-home/jobs/jBPM-Matrix and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 07:31:26 -0400 (Tue, 02 Sep 2008)
New Revision: 2067
Added:
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
Removed:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt
Modified:
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
jbpm3/trunk/modules/distribution/scripts/install-definition.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
jbpm3/trunk/pom.xml
Log:
IzPack auto install cannot handle conditions
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-02 11:31:26 UTC (rev 2067)
@@ -38,9 +38,8 @@
#
# Deploy distro
#
-sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install.xml > auto-install.xml
+sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml
sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
-sed s:DATABASE:$DATABASE: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml
#
Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -66,10 +66,8 @@
<panel classname="HelloPanel" />
<panel classname="UserInputPanel" />
<panel classname="UserInputPanel" />
- <!-- Packs and summary panels do not repect the conditions - ->
- <panel classname="PacksPanel" />
+ <panel classname="TreePacksPanel" />
<panel classname="SummaryPanel" />
- -->
<panel classname="InstallPanel" />
<panel classname="FinishPanel" />
</panels>
@@ -96,7 +94,7 @@
</pack>
<!-- jBPM Hypersonic Database -->
- <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" condition="isHypersonic">
+ <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" preselected="yes" condition="isHypersonic">
<description>The Hypersonic Database</description>
<fileset dir="@{resources.dir}/database" targetdir="${installPath}/server/${jbossTargetServer}/data">
<include name="hypersonic/jbpmDB.*" />
@@ -107,7 +105,7 @@
</pack>
<!-- jBPM MySQL Database -->
- <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" condition="isMySQL">
+ <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" preselected="no" condition="isMySQL">
<description>The MySQL Database</description>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
@@ -119,7 +117,7 @@
</pack>
<!-- jBPM PostgreSQL Database -->
- <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" condition="isPostgreSQL">
+ <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" preselected="no" condition="isPostgreSQL">
<description>The PostgreSQL Database</description>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
Copied: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml (from rev 2066, jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml)
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -0,0 +1,23 @@
+<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
Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -0,0 +1,23 @@
+<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
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -0,0 +1,23 @@
+<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
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -1,17 +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" />
- <entry key="databaseSelection" value="DATABASE" />
- </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.InstallPanel />
- <com.izforge.izpack.panels.FinishPanel />
-</AutomatedInstallation>
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2008-09-02 11:31:26 UTC (rev 2067)
@@ -1 +0,0 @@
-(a)jboss.home@
\ No newline at end of file
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -12,15 +12,6 @@
<field type="text" variable="jbossTargetServer">
<spec txt="Server:" size="15" set="default" />
</field>
- <field type="divider" />
- <field type="radio" variable="databaseSelection">
- <description align="left" txt="Please choose your target database" />
- <spec>
- <choice txt="Hypersonic" value="hsqldb" set="true" />
- <choice txt="MySQL" value="mysql" />
- <choice txt="PostgreSQL" value="postgresql" />
- </spec>
- </field>
</panel>
<!-- -->
<panel order="1">
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/pom.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -544,4 +544,4 @@
</dependencies>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2066 - in jbpm3/trunk: modules/distribution and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 06:51:59 -0400 (Tue, 02 Sep 2008)
New Revision: 2066
Added:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml
Removed:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss423.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml
Modified:
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
jbpm3/trunk/modules/distribution/
Log:
Unify auto-install.xml
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-02 10:14:40 UTC (rev 2065)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-02 10:51:59 UTC (rev 2066)
@@ -38,7 +38,9 @@
#
# Deploy distro
#
-sed s:JBOSS_HOME:$JBOSS_HOME: $DISTRODIR/resources/auto-install-$CONTAINER.xml > auto-install.xml
+sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install.xml > auto-install.xml
+sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
+sed s:DATABASE:$DATABASE: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml
#
Property changes on: jbpm3/trunk/modules/distribution
___________________________________________________________________
Name: svn:ignore
- target
.settings
auto-install-*.xml
+ .settings
target
auto-install.xml
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml 2008-09-02 10:14:40 UTC (rev 2065)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml 2008-09-02 10:51:59 UTC (rev 2066)
@@ -1,15 +0,0 @@
-<AutomatedInstallation langpack="eng">
- <com.izforge.izpack.panels.HelloPanel />
- <com.izforge.izpack.panels.TargetPanel>
- <installpath>JBOSS_HOME</installpath>
- </com.izforge.izpack.panels.TargetPanel>
- <com.izforge.izpack.panels.TreePacksPanel>
- <pack name="jBPM3" index="0" selected="true" />
- <pack name="jBPM3 Config" index="1" selected="true" />
- <pack name="jBPM3 Console" index="2" selected="true" />
- <pack name="jBPM3 Hypersonic Database Scripts" 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>
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss423.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss423.xml 2008-09-02 10:14:40 UTC (rev 2065)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss423.xml 2008-09-02 10:51:59 UTC (rev 2066)
@@ -1,15 +0,0 @@
-<AutomatedInstallation langpack="eng">
- <com.izforge.izpack.panels.HelloPanel />
- <com.izforge.izpack.panels.TargetPanel>
- <installpath>JBOSS_HOME</installpath>
- </com.izforge.izpack.panels.TargetPanel>
- <com.izforge.izpack.panels.TreePacksPanel>
- <pack name="jBPM3" index="0" selected="true" />
- <pack name="jBPM3 Config" index="1" selected="true" />
- <pack name="jBPM3 Console" index="2" selected="true" />
- <pack name="jBPM3 Hypersonic Database Scripts" 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
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml 2008-09-02 10:14:40 UTC (rev 2065)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml 2008-09-02 10:51:59 UTC (rev 2066)
@@ -1,15 +0,0 @@
-<AutomatedInstallation langpack="eng">
- <com.izforge.izpack.panels.HelloPanel />
- <com.izforge.izpack.panels.TargetPanel>
- <installpath>JBOSS_HOME</installpath>
- </com.izforge.izpack.panels.TargetPanel>
- <com.izforge.izpack.panels.TreePacksPanel>
- <pack name="jBPM3" index="0" selected="true" />
- <pack name="jBPM3 Config" index="1" selected="true" />
- <pack name="jBPM3 Console" index="2" selected="true" />
- <pack name="jBPM3 Hypersonic Database Scripts" 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.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml 2008-09-02 10:51:59 UTC (rev 2066)
@@ -0,0 +1,17 @@
+<AutomatedInstallation langpack="eng">
+ <com.izforge.izpack.panels.HelloPanel />
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="jbossTargetServer" value="default" />
+ <entry key="jbossSelection" value="CONTAINER" />
+ <entry key="databaseSelection" value="DATABASE" />
+ </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.InstallPanel />
+ <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2065 - in jbpm3/trunk/modules/jpdl/core: scripts and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 06:14:40 -0400 (Tue, 02 Sep 2008)
New Revision: 2065
Added:
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
Modified:
jbpm3/trunk/modules/jpdl/core/pom.xml
jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml
Log:
Add hibernate.common.xml
Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml 2008-09-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -158,6 +158,65 @@
<profiles>
<!--
+ Name: no-database
+ Descr: Setup the default database
+ -->
+ <profile>
+ <id>no-database</id>
+ <activation>
+ <property>
+ <name>!database</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!--
+ Cleanup stale tests from the testsuite
+ http://jira.jboss.org/jira/browse/JBPM-1205
+ -->
+ <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
+ <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
+ <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
+ <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
+ <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
+ <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
+ <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
+ <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
+ <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
+ <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
+ <exclude>org/jbpm/mail/MailTest.java</exclude>
+ <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
+ <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
+ <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
+ <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
+ <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
+ <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
+ <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
+ <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
+ <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
+ <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: hsqldb
Descr: Hypersonic Database Setup
-->
Modified: jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -36,6 +36,7 @@
<hibernate-configuration>
<session-factory>
]]></header>
+ <fileset file="${project.resources.directory}/hibernate.common.xml" />
<fileset file="${project.resources.directory}/hibernate.properties.(a){database}.xml" />
<fileset file="${project.resources.directory}/hibernate.mapping.xml" />
<fileset file="${project.resources.directory}/hibernate.cache.xml" />
Added: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -0,0 +1,28 @@
+
+ <!-- ################################### -->
+ <!-- # common settings # -->
+ <!-- ################################### -->
+
+ <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+ <!-- DataSource properties (begin) ===
+ <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
+ ==== DataSource properties (end) -->
+
+ <!-- JTA transaction properties (begin) ===
+ <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+ ==== JTA transaction properties (end) -->
+
+ <!-- CMT transaction properties (begin) ===
+ <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
+ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+ ==== CMT transaction properties (end) -->
+
+ <!-- logging properties
+ <property name="hibernate.show_sql">true</property>
+ <property name="hibernate.format_sql">true</property>
+ <property name="hibernate.use_sql_comments">true</property>
+ -->
+
+
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -10,24 +10,3 @@
<property name="hibernate.hbm2ddl.auto">create</property>
<!-- JDBC connection properties (end) -->
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
- <!-- DataSource properties (begin) ===
- <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
- ==== DataSource properties (end) -->
-
- <!-- JTA transaction properties (begin) ===
- <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
- <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- ==== JTA transaction properties (end) -->
-
- <!-- CMT transaction properties (begin) ===
- <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
- <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- ==== CMT transaction properties (end) -->
-
- <!-- logging properties
- <property name="hibernate.show_sql">true</property>
- <property name="hibernate.format_sql">true</property>
- <property name="hibernate.use_sql_comments">true</property>
- -->
\ No newline at end of file
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml 2008-09-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -8,7 +8,6 @@
<property name="hibernate.connection.username">jbpmtest</property>
<property name="hibernate.connection.password"></property>
<property name="hibernate.query.substitutions">true 1, false 0</property>
-
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
<property name="hibernate.hbm2ddl.auto">create</property>
+ <!-- JDBC connection properties (end) -->
+
\ No newline at end of file
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml 2008-09-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -7,7 +7,6 @@
<property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/jbpmtest</property>
<property name="hibernate.connection.username">jbpmtest</property>
<property name="hibernate.connection.password"></property>
-
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
<property name="hibernate.hbm2ddl.auto">create</property>
+ <!-- JDBC connection properties (end) -->
+
\ No newline at end of file
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2064 - in jbpm3/trunk/modules: distribution/scripts and 7 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 06:00:32 -0400 (Tue, 02 Sep 2008)
New Revision: 2064
Added:
jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml
jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml
jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
Removed:
jbpm3/trunk/modules/distribution/src/main/resources/database/hypersonic/jbpm-ds.xml
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/install-definition.xml
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/jpdl/core/pom.xml
jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml
Log:
Support choice of container/database in installer
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -10,7 +10,8 @@
<!-- ====================================================================== -->
<!-- $Id$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss jBPM - Distribution</name>
<groupId>org.jboss.jbpm</groupId>
@@ -81,6 +82,17 @@
<groupId>izpack</groupId>
<artifactId>standalone-compiler</artifactId>
</dependency>
+
+ <!-- Database Drivers -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <classifier>jdbc3</classifier>
+ </dependency>
</dependencies>
<!-- Plugins -->
Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -1,94 +1,133 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-
<installation version="1.0">
- <!-- Ant properties in this file can be referenced with @{},
-otherwise use variables below in installer files with ${} -->
- <info>
- <appname>@{product.name}</appname>
- <appversion>@{product.version}</appversion>
- <uninstaller name="remove.task" write="yes" />
- </info>
+ <!--
+ Ant properties in this file can be referenced with @{},
+ otherwise use variables below in installer files with ${}
+ -->
+ <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>
- <guiprefs width="600" height="480" resizable="no">
- <laf name="kunststoff">
- <os family="unix" />
- </laf>
- <!--
- <modifier key="useHeadingPanel" value="yes" />
- <modifier key="useHeadingForSummary" value="yes" />
- <modifier key="headingImageOnLeft" value="yes" />
- <modifier key="headingLineCount" value="2" />
- <modifier key="headingFontSize" value="1.5" />
- <modifier key="headingBackgroundColor" value="0x00ffffff" />
- <modifier key="headingPanelCounter" value="text" />
- <modifier key="headingPanelCounterPos" value="inHeading" />
- -->
- </guiprefs>
+ <!-- Need to define ant properties we want to use during install as variables -->
+ <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>
+ <condition type="variable" id="isHypersonic">
+ <name>databaseSelection</name>
+ <value>hsqldb</value>
+ </condition>
+ <condition type="variable" id="isMySQL">
+ <name>databaseSelection</name>
+ <value>mysql</value>
+ </condition>
+ <condition type="variable" id="isPostgreSQL">
+ <name>databaseSelection</name>
+ <value>postgresql</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" />
+ <!-- Packs and summary panels do not repect the conditions - ->
+ <panel classname="PacksPanel" />
+ <panel classname="SummaryPanel" />
+ -->
+ <panel classname="InstallPanel" />
+ <panel classname="FinishPanel" />
+ </panels>
+
+ <packs>
+ <!-- jBPM Main Components -->
+ <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-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"/>
+ </pack>
- <locale>
- <langpack iso3="eng" />
- </locale>
+ <!-- jBPM Hypersonic Database -->
+ <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" condition="isHypersonic">
+ <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-config/hibernate.cfg.hsqldb.xml"
+ target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/>
+ </pack>
- <!-- Need to define ant properties we want to use during install as variables -->
- <variables>
- <variable name="UserPathPanelVariable" value="@{jboss422.home}" />
- </variables>
+ <!-- jBPM MySQL Database -->
+ <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" condition="isMySQL">
+ <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-config/hibernate.cfg.mysql.xml"
+ target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/>
+ </pack>
- <resources>
- <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt"/>
- </resources>
-
- <panels>
- <panel classname="HelloPanel" />
- <panel classname="TargetPanel" />
- <panel classname="TreePacksPanel" />
- <panel classname="SummaryPanel" />
- <panel classname="InstallPanel" />
- <panel classname="FinishPanel" />
- </panels>
-
- <packs>
- <!-- jBPM Main Components -->
- <pack name="jBPM3" required="yes" installGroups="Main">
- <description>The jBPM Main Components</description>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/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="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm"
- override="true">
- <include name="jbpm-enterprise.jar"/>
- </fileset>
- <file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm/jbpm-console.war"
- unpack="true" override="true"/>
- <file src="@{deploy.artifacts.dir}/lib/jbpm-console-service.zip" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm/jbpm-service.sar"
- unpack="true" override="true"/>
- </pack>
-
- <!-- jBPM Distro config -->
- <pack name="jBPM3 Config" required="yes" installGroups="Main">
- <description>The jBPM default configuration</description>
- <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-config" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm/jbpm-service.sar">
- <include name="hibernate.cfg.xml"/>
- <include name="jbpm.cfg.xml"/>
- </fileset>
- </pack>
-
- <!-- jBPM Hypersonic Database -->
- <pack name="jBPM3 Hypersonic Database Scripts" required="no" installGroups="Main">
- <description>The Hypersonic Database Scripts</description>
- <fileset dir="@{resources.dir}/database" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/data"
- override="asktrue">
- <include name="hypersonic/jbpmDB.*"/>
- </fileset>
- <fileset dir="@{resources.dir}/database/hypersonic" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm"
- override="asktrue">
- <include name="jbpm-ds.xml"/>
- </fileset>
- </pack>
- </packs>
-
-</installation>
+ <!-- jBPM PostgreSQL Database -->
+ <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" condition="isPostgreSQL">
+ <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-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
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/database/hypersonic/jbpm-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/hypersonic/jbpm-ds.xml 2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/hypersonic/jbpm-ds.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
-
- <local-tx-datasource>
- <jndi-name>JbpmDS</jndi-name>
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
- <min-pool-size>1</min-pool-size>
- <max-pool-size>5</max-pool-size>
- <idle-timeout-minutes>0</idle-timeout-minutes>
- <track-statements/>
- <!--
- <security-domain>HsqlDbRealm</security-domain>
- -->
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
- <metadata><type-mapping>Hypersonic SQL</type-mapping></metadata>
- <depends>jboss:service=Hypersonic,database=jbpmDB</depends>
- </local-tx-datasource>
-
- <mbean code="org.jboss.jdbc.HypersonicDatabase"
- name="jboss:service=Hypersonic,database=jbpmDB">
- <attribute name="Database">jbpmDB</attribute>
- <attribute name="InProcessMode">true</attribute>
- </mbean>
-
-</datasources>
Added: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>JbpmDS</jndi-name>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>1</min-pool-size>
+ <max-pool-size>5</max-pool-size>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <track-statements/>
+ <!--
+ <security-domain>HsqlDbRealm</security-domain>
+ -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <metadata><type-mapping>Hypersonic SQL</type-mapping></metadata>
+ <depends>jboss:service=Hypersonic,database=jbpmDB</depends>
+ </local-tx-datasource>
+
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic,database=jbpmDB">
+ <attribute name="Database">jbpmDB</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+
+</datasources>
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>JbpmDS</jndi-name>
+ <connection-url>jdbc:mysql://localhost:3306/jbpmtest</connection-url>
+ <driver-class>com.mysql.jdbc.Driver</driver-class>
+ <user-name>jbpmtest</user-name>
+ <password></password>
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter</exception-sorter-class-name>
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml -->
+ <metadata>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>JbpmDS</jndi-name>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>1</min-pool-size>
+ <max-pool-size>5</max-pool-size>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <track-statements/>
+ <!--
+ <security-domain>HsqlDbRealm</security-domain>
+ -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <metadata><type-mapping>Hypersonic SQL</type-mapping></metadata>
+ <depends>jboss:service=Hypersonic,database=jbpmDB</depends>
+ </local-tx-datasource>
+
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic,database=jbpmDB">
+ <attribute name="Database">jbpmDB</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+
+</datasources>
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -0,0 +1,32 @@
+<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>
+ <field type="divider" />
+ <field type="radio" variable="databaseSelection">
+ <description align="left" txt="Please choose your target database" />
+ <spec>
+ <choice txt="Hypersonic" value="hsqldb" set="true" />
+ <choice txt="MySQL" value="mysql" />
+ <choice txt="PostgreSQL" value="postgresql" />
+ </spec>
+ </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
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -147,6 +147,7 @@
</excludes>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jboss-maven-plugin</artifactId>
@@ -173,6 +174,7 @@
</execution>
</executions>
</plugin>
+ -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml 2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -135,49 +135,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/jbpm/mail/MailTest.java</exclude>
- <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
- <!--
- Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205
- -->
- <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
- <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
- <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
- <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
- <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
- <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
- <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
- <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java
- </exclude>
- <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
- <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
- <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
- <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
- <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
- <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
- <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
- <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
- <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
- <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
- <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
- <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
- <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
- <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
- <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
- <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
- <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
- <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
- <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java
- </exclude>
- <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
- <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -199,5 +156,191 @@
<!-- Profiles -->
<profiles>
+
+ <!--
+ Name: hsqldb
+ Descr: Hypersonic Database Setup
+ -->
+ <profile>
+ <id>hsqldb</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>hsqldb</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!--
+ Cleanup stale tests from the testsuite
+ http://jira.jboss.org/jira/browse/JBPM-1205
+ -->
+ <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
+ <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
+ <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
+ <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
+ <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
+ <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
+ <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
+ <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
+ <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
+ <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
+ <exclude>org/jbpm/mail/MailTest.java</exclude>
+ <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
+ <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
+ <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
+ <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
+ <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
+ <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
+ <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
+ <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
+ <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
+ <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: mysql
+ Descr: MySQL Database Setup
+ -->
+ <profile>
+ <id>mysql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mysql</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!--
+ Cleanup stale tests from the testsuite
+ http://jira.jboss.org/jira/browse/JBPM-1205
+ -->
+ <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
+ <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
+ <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
+ <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
+ <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
+ <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
+ <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
+ <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
+ <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
+ <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
+ <exclude>org/jbpm/mail/MailTest.java</exclude>
+ <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
+ <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
+ <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
+ <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
+ <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
+ <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
+ <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
+ <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
+ <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
+ <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+ <!--
+ Fix MySQL regression
+ https://jira.jboss.org/jira/browse/JBPM-1711
+ -->
+ <exclude>org/jbpm/persistence/db/PersistenceServiceDbTest.java</exclude>
+ <exclude>org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: postgresql
+ Descr: MySQL Database Setup
+ -->
+ <profile>
+ <id>postgresql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>postgresql</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!--
+ Cleanup stale tests from the testsuite
+ http://jira.jboss.org/jira/browse/JBPM-1205
+ -->
+ <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
+ <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
+ <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
+ <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
+ <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
+ <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
+ <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
+ <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
+ <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
+ <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
+ <exclude>org/jbpm/mail/MailTest.java</exclude>
+ <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
+ <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
+ <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
+ <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
+ <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
+ <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
+ <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
+ <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
+ <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
+ <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -12,42 +12,47 @@
<!-- $Id$ -->
<project default="concat">
+
<property name="project.build.directory" value="${basedir}/target"/>
<property name="project.resources.directory" value="${basedir}/src/main/resources"/>
- <target name="check-database">
+ <macrodef name="macro-database-cfg">
+ <attribute name="database" />
+ <sequential>
+
+ <available property="database.properties.available" file="${project.resources.directory}/hibernate.properties.(a){database}.xml"/>
+ <fail message="hibernate.properties.(a){database}.xml not available" unless="database.properties.available"/>
+
+ <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml" />
+
+ <!-- Concat hibernate.cfg.xml -->
+ <concat destfile="${project.build.directory}/classes/hibernate.cfg.(a){database}.xml">
+ <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
- <property name="hibernate.properties.xml" value="hibernate.properties.${database}.xml"/>
- <available property="database.properties.available" file="${project.resources.directory}/${hibernate.properties.xml}"/>
- <fail message="${hibernate.properties.xml} not available" unless="database.properties.available"/>
-
- <echo/>
- <echo message="Concat hibernate.cfg.xml using ${hibernate.properties.xml}" />
- <echo/>
-
- </target>
+ <!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
- <target name="concat" depends="check-database">
+ <hibernate-configuration>
+ <session-factory>
+ ]]></header>
+ <fileset file="${project.resources.directory}/hibernate.properties.(a){database}.xml" />
+ <fileset file="${project.resources.directory}/hibernate.mapping.xml" />
+ <fileset file="${project.resources.directory}/hibernate.cache.xml" />
+ <footer trimleading="yes"><![CDATA[
+ </session-factory>
+ </hibernate-configuration>
+ ]]></footer>
+ </concat>
+ </sequential>
+ </macrodef>
- <!-- Concat hibernate.cfg.xml -->
- <concat destfile="${project.build.directory}/classes/hibernate.cfg.xml">
- <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
- <session-factory>
- ]]></header>
- <fileset file="${project.resources.directory}/${hibernate.properties.xml}" />
- <fileset file="${project.resources.directory}/hibernate.mapping.xml" />
- <fileset file="${project.resources.directory}/hibernate.cache.xml" />
- <footer trimleading="yes"><![CDATA[
- </session-factory>
-</hibernate-configuration>
- ]]></footer>
- </concat>
+ <target name="concat">
+ <macro-database-cfg database="hsqldb"/>
+ <macro-database-cfg database="mysql"/>
+ <macro-database-cfg database="postgresql"/>
+ <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" />
+ <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/>
</target>
</project>
\ No newline at end of file
Modified: jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml 2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -7,24 +7,14 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>hibernate.*</include>
+ <include>hibernate.cfg.xml</include>
+ <include>hibernate.cfg.*.xml</include>
<include>jbpm.cfg.xml</include>
<include>jbpm.mail.templates.xml</include>
</includes>
- <!-- exclude the dummy extra mappings -->
- <excludes>
- <exclude>hibernate.extra.hbm.xml</exclude>
- </excludes>
</fileSet>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>hibernate.cfg.xml</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml 2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml 2008-09-02 10:00:32 UTC (rev 2064)
@@ -1,4 +1,5 @@
-<!-- ################################### -->
+
+ <!-- ################################### -->
<!-- # cache settings # -->
<!-- # strategy="nonstrict-read-write" # -->
<!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # -->
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2063 - in jbpm3/trunk/modules: jpdl/core/src/main/resources and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-02 02:32:15 -0400 (Tue, 02 Sep 2008)
New Revision: 2063
Modified:
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml
Log:
Use jboss mojo for test deployment
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-01 17:36:56 UTC (rev 2062)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-02 06:32:15 UTC (rev 2063)
@@ -86,7 +86,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>build-jars</id>
<phase>test-compile</phase>
<goals>
<goal>run</goal>
@@ -123,7 +122,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy-dependencies</goal>
@@ -150,6 +148,32 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-tests</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${project.build.directory}/test-libs/enterprise-test.war</fileName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-tests</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${project.build.directory}/test-libs/enterprise-test.war</fileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-01 17:36:56 UTC (rev 2062)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-02 06:32:15 UTC (rev 2063)
@@ -16,15 +16,15 @@
<property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
==== DataSource properties (end) -->
- <!-- JTA transaction properties
+ <!-- JTA transaction properties (begin) ===
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- -->
+ ==== JTA transaction properties (end) -->
- <!-- CMT transaction properties
+ <!-- CMT transaction properties (begin) ===
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- -->
+ ==== CMT transaction properties (end) -->
<!-- logging properties
<property name="hibernate.show_sql">true</property>
17 years, 7 months
- 1
- 0