midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
tspc 2010-06-14 04:24:05 +00:00
parent 105925647f
commit e42a4136b2
9 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@ -26,14 +26,13 @@
<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/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="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.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/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/jnlp.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/commons-collections-3.1.jar"/>

1
COMMITTERS
View File

@ -86,3 +86,4 @@ eloy_gomez Eloy Gomez adempiere-osgi: https://sourceforge.net/
jmpiloq Jens Pfeiffer LDE
sureeraya Sureeraya Limpaibul Thailand Localization
peanutblake Peanut Blake Translation project
kittiu KittiU Thailand Localization

3
JasperReports/.classpath
View File

@ -7,8 +7,7 @@
<classpathentry kind="src" path="/tools"/>
<classpathentry combineaccessrules="false" kind="src" path="/JasperReportsTools"/>
<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/serverApps"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>

7
base/.classpath
View File

@ -39,12 +39,7 @@
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="/tools/lib/ocrs12.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar">
<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>

2
base/src/org/compiere/model/MTest.java
View File

@ -129,7 +129,7 @@ public class MTest extends X_Test
*/
protected boolean afterSave (boolean newRecord, boolean success)
{
log.info("New=" + newRecord + ", Seccess=" + success + " ***");
log.info("New=" + newRecord + ", Success=" + success + " ***");
return success;
} // afterSave

8
base/src/org/compiere/wf/MWFActivity.java
View File

@ -1059,7 +1059,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
if (isInvoker())
{
// Set Approver
int startAD_User_ID = getAD_User_ID();
int startAD_User_ID = Env.getAD_User_ID(getCtx());
if (startAD_User_ID == 0)
startAD_User_ID = doc.getDoc_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
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)
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());
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;
break;
@ -1241,7 +1241,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
{
if (isInvoker())
{
int startAD_User_ID = getAD_User_ID();
int startAD_User_ID = Env.getAD_User_ID(getCtx());
if (startAD_User_ID == 0)
startAD_User_ID = doc.getDoc_User_ID();
int nextAD_User_ID = getApprovalUser(startAD_User_ID,

3
install/.classpath
View File

@ -12,7 +12,6 @@
<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/commons-net-1.4.0.jar"/>
<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>

3
posterita/.classpath
View File

@ -20,8 +20,7 @@
<classpathentry kind="lib" path="/tools/lib/jpedal.jar"/>
<classpathentry kind="src" path="/serverApps"/>
<classpathentry kind="lib" path="/jboss/client/jbossall-client.jar"/>
<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
<classpathentry kind="output" path="posterita/web/WEB-INF/classes"/>
</classpath>

7
tools/build.xml
View File

@ -138,16 +138,13 @@
<!-- Create oracle.jar file -->
<jar jarfile="${dist.dir}/oracle.jar" duplicate="preserve">
<zipfileset src="lib/ojdbc14.jar">
<patternset refid="manifest.exclude" />
</zipfileset>
<zipfileset src="lib/ocrs12.jar">
<zipfileset src="lib/ojdbc6.jar">
<patternset refid="manifest.exclude" />
</zipfileset>
<manifest>
<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="Implementation-Title" value="oracle ${env.ADEMPIERE_VERSION}" />
<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />