Merge Revisions 12415, 12514, 12531, 12536 from /release to /trunk
Revision: 12415 minor typo Revision: 12514 Committer LTH added by Redhuan Revision: 12531 Fix [2965640] Workflow approval bug Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2965640 Revision: 12536 upgrade to Oracle Database 11g Release 2 (11.2.0.1.0) JDBC Drivers downloaded from http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/htdocs/jdbc_112010.html ojdbc6.jar (2,111,220 bytes) - Classes for use with JDK 1.6. It contains the JDBC driver classes except classes for NLS support in Oracle Object and Collection types. Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2876927 Regards, Tony Snook
This commit is contained in:
parent
105925647f
commit
e42a4136b2
|
@ -26,14 +26,13 @@
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/standard.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/standard.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/Verisign.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/Verisign.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/ocrs12.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="jboss/lib/commons-httpclient.jar"/>
|
<classpathentry exported="true" kind="lib" path="jboss/lib/commons-httpclient.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/ant-commons-net.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/ant-commons-net.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/ant-launcher.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/ant-launcher.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/ant.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/ant.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/jsp-api.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/jsp-api.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/servlet-api.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/servlet-api.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/ojdbc14.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/ojdbc6.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/jpayment.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/jpayment.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/jnlp.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/jnlp.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/commons-collections-3.1.jar"/>
|
<classpathentry exported="true" kind="lib" path="tools/lib/commons-collections-3.1.jar"/>
|
||||||
|
|
|
@ -85,4 +85,5 @@ fercho_comus Fernando Saavedra LEC (Localization Ecuador)
|
||||||
eloy_gomez Eloy Gomez adempiere-osgi: https://sourceforge.net/projects/adempiere/forums/forum/610546/topic/2143547/index/page/4
|
eloy_gomez Eloy Gomez adempiere-osgi: https://sourceforge.net/projects/adempiere/forums/forum/610546/topic/2143547/index/page/4
|
||||||
jmpiloq Jens Pfeiffer LDE
|
jmpiloq Jens Pfeiffer LDE
|
||||||
sureeraya Sureeraya Limpaibul Thailand Localization
|
sureeraya Sureeraya Limpaibul Thailand Localization
|
||||||
peanutblake Peanut Blake Translation project
|
peanutblake Peanut Blake Translation project
|
||||||
|
kittiu KittiU Thailand Localization
|
|
@ -7,8 +7,7 @@
|
||||||
<classpathentry kind="src" path="/tools"/>
|
<classpathentry kind="src" path="/tools"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/JasperReportsTools"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/JasperReportsTools"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
|
|
||||||
<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/serverApps"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/serverApps"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
||||||
|
|
|
@ -39,12 +39,7 @@
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="lib" path="/tools/lib/ocrs12.jar">
|
<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar">
|
||||||
<attributes>
|
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
|
||||||
</attributes>
|
|
||||||
</classpathentry>
|
|
||||||
<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar">
|
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|
|
@ -129,7 +129,7 @@ public class MTest extends X_Test
|
||||||
*/
|
*/
|
||||||
protected boolean afterSave (boolean newRecord, boolean success)
|
protected boolean afterSave (boolean newRecord, boolean success)
|
||||||
{
|
{
|
||||||
log.info("New=" + newRecord + ", Seccess=" + success + " ***");
|
log.info("New=" + newRecord + ", Success=" + success + " ***");
|
||||||
return success;
|
return success;
|
||||||
} // afterSave
|
} // afterSave
|
||||||
|
|
||||||
|
|
|
@ -1059,7 +1059,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
|
||||||
if (isInvoker())
|
if (isInvoker())
|
||||||
{
|
{
|
||||||
// Set Approver
|
// Set Approver
|
||||||
int startAD_User_ID = getAD_User_ID();
|
int startAD_User_ID = Env.getAD_User_ID(getCtx());
|
||||||
if (startAD_User_ID == 0)
|
if (startAD_User_ID == 0)
|
||||||
startAD_User_ID = doc.getDoc_User_ID();
|
startAD_User_ID = doc.getDoc_User_ID();
|
||||||
int nextAD_User_ID = getApprovalUser(startAD_User_ID,
|
int nextAD_User_ID = getApprovalUser(startAD_User_ID,
|
||||||
|
@ -1078,7 +1078,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
|
||||||
// [ 1742751 ] Workflow: User Choice is not working
|
// [ 1742751 ] Workflow: User Choice is not working
|
||||||
if (resp.isHuman())
|
if (resp.isHuman())
|
||||||
{
|
{
|
||||||
autoApproval = resp.getAD_User_ID() == m_process.getAD_User_ID();
|
autoApproval = resp.getAD_User_ID() == Env.getAD_User_ID(getCtx());
|
||||||
if (!autoApproval && resp.getAD_User_ID() != 0)
|
if (!autoApproval && resp.getAD_User_ID() != 0)
|
||||||
setAD_User_ID(resp.getAD_User_ID());
|
setAD_User_ID(resp.getAD_User_ID());
|
||||||
}
|
}
|
||||||
|
@ -1087,7 +1087,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
|
||||||
MUserRoles[] urs = MUserRoles.getOfRole(getCtx(), resp.getAD_Role_ID());
|
MUserRoles[] urs = MUserRoles.getOfRole(getCtx(), resp.getAD_Role_ID());
|
||||||
for (int i = 0; i < urs.length; i++)
|
for (int i = 0; i < urs.length; i++)
|
||||||
{
|
{
|
||||||
if(urs[i].getAD_User_ID() == m_process.getAD_User_ID())
|
if(urs[i].getAD_User_ID() == Env.getAD_User_ID(getCtx()))
|
||||||
{
|
{
|
||||||
autoApproval = true;
|
autoApproval = true;
|
||||||
break;
|
break;
|
||||||
|
@ -1241,7 +1241,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
|
||||||
{
|
{
|
||||||
if (isInvoker())
|
if (isInvoker())
|
||||||
{
|
{
|
||||||
int startAD_User_ID = getAD_User_ID();
|
int startAD_User_ID = Env.getAD_User_ID(getCtx());
|
||||||
if (startAD_User_ID == 0)
|
if (startAD_User_ID == 0)
|
||||||
startAD_User_ID = doc.getDoc_User_ID();
|
startAD_User_ID = doc.getDoc_User_ID();
|
||||||
int nextAD_User_ID = getApprovalUser(startAD_User_ID,
|
int nextAD_User_ID = getApprovalUser(startAD_User_ID,
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
<classpathentry kind="lib" path="/tools/lib/ant-commons-net.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/ant-commons-net.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/ant-launcher.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/ant-launcher.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/commons-net-1.4.0.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/commons-net-1.4.0.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
|
|
||||||
<classpathentry kind="output" path="build"/>
|
<classpathentry kind="output" path="build"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -20,8 +20,7 @@
|
||||||
<classpathentry kind="lib" path="/tools/lib/jpedal.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/jpedal.jar"/>
|
||||||
<classpathentry kind="src" path="/serverApps"/>
|
<classpathentry kind="src" path="/serverApps"/>
|
||||||
<classpathentry kind="lib" path="/jboss/client/jbossall-client.jar"/>
|
<classpathentry kind="lib" path="/jboss/client/jbossall-client.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
|
|
||||||
<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
|
||||||
<classpathentry kind="output" path="posterita/web/WEB-INF/classes"/>
|
<classpathentry kind="output" path="posterita/web/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -138,16 +138,13 @@
|
||||||
|
|
||||||
<!-- Create oracle.jar file -->
|
<!-- Create oracle.jar file -->
|
||||||
<jar jarfile="${dist.dir}/oracle.jar" duplicate="preserve">
|
<jar jarfile="${dist.dir}/oracle.jar" duplicate="preserve">
|
||||||
<zipfileset src="lib/ojdbc14.jar">
|
<zipfileset src="lib/ojdbc6.jar">
|
||||||
<patternset refid="manifest.exclude" />
|
|
||||||
</zipfileset>
|
|
||||||
<zipfileset src="lib/ocrs12.jar">
|
|
||||||
<patternset refid="manifest.exclude" />
|
<patternset refid="manifest.exclude" />
|
||||||
</zipfileset>
|
</zipfileset>
|
||||||
|
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Specification-Title" value="Oracle JDBC" />
|
<attribute name="Specification-Title" value="Oracle JDBC" />
|
||||||
<attribute name="Specification-Version" value="10g" />
|
<attribute name="Specification-Version" value="11g" />
|
||||||
<attribute name="Specification-Vendor" value="Oracle" />
|
<attribute name="Specification-Vendor" value="Oracle" />
|
||||||
<attribute name="Implementation-Title" value="oracle ${env.ADEMPIERE_VERSION}" />
|
<attribute name="Implementation-Title" value="oracle ${env.ADEMPIERE_VERSION}" />
|
||||||
<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />
|
<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />
|
||||||
|
|
Loading…
Reference in New Issue