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

Merge with 648eace927e995af3afbe059368cdb796050a600

This commit is contained in:
Heng Sin Low 2012-12-22 00:03:18 +08:00
parent 732baf28bc 4feb955c34
commit 2afcd4085e
16 changed files with 70 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
event.test/build.properties
View File

@ -1,5 +1,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/event.xml
OSGI-INF/event.xml,\
OSGI-INF/
source.. = src/

12
migration/i1.0a-release/oracle/201212211710_IDEMPIERE-294.sql.sql Normal file
View File

@ -0,0 +1,12 @@
-- Dec 21, 2012 7:16:06 AM EST
-- IDEMPIERE-294 Create a mechanism to broadcast messages to clients
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Acknowledge',200130,'U','263e6f73-5932-4e07-979f-1482319a6409','Acknowledge','Y',TO_DATE('2012-12-21 07:16:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-12-21 07:16:05','YYYY-MM-DD HH24:MI:SS'))
;
-- Dec 21, 2012 7:16:06 AM EST
-- IDEMPIERE-294 Create a mechanism to broadcast messages to clients
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200130 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
SELECT register_migration_script('201212211710_IDEMPIERE-294.sql') FROM dual
;

12
migration/i1.0a-release/postgresql/201212211710_IDEMPIERE-294.sql Normal file
View File

@ -0,0 +1,12 @@
-- Dec 21, 2012 7:16:06 AM EST
-- IDEMPIERE-294 Create a mechanism to broadcast messages to clients
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Acknowledge',200130,'U','263e6f73-5932-4e07-979f-1482319a6409','Acknowledge','Y',TO_TIMESTAMP('2012-12-21 07:16:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-12-21 07:16:05','YYYY-MM-DD HH24:MI:SS'))
;
-- Dec 21, 2012 7:16:06 AM EST
-- IDEMPIERE-294 Create a mechanism to broadcast messages to clients
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200130 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
SELECT register_migration_script('201212211710_IDEMPIERE-294.sql') FROM dual
;

2
org.adempiere.eclipse.equinox.http.servlet/build.properties
View File

@ -3,3 +3,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = J2SE-1.3
javacErrors.. = -assertIdentifier,-enumIdentifier

2
org.adempiere.eclipse.equinox.http.servletbridge/build.properties
View File

@ -3,3 +3,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = J2SE-1.3
javacErrors.. = -assertIdentifier,-enumIdentifier

2
org.adempiere.eclipse.equinox.servletbridge/build.properties
View File

@ -3,3 +3,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = J2SE-1.3
javacErrors.. = -assertIdentifier,-enumIdentifier

2
org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeFilter.java
View File

@ -73,7 +73,7 @@ public class BridgeFilter extends BridgeServlet implements Filter {
return filterConfig.getInitParameter(arg0);
}
public Enumeration getInitParameterNames() {
public Enumeration<String> getInitParameterNames() {
return filterConfig.getInitParameterNames();
}

40
org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java
View File

@ -37,9 +37,9 @@ public class CloseableURLClassLoader extends URLClassLoader {
static final String JAR = "jar"; //$NON-NLS-1$
// @GuardedBy("loaders")
final ArrayList loaders = new ArrayList(); // package private to avoid synthetic access.
final ArrayList<CloseableJarFileLoader> loaders = new ArrayList<CloseableJarFileLoader>(); // package private to avoid synthetic access.
// @GuardedBy("loaders")
private final ArrayList loaderURLs = new ArrayList(); // note: protected by loaders
private final ArrayList<URL> loaderURLs = new ArrayList<URL>(); // note: protected by loaders
// @GuardedBy("loaders")
boolean closed = false; // note: protected by loaders, package private to avoid synthetic access.
@ -187,7 +187,7 @@ public class CloseableURLClassLoader extends URLClassLoader {
}
private static URL[] excludeFileJarURLS(URL[] urls) {
ArrayList urlList = new ArrayList();
ArrayList<URL> urlList = new ArrayList<URL>();
for (int i = 0; i < urls.length; i++) {
if (!isFileJarURL(urls[i]))
urlList.add(urls[i]);
@ -209,9 +209,9 @@ public class CloseableURLClassLoader extends URLClassLoader {
/* (non-Javadoc)
* @see java.net.URLClassLoader#findClass(java.lang.String)
*/
protected Class findClass(final String name) throws ClassNotFoundException {
protected Class<?> findClass(final String name) throws ClassNotFoundException {
try {
Class clazz = (Class) AccessController.doPrivileged(new PrivilegedExceptionAction() {
Class<?> clazz = (Class<?>) AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
public Object run() throws ClassNotFoundException {
String resourcePath = name.replace('.', '/') + DOT_CLASS;
CloseableJarFileLoader loader = null;
@ -219,8 +219,8 @@ public class CloseableURLClassLoader extends URLClassLoader {
synchronized (loaders) {
if (closed)
return null;
for (Iterator iterator = loaders.iterator(); iterator.hasNext();) {
loader = (CloseableJarFileLoader) iterator.next();
for (Iterator<CloseableJarFileLoader> iterator = loaders.iterator(); iterator.hasNext();) {
loader = iterator.next();
resourceURL = loader.getURL(resourcePath);
if (resourceURL != null)
break;
@ -245,7 +245,7 @@ public class CloseableURLClassLoader extends URLClassLoader {
}
// package private to avoid synthetic access.
Class defineClass(String name, URL resourceURL, Manifest manifest) throws IOException {
Class<?> defineClass(String name, URL resourceURL, Manifest manifest) throws IOException {
JarURLConnection connection = (JarURLConnection) resourceURL.openConnection();
int lastDot = name.lastIndexOf('.');
if (lastDot != -1) {
@ -298,13 +298,13 @@ public class CloseableURLClassLoader extends URLClassLoader {
* @see java.net.URLClassLoader#findResource(java.lang.String)
*/
public URL findResource(final String name) {
URL url = (URL) AccessController.doPrivileged(new PrivilegedAction() {
URL url = (URL) AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
synchronized (loaders) {
if (closed)
return null;
for (Iterator iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = (CloseableJarFileLoader) iterator.next();
for (Iterator<CloseableJarFileLoader> iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = iterator.next();
URL resourceURL = loader.getURL(name);
if (resourceURL != null)
return resourceURL;
@ -321,15 +321,15 @@ public class CloseableURLClassLoader extends URLClassLoader {
/* (non-Javadoc)
* @see java.net.URLClassLoader#findResources(java.lang.String)
*/
public Enumeration findResources(final String name) throws IOException {
final List resources = new ArrayList();
AccessController.doPrivileged(new PrivilegedAction() {
public Enumeration<URL> findResources(final String name) throws IOException {
final List<URL> resources = new ArrayList<URL>();
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
synchronized (loaders) {
if (closed)
return null;
for (Iterator iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = (CloseableJarFileLoader) iterator.next();
for (Iterator<CloseableJarFileLoader> iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = iterator.next();
URL resourceURL = loader.getURL(name);
if (resourceURL != null)
resources.add(resourceURL);
@ -338,7 +338,7 @@ public class CloseableURLClassLoader extends URLClassLoader {
return null;
}
}, context);
Enumeration e = super.findResources(name);
Enumeration<URL> e = super.findResources(name);
while (e.hasMoreElements())
resources.add(e.nextElement());
@ -353,8 +353,8 @@ public class CloseableURLClassLoader extends URLClassLoader {
synchronized (loaders) {
if (closed)
return;
for (Iterator iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = (CloseableJarFileLoader) iterator.next();
for (Iterator<CloseableJarFileLoader> iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = iterator.next();
loader.close();
}
closed = true;
@ -381,7 +381,7 @@ public class CloseableURLClassLoader extends URLClassLoader {
* @see java.net.URLClassLoader#getURLs()
*/
public URL[] getURLs() {
List result = new ArrayList();
List<URL> result = new ArrayList<URL>();
synchronized (loaders) {
result.addAll(loaderURLs);
}

3
org.adempiere.ui.zk.example/build.properties
View File

@ -1,5 +1,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/export.xml
OSGI-INF/export.xml,\
OSGI-INF/
source.. = src/

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java
View File

@ -29,6 +29,7 @@ import org.compiere.model.MNote;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.idempiere.broadcast.IBroadcastMsgPopup;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
@ -89,7 +90,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
}
private void init() {
setTitle("Message");
setTitle(Msg.getMsg(Env.getCtx(),"Message"));
Borderlayout layout = new Borderlayout();
this.appendChild(layout);
addEventListener("onFocus", this);
@ -172,7 +173,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
acknowledged.setParent(rightCell);
acknowledged.setVisible(false);
//acknowledged.setHflex("6");
acknowledged.setLabel("Acknowledge");
acknowledged.setLabel(Msg.getMsg(Env.getCtx(),"Acknowledge"));
acknowledged.addEventListener("onClick", this);
}

3
org.compiere.db.oracle.provider/build.properties
View File

@ -5,5 +5,6 @@ bin.includes = META-INF/,\
ojdbc6.jar,\
c3p0-0.9.1.2.jar,\
c3p0-oracle-thin-extras-0.9.1.2.jar,\
OSGI-INF/oracleprovider.xml
OSGI-INF/oracleprovider.xml,\
OSGI-INF/
source.. = src/

3
org.compiere.db.postgresql.provider/build.properties
View File

@ -4,5 +4,6 @@ bin.includes = META-INF/,\
postgresql.jar,\
plugin.xml,\
c3p0-0.9.1.2.jar,\
OSGI-INF/pgprovider.xml
OSGI-INF/pgprovider.xml,\
OSGI-INF/
source.. = src/

3
org.idempiere.fitnesse.fixture/build.properties
View File

@ -2,5 +2,6 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/fitfixturefactory.xml,\
OSGI-INF/slimfixturefactory.xml
OSGI-INF/slimfixturefactory.xml,\
OSGI-INF/
source.. = src/

1
org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
View File

@ -29,3 +29,4 @@ Bundle-ClassPath: .,
hazelcast-2.4.jar,
hazelcast-cloud-2.4.jar
Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

3
org.idempiere.hazelcast.service/build.properties
View File

@ -5,5 +5,6 @@ bin.includes = META-INF/,\
hazelcast-cloud-2.4.jar,\
OSGI-INF/clusterservice.xml,\
OSGI-INF/cacheservice.xml,\
OSGI-INF/messageservice.xml
OSGI-INF/messageservice.xml,\
OSGI-INF/
source.. = src/

6
org.idempiere.webservices/build.properties
View File

@ -1,5 +1,4 @@
source.. = src/,\
WEB-INF/src/
source.. = WEB-INF/src/
output.. = WEB-INF/classes/
bin.includes = META-INF/,\
.,\
@ -23,7 +22,8 @@ bin.includes = META-INF/,\
WEB-INF/lib/commons-logging-1.1.1.jar,\
WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar,\
WEB-INF/lib/spring-osgi-extender-1.2.1.jar,\
WEB-INF/lib/idempiere-xmlbeans-1.0.jar
WEB-INF/lib/idempiere-xmlbeans-1.0.jar,\
plugin.xml
src.includes = WEB-INF/classes/,\
WEB-INF/lib/,\
WEB-INF/web.xml,\