diff --git a/event.test/build.properties b/event.test/build.properties index 9ea938077d..a5c5e6639b 100644 --- a/event.test/build.properties +++ b/event.test/build.properties @@ -1,5 +1,6 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - OSGI-INF/event.xml + OSGI-INF/event.xml,\ + OSGI-INF/ source.. = src/ diff --git a/migration/i1.0a-release/oracle/201212211710_IDEMPIERE-294.sql.sql b/migration/i1.0a-release/oracle/201212211710_IDEMPIERE-294.sql.sql new file mode 100644 index 0000000000..16f0b04aa8 --- /dev/null +++ b/migration/i1.0a-release/oracle/201212211710_IDEMPIERE-294.sql.sql @@ -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 +; \ No newline at end of file diff --git a/migration/i1.0a-release/postgresql/201212211710_IDEMPIERE-294.sql b/migration/i1.0a-release/postgresql/201212211710_IDEMPIERE-294.sql new file mode 100644 index 0000000000..590af5dde9 --- /dev/null +++ b/migration/i1.0a-release/postgresql/201212211710_IDEMPIERE-294.sql @@ -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 +; \ No newline at end of file diff --git a/org.adempiere.eclipse.equinox.http.servlet/build.properties b/org.adempiere.eclipse.equinox.http.servlet/build.properties index aa1a008269..5551aecc3d 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/build.properties +++ b/org.adempiere.eclipse.equinox.http.servlet/build.properties @@ -3,3 +3,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.properties +jre.compilation.profile = J2SE-1.3 +javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/build.properties b/org.adempiere.eclipse.equinox.http.servletbridge/build.properties index aa1a008269..5551aecc3d 100644 --- a/org.adempiere.eclipse.equinox.http.servletbridge/build.properties +++ b/org.adempiere.eclipse.equinox.http.servletbridge/build.properties @@ -3,3 +3,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.properties +jre.compilation.profile = J2SE-1.3 +javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/org.adempiere.eclipse.equinox.servletbridge/build.properties b/org.adempiere.eclipse.equinox.servletbridge/build.properties index aa1a008269..5551aecc3d 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/build.properties +++ b/org.adempiere.eclipse.equinox.servletbridge/build.properties @@ -3,3 +3,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.properties +jre.compilation.profile = J2SE-1.3 +javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeFilter.java b/org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeFilter.java index 4e19787ea6..084bfa0b47 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeFilter.java +++ b/org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeFilter.java @@ -73,7 +73,7 @@ public class BridgeFilter extends BridgeServlet implements Filter { return filterConfig.getInitParameter(arg0); } - public Enumeration getInitParameterNames() { + public Enumeration getInitParameterNames() { return filterConfig.getInitParameterNames(); } diff --git a/org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java b/org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java index f08495428b..7562e98664 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java +++ b/org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java @@ -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 loaders = new ArrayList(); // package private to avoid synthetic access. // @GuardedBy("loaders") - private final ArrayList loaderURLs = new ArrayList(); // note: protected by loaders + private final ArrayList loaderURLs = new ArrayList(); // 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 urlList = new ArrayList(); 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() { 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 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() { public Object run() { synchronized (loaders) { if (closed) return null; - for (Iterator iterator = loaders.iterator(); iterator.hasNext();) { - CloseableJarFileLoader loader = (CloseableJarFileLoader) iterator.next(); + for (Iterator 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 findResources(final String name) throws IOException { + final List resources = new ArrayList(); + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { synchronized (loaders) { if (closed) return null; - for (Iterator iterator = loaders.iterator(); iterator.hasNext();) { - CloseableJarFileLoader loader = (CloseableJarFileLoader) iterator.next(); + for (Iterator 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 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 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 result = new ArrayList(); synchronized (loaders) { result.addAll(loaderURLs); } diff --git a/org.adempiere.ui.zk.example/build.properties b/org.adempiere.ui.zk.example/build.properties index b6088d24a2..9bc7499535 100644 --- a/org.adempiere.ui.zk.example/build.properties +++ b/org.adempiere.ui.zk.example/build.properties @@ -1,5 +1,6 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - OSGI-INF/export.xml + OSGI-INF/export.xml,\ + OSGI-INF/ source.. = src/ diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java index d91eb2d7d0..07ec7a4988 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java @@ -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); } diff --git a/org.compiere.db.oracle.provider/build.properties b/org.compiere.db.oracle.provider/build.properties index 23c5fd06c7..e60cf008a0 100644 --- a/org.compiere.db.oracle.provider/build.properties +++ b/org.compiere.db.oracle.provider/build.properties @@ -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/ diff --git a/org.compiere.db.postgresql.provider/build.properties b/org.compiere.db.postgresql.provider/build.properties index d295ed7d48..d6c1b01288 100644 --- a/org.compiere.db.postgresql.provider/build.properties +++ b/org.compiere.db.postgresql.provider/build.properties @@ -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/ diff --git a/org.idempiere.fitnesse.fixture/build.properties b/org.idempiere.fitnesse.fixture/build.properties index 6c4d05a4c0..a49b5b7a8e 100644 --- a/org.idempiere.fitnesse.fixture/build.properties +++ b/org.idempiere.fitnesse.fixture/build.properties @@ -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/ diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF index e22ebaf44c..9854dbee51 100644 --- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF @@ -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 diff --git a/org.idempiere.hazelcast.service/build.properties b/org.idempiere.hazelcast.service/build.properties index 936c70cd91..8a0e604b69 100644 --- a/org.idempiere.hazelcast.service/build.properties +++ b/org.idempiere.hazelcast.service/build.properties @@ -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/ diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties index 5ff3a31763..bbba7c0c61 100644 --- a/org.idempiere.webservices/build.properties +++ b/org.idempiere.webservices/build.properties @@ -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,\