9:39 a.m.
Author: tom.baeyens(a)jboss.com
Date: 2009-08-29 10:39:48 -0400 (Sat, 29 Aug 2009)
New Revision: 5587
Added:
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml
Removed:
jbpm4/trunk/qa/jboss/
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/trunk/qa/build.xml
Log:
fixing the job executor startup plus cleanup
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-29 08:58:55 UTC
(rev 5586)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-29 14:39:48 UTC
(rev 5587)
@@ -40,7 +40,7 @@
<property name="hsqldb.server.install.dir"
value="${jbpm.home}/hsqldb-server"/>
<property name="hsqldb.server.source.dir"
value="${jbpm.home}/install/src/hsqldb-server" />
- <property name="jboss.version" value="5.1.0.GA" />
+ <property name="jboss.version" value="5.0.0.GA" />
<property name="jboss.parent.dir" value="${jbpm.home}" />
<property name="jboss.home"
value="${jboss.parent.dir}/jboss-${jboss.version}" />
<property name="jboss.filename"
value="jboss-${jboss.version}.zip" />
@@ -84,6 +84,14 @@
</not>
</condition>
+ <condition property="is.jboss.500">
+ <equals arg1="${jboss.version}" arg2="5.0.0.GA"/>
+ </condition>
+
+ <condition property="is.jboss.510">
+ <equals arg1="${jboss.version}" arg2="5.1.0.GA"/>
+ </condition>
+
<!-- ECLIPSE RELATED CONDITIONS -->
<condition property="eclipse.filename"
value="eclipse-jee-galileo-win32.zip">
<contains string="${os.name}" casesensitive="false"
substring="win" />
@@ -129,8 +137,11 @@
<!-- ### DEMO SETUP JBOSS #####################################################
-->
<target name="demo.setup.jboss"
- depends="install.jboss, install.jbpm.into.jboss, start.jboss"
+ depends="install.jboss, install.jbpm.into.jboss"
description="installs jboss, installs jbpm into jboss, starts jboss,
creates the jBPM DB schema, deploys examples, loads example identities, installs and
starts eclipse">
+ <antcall target="internal.enable.jboss.debug.jboss500" />
+ <antcall target="internal.enable.jboss.debug.jboss510" />
+ <antcall target="start.jboss" />
<antcall target="create.jbpm.schema" />
<antcall target="install.examples.into.jboss" />
<antcall target="load.example.identities" />
@@ -151,11 +162,6 @@
<!-- ### CREATE CONFIGURATION ########################################### -->
<target name="create.cfg" description="Creates a configuration in
${cfg.dest.dir}">
- <echo message="${cfg.dest.dir}" />
- <echo message="${install.src.dir}" />
- <echo message="${jdbc.properties.dir}" />
- <echo message="${user.dir}" />
- <echo
message="${install.src.dir}/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml"
/>
<mkdir dir="${cfg.dest.dir}" />
<copy tofile="${cfg.dest.dir}/jbpm.cfg.xml"
file="${install.src.dir}/cfg/jbpm/${tx}.jbpm.cfg.xml"
@@ -595,31 +601,7 @@
<arg line="stop"/>
</exec>
</target>
-
- <!-- ### COPY DATABASE DRIVER ######################################### -->
- <target name="internal.copy.database.driver">
- <condition property="database.driver"
value="mysql-connector-java.jar">
- <equals arg1="${database}" arg2="mysql" />
- </condition>
- <condition property="database.driver" value="ojdbc14.jar">
- <equals arg1="${database}" arg2="oracle" />
- </condition>
- <condition property="database.driver"
value="mysql-connector-java.jar">
- <equals arg1="${database}" arg2="mysql" />
- </condition>
- <condition property="database.driver"
value="postgresql.jar">
- <equals arg1="${database}" arg2="postgresql" />
- </condition>
- <condition property="database.driver" value="hsqldb.jar">
- <and>
- <equals arg1="${database}" arg2="hsqldb" />
- <equals arg1="${is.tomcat}" arg2="true" />
- </and>
- </condition>
- <antcall target="internal.copy.database.driver.if.needed" />
- </target>
-
<!-- ### CREATE JBPM SCHEMA ############################################# -->
<target name="create.jbpm.schema"
description="creates the jbpm tables in the database">
@@ -701,24 +683,6 @@
</java>
</target>
- <target name="internal.copy.database.driver.if.needed"
if="database.driver">
- <available file="${jbpm.home}/lib/${database.driver}"
property="database.driver.jar.available" />
- <fail message="please download the ${database} driver jar and put it in the
${jbpm.home}/lib directory" unless="database.driver.jar.available" />
- <echo message="Copying database driver ${database.driver} to
${database.driver.destination.dir}" />
- <copy file="${jbpm.home}/lib/${database.driver}"
todir="${database.driver.destination.dir}" />
- </target>
-
- <!-- ### INSTALL SIGNAVIO INTO JBOSS ##################################### -->
- <target name="install.signavio.into.jboss"
depends="internal.set.signavio.repo.dir">
- <!-- Current version of Signavio needs to be unpacked in /deploy to work correctly
-->
- <unzip src="${signavio.src.dir}/${signavio.war.file.name}"
dest="${jboss.server.deploy.dir}/${signavio.war.file.name}" />
- </target>
-
- <!-- ### INSTALL SIGNAVIO INTO TOMCAT ##################################### -->
- <target name="install.signavio.into.tomcat"
depends="internal.set.signavio.repo.dir">
- <copy file="${signavio.src.dir}/${signavio.war.file.name}"
todir="${tomcat.webapps.dir}"/>
- </target>
-
<!-- ### SET SIGNAVIO REPO DIR ##################################### -->
<target name="internal.set.signavio.repo.dir">
<mkdir dir="${jbpm.home}/signavio-repository" />
@@ -748,16 +712,6 @@
<antcall target="internal.install.eclipse.non.windows" />
</target>
- <target name="internal.install.eclipse.windows"
if="isWindows">
- <unzip src="${eclipse.distro.dir}/${eclipse.filename}"
dest="${jbpm.home}" overwrite="true" />
- </target>
-
- <target name="internal.install.eclipse.non.windows"
if="isNotWindows">
- <gunzip src="${eclipse.distro.dir}/${eclipse.filename}"
dest="${eclipse.distro.dir}" />
- <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}"
dest="${jbpm.home}" overwrite="true" />
- <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/>
- </target>
-
<!-- ### GET ECLIPSE ##################################################### -->
<condition property="is.eclipse.distro.available">
<available file="${eclipse.distro.path}" />
@@ -787,4 +741,72 @@
</exec>
</target>
+ <!-- ### INTERNAL TARGETS ################################################## -->
+
+ <target name="internal.enable.jboss.debug.jboss500"
if="is.jboss.500">
+ <echo message="enabling debug on ${jboss.home}" />
+ <replace file="${jboss.home}/bin/run.bat"
+ token="rem set JAVA_OPTS=%JAVA_OPTS% -Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
+ value="set JAVA_OPTS=%JAVA_OPTS% -Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" />
+ <echo message="copying customized log file to
${jboss.server.config.dir}/conf" />
+ <copy file="${jbpm.home}/install/src/jboss/log/jboss-log4j.xml"
todir="${jboss.server.config.dir}/conf" overwrite="true" />
+ </target>
+
+ <target name="internal.enable.jboss.debug.jboss510"
if="is.jboss.510">
+ <echo message="enabling debug on ${jboss.home}" />
+ <replace file="${jboss.home}/bin/run.conf.bat"
+ token="rem set "JAVA_OPTS=%JAVA_OPTS%
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n""
+ value="set "JAVA_OPTS=%JAVA_OPTS%
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n""/>
+ <echo message="copying customized log file to
${jboss.server.config.dir}/conf" />
+ <copy file="${jbpm.home}/install/src/jboss/log/jboss-log4j.xml"
todir="${jboss.server.config.dir}/conf" overwrite="true" />
+ </target>
+
+ <target name="internal.copy.database.driver">
+ <condition property="database.driver"
value="mysql-connector-java.jar">
+ <equals arg1="${database}" arg2="mysql" />
+ </condition>
+ <condition property="database.driver" value="ojdbc14.jar">
+ <equals arg1="${database}" arg2="oracle" />
+ </condition>
+ <condition property="database.driver"
value="mysql-connector-java.jar">
+ <equals arg1="${database}" arg2="mysql" />
+ </condition>
+ <condition property="database.driver"
value="postgresql.jar">
+ <equals arg1="${database}" arg2="postgresql" />
+ </condition>
+ <condition property="database.driver" value="hsqldb.jar">
+ <and>
+ <equals arg1="${database}" arg2="hsqldb" />
+ <equals arg1="${is.tomcat}" arg2="true" />
+ </and>
+ </condition>
+ <antcall target="internal.copy.database.driver.if.needed" />
+ </target>
+
+ <target name="internal.copy.database.driver.if.needed"
if="database.driver">
+ <available file="${jbpm.home}/lib/${database.driver}"
property="database.driver.jar.available" />
+ <fail message="please download the ${database} driver jar and put it in the
${jbpm.home}/lib directory" unless="database.driver.jar.available" />
+ <echo message="Copying database driver ${database.driver} to
${database.driver.destination.dir}" />
+ <copy file="${jbpm.home}/lib/${database.driver}"
todir="${database.driver.destination.dir}" />
+ </target>
+
+ <target name="install.signavio.into.jboss"
depends="internal.set.signavio.repo.dir">
+ <!-- Current version of Signavio needs to be unpacked in /deploy to work correctly
-->
+ <unzip src="${signavio.src.dir}/${signavio.war.file.name}"
dest="${jboss.server.deploy.dir}/${signavio.war.file.name}" />
+ </target>
+
+ <target name="install.signavio.into.tomcat"
depends="internal.set.signavio.repo.dir">
+ <copy file="${signavio.src.dir}/${signavio.war.file.name}"
todir="${tomcat.webapps.dir}"/>
+ </target>
+
+ <target name="internal.install.eclipse.windows"
if="isWindows">
+ <unzip src="${eclipse.distro.dir}/${eclipse.filename}"
dest="${jbpm.home}" overwrite="true" />
+ </target>
+
+ <target name="internal.install.eclipse.non.windows"
if="isNotWindows">
+ <gunzip src="${eclipse.distro.dir}/${eclipse.filename}"
dest="${eclipse.distro.dir}" />
+ <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}"
dest="${jbpm.home}" overwrite="true" />
+ <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/>
+ </target>
+
</project>
Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml
(from rev 5585, jbpm4/trunk/qa/jboss/jboss-log4j.xml)
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml
(rev 0)
+++
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml 2009-08-29
14:39:48 UTC (rev 5587)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 64096 2007-07-17 14:36:23Z stan.silvert(a)jboss.com $ -->
+
+<!--
+ | For more configuration information and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE"
class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler
class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File"
value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+ <!--
+ Set the threshold via a system property. Note this is parsed by log4j,
+ so the full JBoss system property format is not supported; e.g.
+ setting a default via ${jboss.server.log.threshold:WARN} will not work.
+ -->
+ <param name="Threshold"
value="${jboss.server.log.threshold}"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern"
value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern"
value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t)
%m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c]
(%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE"
class="org.apache.log4j.ConsoleAppender">
+ <errorHandler
class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="TRACE"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p
[%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Set the logging level of the JSF implementation -->
+ <category name="javax.enterprise.resource.webcontainer.jsf">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
+ <category name="org.quartz">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit JBoss categories -->
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.hibernate">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- category name="org.hibernate.SQL">
+ <priority value="DEBUG"/>
+ </category -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on:
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-08-29
08:58:55 UTC (rev 5586)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-08-29
14:39:48 UTC (rev 5587)
@@ -93,7 +93,7 @@
private static final Log log = Log.getLog(JbpmConfiguration.class.getName());
protected boolean isConfigured = false;
- protected WireContext processEngineWireContext = new WireContext(new WireDefinition(),
Context.CONTEXTNAME_PROCESS_ENGINE);
+ protected WireContext processEngineWireContext = new WireContext(new WireDefinition(),
Context.CONTEXTNAME_PROCESS_ENGINE, true);
protected WireDefinition transactionWireDefinition = new WireDefinition();
protected ThreadLocal<List<UserProvidedEnvironmentObject>>
userProvidedEnvironmentObjectsThreadLocal = new
ThreadLocal<List<UserProvidedEnvironmentObject>>();
@@ -129,6 +129,7 @@
}
}
}
+ processEngineWireContext.create();
userCommandService = (CommandService)
processEngineWireContext.get("user.command.service");
return this;
}
@@ -222,7 +223,7 @@
}
protected void installTransactionContext(PvmEnvironment environment) {
- WireContext transactionContext = new WireContext(transactionWireDefinition,
Context.CONTEXTNAME_TRANSACTION, environment, true);
+ WireContext transactionContext = new WireContext(transactionWireDefinition,
Context.CONTEXTNAME_TRANSACTION, true);
// add the environment block context to the environment
environment.setContext(transactionContext);
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-08-29
08:58:55 UTC (rev 5586)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-08-29
14:39:48 UTC (rev 5587)
@@ -225,7 +225,7 @@
}
public WireContext(WireDefinition wireDefinition) {
- this(wireDefinition, null, null, false);
+ this(wireDefinition, null, false);
}
/** when this {@link Context} is used in an {@link EnvironmentImpl}, it
@@ -246,7 +246,7 @@
* set and the scope needs to be added to the environment before the creation of this
wire scope is done.
* @see JbpmConfiguration#openEnvironment()
*/
- public WireContext(WireDefinition wireDefinition, String name, EnvironmentImpl
environment, boolean delayCreate) {
+ public WireContext(WireDefinition wireDefinition, String name, boolean delayCreate) {
this.wireDefinition = wireDefinition;
this.name = name;
this.classLoader = (wireDefinition!=null ? wireDefinition.getClassLoader() : null);
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2009-08-29
08:58:55 UTC (rev 5586)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2009-08-29
14:39:48 UTC (rev 5587)
@@ -24,6 +24,7 @@
import org.jbpm.pvm.internal.cmd.CommandService;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.JobExecutorDescriptor;
@@ -80,6 +81,7 @@
invokeStartOperation.setMethodName("start");
descriptor.addOperation(invokeStartOperation);
descriptor.setAutoStart(true);
+ descriptor.setInit(AbstractDescriptor.INIT_EAGER);
}
return descriptor;
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-08-29
08:58:55 UTC (rev 5586)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-08-29
14:39:48 UTC (rev 5587)
@@ -78,20 +78,6 @@
protected synchronized void initialize() {
if (processEngine==null) {
- String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type");
- String jbpmTestCfgResource =
System.getProperty("jbpm.test.cfg.resource");
- initialize(jbpmTestCfgType, jbpmTestCfgResource);
- }
- }
-
- protected synchronized void initialize(String jbpmTestCfgResource) {
- if (processEngine==null) {
- initialize(jbpmTestCfgResource, null);
- }
- }
-
- protected synchronized void initialize(String jbpmTestCfgResource, String
jbpmTestCfgType) {
- if (processEngine==null) {
processEngine = Configuration.getProcessEngine();
repositoryService = processEngine.get(RepositoryService.class);
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2009-08-29 08:58:55 UTC (rev 5586)
+++ jbpm4/trunk/qa/build.xml 2009-08-29 14:39:48 UTC (rev 5587)
@@ -100,8 +100,6 @@
description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss,
starts jboss and then creates the jbpm schema">
<ant antfile="${jbpm.home}/install/build.xml"
target="reinstall.jboss" />
<ant antfile="${jbpm.home}/install/build.xml"
target="install.jbpm.into.jboss" />
-
- <antcall target="internal.enable.jboss.debug" />
<ant antfile="${jbpm.home}/install/build.xml"
target="create.user.webapp" />
<ant antfile="${jbpm.home}/examples/build.xml"
target="examples.jar" />
@@ -181,10 +179,9 @@
todir="${jbpm.home}/lib"/>
</target>
- <!-- ################################################## -->
- <!-- ### INTERNAL TARGETS ### -->
- <!-- ### These targets can NOT be called separately ### -->
- <!-- ################################################## -->
+ <!-- ############################ -->
+ <!-- ### OLD IDENTITY TARGETS ### -->
+ <!-- ############################
<target name="internal.install.idm.into.jboss.integrationtestspecifics"
if="jbpm.identity.idm">
<copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar"
overwrite="true">
@@ -192,14 +189,6 @@
</copy>
</target>
-
- <target name="internal.enable.jboss.debug" if="jbpm.debug">
- <replace file="${jboss.home}/bin/run.bat"
- token="rem set JAVA_OPTS=%JAVA_OPTS% -Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
- value="set JAVA_OPTS=%JAVA_OPTS% -Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
- <copy file="jboss/jboss-log4j.xml"
todir="${jboss.server.config.dir}/conf" overwrite="true" />
- </target>
-
<condition property="identity.component.idm">
<equals arg1="${identity.component}" arg2="jboss.idm"/>
</condition>
@@ -207,10 +196,10 @@
<target name="copy.jbossidm.jdbc.configuration"
if="identity.component.idm">
<copy file="../modules/distro/target/libs/ojdbc14.jar"
todir="${jbossidm.home}/lib" />
- <!--copy file="jdbc/${database}.properties"
+ <copy file="jdbc/${database}.properties"
todir="${jbossidm.home}/db/jdbc"
overwrite="true"
- failonerror="false" /-->
+ failonerror="false" />
</target>
<target name="drop.jbossidm.schema"
if="identity.component.idm">
@@ -220,5 +209,6 @@
<target name="create.jbossidm.schema"
if="identity.component.idm">
<ant antfile="${jbossidm.home}/db/build.xml"
target="create.jbossidm.schema" />
</target>
+ -->
</project>