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

hg merge release-6.1 (merge release6.1 into default)

This commit is contained in:
Carlos Ruiz 2018-11-09 08:04:50 -02:00
parent a6db3c7abc 9c5a53db6f
commit 2e1200bcaf
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base/src/org/compiere/util/DisplayType.java
View File

@ -655,6 +655,9 @@ public final class DisplayType
if (!DisplayType.isText(displayType))
s_log.severe("Unhandled Data Type = " + displayType);
if (columnName.endsWith("_ID"))
return "NUMBER(10)";
return "VARCHAR2(" + fieldLength + ")";
} // getSQLDataType

2
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
View File

@ -163,7 +163,7 @@ public class ColumnElementHandler extends AbstractElementHandler {
throw new POSaveFailedException("Failed to save column " + mColumn.getName());
}
if (recreateColumn || syncDatabase) {
if (mColumn.isActive() && (recreateColumn || syncDatabase)) {
deferFK(element, mColumn);
syncColumn(ctx, mColumn, action, recreateColumn);
}

6
org.adempiere.server-feature/server.product
View File

@ -41,7 +41,7 @@
<plugin id="org.adempiere.pipo" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.server" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="0" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="0" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="1" />
<plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="0" />
@ -60,6 +60,10 @@
<plugin id="org.eclipse.jetty.http2.server" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="true" startLevel="10" />
<plugin id="org.eclipse.jetty.websocket.common" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" />

4
org.adempiere.server-feature/server.product.launch
View File

File diff suppressed because one or more lines are too long

2
org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh
View File

@ -28,7 +28,7 @@ ADEMPIERE_DB_USER=$1
ADEMPIERE_DB_PASSWORD=$2
ADEMPIERE_DB_PATH=$3
CMD="sqlplus $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME"
SILENTCMD="$CMD -S"
SILENTCMD="sqlplus -S $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME"
ERROR_STRINGS="^(ORA-[0-9]+:|TNS-|PLS-)"
cd $IDEMPIERE_HOME/migration

7
org.idempiere.p2/server.product
View File

@ -17,6 +17,7 @@
<windowImages/>
<launcher name="idempiere">
<win useIco="false">
<bmp/>
@ -41,7 +42,7 @@
<plugin id="org.adempiere.pipo" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.server" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="0" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="0" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="1" />
<plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="0" />
@ -60,6 +61,10 @@
<plugin id="org.eclipse.jetty.http2.server" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="true" startLevel="10" />
<plugin id="org.eclipse.jetty.websocket.common" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" />