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

Fixed db type drop down not working after migration to equinox extension. Improve development setup to auto involve tomcat configuration ant script.

This commit is contained in:
Heng Sin Low 2010-11-29 15:41:28 +08:00
parent ed6f264381
commit 73deaa8a69
16 changed files with 131 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.adempiere.install/META-INF/MANIFEST.MF
View File

@ -12,4 +12,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.mail;version="1.4.0",
javax.mail.internet;version="1.4.0",
org.apache.tools.ant,
org.eclipse.equinox.app
org.eclipse.ant.core,
org.eclipse.core.runtime;version="3.4.0",
org.eclipse.equinox.app,
org.osgi.framework
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.adempiere.install.InstallBundleActivator

6
org.adempiere.install/install.app.launch
View File

@ -14,13 +14,13 @@
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-install.app"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -noExit"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
<stringAttribute key="selected_target_plugins" value="org.restlet@default:default,org.eclipse.core.contenttype@default:default,com.springsource.javax.servlet@default:default,com.springsource.javax.mail@default:default,com.springsource.org.junit@default:default,com.springsource.org.apache.poi@default:default,com.springsource.javax.activation@default:default,com.springsource.javax.xml.rpc@default:default,org.eclipse.equinox.registry@default:default,com.springsource.org.apache.activemq@default:default,org.eclipse.core.runtime@default:true,com.springsource.org.apache.commons.logging@default:default,org.eclipse.core.jobs@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.javax.ejb@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.preferences@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.commons.net@default:default,org.eclipse.equinox.app@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.org.apache.commons.collections@default:default,com.springsource.javax.jms@default:default,org.eclipse.equinox.common@2:true,com.springsource.javax.xml.soap@default:default,org.apache.ant@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.apache.ecs@default:default,org.compiere.db.postgresql.provider@default:default,org.compiere.db.oracle.provider@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.adempiere.base@default:default"/>
<stringAttribute key="selected_target_plugins" value="com.springsource.org.apache.commons.logging@default:default,org.eclipse.equinox.app@default:default,com.springsource.javax.mail@default:default,com.springsource.org.apache.commons.collections@default:default,org.eclipse.equinox.registry@default:default,com.springsource.javax.servlet@default:default,com.springsource.org.apache.activemq@default:default,org.eclipse.core.contenttype@default:default,com.springsource.javax.xml.rpc@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.restlet@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.org.apache.poi@default:default,com.springsource.javax.activation@default:default,org.eclipse.core.variables@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.org.junit@default:default,com.springsource.javax.ejb@default:default,org.apache.ant@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ant.core@default:default,com.springsource.javax.jms@default:default,com.springsource.org.apache.commons.net@default:default,com.springsource.net.sf.cglib@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.extend@default:false,org.apache.ecs@default:default,org.compiere.db.postgresql.provider@default:default,org.adempiere.install@default:true,org.compiere.db.oracle.provider@default:default,org.adempiere.base@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>

4
org.adempiere.install/install.console.app.launch
View File

@ -19,8 +19,8 @@
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
<stringAttribute key="selected_target_plugins" value="org.restlet@default:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.common@2:true,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.jms@default:default,com.springsource.org.junit@default:default,com.springsource.org.apache.commons.collections@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.ejb@default:default,com.springsource.org.apache.commons.net@default:default,org.eclipse.equinox.registry@default:default,com.springsource.javax.mail@default:default,org.apache.ant@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.javax.activation@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.core.contenttype@default:default,com.springsource.org.apache.activemq@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.org.apache.poi@default:default,com.springsource.org.apache.commons.logging@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.apache.ecs@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.adempiere.base@default:default"/>
<stringAttribute key="selected_target_plugins" value="com.springsource.org.apache.commons.logging@default:default,org.eclipse.equinox.app@default:default,com.springsource.javax.mail@default:default,com.springsource.org.apache.commons.collections@default:default,org.eclipse.equinox.registry@default:default,com.springsource.javax.servlet@default:default,com.springsource.org.apache.activemq@default:default,org.eclipse.core.contenttype@default:default,com.springsource.javax.xml.rpc@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.restlet@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.org.apache.poi@default:default,com.springsource.javax.activation@default:default,org.eclipse.core.variables@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.org.junit@default:default,com.springsource.javax.ejb@default:default,org.apache.ant@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ant.core@default:default,com.springsource.javax.jms@default:default,com.springsource.org.apache.commons.net@default:default,com.springsource.net.sf.cglib@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.extend@default:false,org.apache.ecs@default:default,org.compiere.db.postgresql.provider@default:default,org.adempiere.install@default:true,org.compiere.db.oracle.provider@default:default,org.adempiere.base@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>

4
org.adempiere.install/plugin.xml
View File

@ -6,7 +6,7 @@
id="org.adempiere.install.application"
point="org.eclipse.core.runtime.applications">
<application>
<run class="org.compiere.install.Application" />
<run class="org.compiere.install.InstallApplication" />
</application>
</extension>
<extension
@ -17,7 +17,7 @@
thread="main"
visible="true">
<run
class="org.compiere.install.console.Application">
class="org.compiere.install.console.ConsoleInstallApplication">
</run>
</application>
</extension>

6
org.adempiere.install/src/org/adempiere/install/IDatabaseConfig.java
View File

@ -51,4 +51,10 @@ public interface IDatabaseConfig {
* @return error message or null if OK
*/
public String test(IDBConfigMonitor monitor, ConfigurationData data);
/**
* Get Database Name
* @return database short name
*/
public String getName();
}

19
org.adempiere.install/src/org/compiere/install/Application.java → org.adempiere.install/src/org/adempiere/install/InstallBundleActivator.java
View File

@ -11,24 +11,27 @@
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
package org.compiere.install;
package org.adempiere.install;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
/**
*
* @author hengsin
*
*/
public class Application implements IApplication {
public class InstallBundleActivator implements BundleActivator {
public static BundleContext bundleContext = null;
public Object start(IApplicationContext arg0) throws Exception {
Setup.main(new String[]{});
return null;
@Override
public void start(BundleContext context) throws Exception {
bundleContext = context;
}
public void stop() {
@Override
public void stop(BundleContext context) throws Exception {
bundleContext = null;
}
}

12
org.adempiere.install/src/org/compiere/install/ConfigurationData.java
View File

@ -81,9 +81,11 @@ public class ConfigurationData
{
List<IDatabaseConfig> configList = Service.list(IDatabaseConfig.class);
m_databaseConfig = new IDatabaseConfig[configList.size()];
DBTYPE = new String[m_databaseConfig.length];
for(int i = 0; i < configList.size(); i++)
{
m_databaseConfig[i] = configList.get(i);
DBTYPE[i] = m_databaseConfig[i].getName();
}
}
@ -1117,17 +1119,13 @@ public class ConfigurationData
*************************************************************************/
/** Oracle directory */
private static String DBTYPE_ORACLE = "oracle";
private static String DBTYPE_ORACLE = "Oracle";
/** PostgreSQL */
private static String DBTYPE_POSTGRESQL = "postgresql";
private static String DBTYPE_POSTGRESQL = "PostgreSQL";
/** Database Types */
public static String[] DBTYPE = new String[]
{ DBTYPE_ORACLE,
//begin e-evolution vpj-cd 02/07/2005 PostgreSQL
DBTYPE_POSTGRESQL
};
public static String[] DBTYPE = null;
//end e-evolution vpj-cd 02/07/2005 PostgreSQL
/** Database Configs */

2
org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
View File

@ -612,7 +612,7 @@ public class ConfigurationPanel extends JPanel implements ActionListener, IDBCon
// To be sure
((Frame)SwingUtilities.getWindowAncestor(this)).dispose();
System.exit(0); // remains active when License Dialog called
// System.exit(0); // remains active when License Dialog called
/** **/
} // save

56
org.adempiere.install/src/org/compiere/install/InstallApplication.java Normal file
View File

@ -0,0 +1,56 @@
/******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 2010 Heng Sin Low *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
package org.compiere.install;
import java.io.File;
import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.eclipse.ant.core.AntRunner;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
/**
*
* @author hengsin
*
*/
public class InstallApplication implements IApplication {
public Object start(IApplicationContext context) throws Exception {
Setup.main(new String[]{});
Thread.sleep(10000);
while (Setup.instance.isDisplayable()) {
Thread.sleep(2000);
}
String path = System.getProperty("user.dir") + "/org.adempiere.install/build.xml";
File file = new File(path);
System.out.println("file="+path+" exists="+file.exists());
//only exists if it is running from development environment
if (file.exists()) {
AntRunner runner = new AntRunner();
runner.setBuildFileLocation(path);
runner.setMessageOutputLevel(Project.MSG_VERBOSE);
runner.addBuildLogger(DefaultLogger.class.getName());
runner.run();
runner.stop();
}
return null;
}
public void stop() {
}
}

10
org.adempiere.install/src/org/compiere/install/Setup.java
View File

@ -48,7 +48,7 @@ import org.compiere.util.CLogger;
public class Setup extends JFrame implements ActionListener
{
/**
*
*
*/
private static final long serialVersionUID = 1916571473738628986L;
@ -100,6 +100,8 @@ public class Setup extends JFrame implements ActionListener
private BorderLayout borderLayout = new BorderLayout();
private ConfigurationPanel configurationPanel = new ConfigurationPanel (statusBar);
public static Setup instance;
/**
* Static Init
* @throws Exception
@ -141,7 +143,7 @@ public class Setup extends JFrame implements ActionListener
else if (e.getSource() == menuHelpInfo)
new Setup_Help(this);
} // actionPerformed
/**
* Start
@ -160,8 +162,8 @@ public class Setup extends JFrame implements ActionListener
// File Logger at least FINE
if (fileHandler.getLevel().intValue() > Level.FINE.intValue())
fileHandler.setLevel(Level.FINE);
new Setup();
instance = new Setup();
} // main
} // Setup

21
org.adempiere.install/src/org/compiere/install/console/Application.java → org.adempiere.install/src/org/compiere/install/console/ConsoleInstallApplication.java
View File

@ -13,6 +13,11 @@
*****************************************************************************/
package org.compiere.install.console;
import java.io.File;
import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.eclipse.ant.core.AntRunner;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
@ -20,7 +25,7 @@ import org.eclipse.equinox.app.IApplicationContext;
* @author hengsin
*
*/
public class Application implements IApplication {
public class ConsoleInstallApplication implements IApplication {
/* (non-Javadoc)
* @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
@ -29,7 +34,19 @@ public class Application implements IApplication {
public Object start(IApplicationContext context) throws Exception {
ConfigurationConsole console = new ConfigurationConsole();
console.doSetup();
return Application.EXIT_OK;
String path = System.getProperty("user.dir") + "/org.adempiere.install/build.xml";
File file = new File(path);
System.out.println("file="+path+" exists="+file.exists());
//only exists if it is running from development environment
if (file.exists()) {
AntRunner runner = new AntRunner();
runner.setBuildFileLocation(path);
runner.setMessageOutputLevel(Project.MSG_VERBOSE);
runner.addBuildLogger(DefaultLogger.class.getName());
runner.run();
runner.stop();
}
return ConsoleInstallApplication.EXIT_OK;
}
/* (non-Javadoc)

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

@ -21,8 +21,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.security@default:default,org.eclipse.virgo.util.common@default:default,org.restlet@3:true,com.springsource.javax.xml.ws@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.osgi.services@4:true,com.springsource.org.apache.el.springsource@default:default,com.springsource.javax.xml.bind@default:default,org.springframework.osgi.core@default:default,org.eclipse.equinox.launcher@default:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.common@2:true,com.springsource.javax.xml.stream@default:default,com.springsource.javax.xml.rpc@default:default,org.restlet.ext.servlet@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.director@default:default,com.springsource.javax.jms@default:default,org.eclipse.ecf@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.gemini.web.extender@4:true,org.eclipse.equinox.ds@4:true,org.eclipse.equinox.p2.core@default:default,org.springframework.core@default:default,com.springsource.org.junit@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,com.springsource.org.apache.commons.collections@default:default,org.springframework.beans@default:default,com.springsource.org.apache.xml.resolver@default:default,org.eclipse.equinox.launcher.gtk.linux.x86@default:false,com.springsource.javax.management.j2ee@default:default,org.eclipse.virgo.util.math@default:default,com.springsource.javax.ejb@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.annotation@default:default,com.springsource.slf4j.api@default:default,com.springsource.org.apache.taglibs.standard@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,com.springsource.org.apache.xmlcommons@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.gemini.web.tomcat@4:true,com.springsource.javax.servlet.jsp@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.springframework.aop@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.repository@default:default,com.springsource.org.apache.catalina.tribes.springsource@default:false,com.springsource.org.apache.commons.net@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.registry@default:default,com.springsource.javax.servlet.jsp.jstl@default:default,com.springsource.javax.mail@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.ant@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,com.springsource.org.apache.xerces@default:false,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.gemini.web.core@4:true,com.springsource.net.sf.cglib@default:default,com.springsource.javax.activation@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.http.registry@default:default,com.springsource.org.apache.catalina.springsource@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.parser.manifest@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.ql@default:default,com.springsource.org.apache.juli.extras.springsource@default:default,com.springsource.org.apache.coyote.springsource@default:false,com.springsource.org.apache.activemq@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.apache.commons.logging@default:default,com.springsource.org.apache.catalina.ha.springsource@default:false,org.springframework.osgi.io@default:default,org.eclipse.equinox.app@default:default,org.springframework.context@default:default,org.eclipse.equinox.util@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.runtime@4:true,com.springsource.org.aopalliance@default:default,org.eclipse.core.jobs@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.javax.el@default:default,com.springsource.org.apache.jasper.springsource@default:false,com.springsource.org.apache.kahadb@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,com.springsource.org.apache.xml.serializer@default:default,com.springsource.slf4j.simple@default:false,com.springsource.org.eclipse.jdt.core.compiler.batch@default:default,com.springsource.org.apache.poi@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,com.springsource.org.apache.commons.logging@default:default,javax.xml@default:default,org.apache.commons.codec@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.apache.ecs@default:default,org.adempiere.report.jasper@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper.library@default:default,org.adempiere.replication@default:default,org.adempiere.extend@default:false,org.adempiere.install@3:true,org.adempiere.replication.server@4:true,org.compiere.db.oracle.provider@default:default,org.adempiere.pipo@default:default,org.adempiere.tomcat.config@default:false,org.adempiere.plugin.utils@default:default,org.adempiere.server@4:true,org.adempiere.pipo.handlers@default:default,org.compiere.db.postgresql.provider@default:default,org.adempiere.payment.processor@default:default,org.adempiere.ui.zk@4:true,org.adempiere.base.process@default:default,org.adempiere.base.callout@default:default,org.adempiere.webstore@4:true,org.adempiere.base@default:default,org.adempiere.ui@default:default"/>
<stringAttribute key="selected_target_plugins" value="com.springsource.javax.xml.bind@default:default,org.eclipse.equinox.launcher.gtk.linux.x86@default:false,com.springsource.javax.el@default:default,org.eclipse.equinox.p2.engine@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.org.apache.xml.resolver@default:default,org.eclipse.ecf.filetransfer@default:default,com.springsource.org.apache.catalina.tribes.springsource@default:false,com.springsource.javax.xml.stream@default:default,com.springsource.javax.servlet.jsp.jstl@default:default,com.springsource.org.apache.el.springsource@default:default,org.eclipse.equinox.p2.ql@default:default,org.springframework.context@default:default,org.eclipse.gemini.web.extender@4:true,org.restlet.ext.servlet@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ecf.identity@default:default,com.springsource.javax.mail@default:default,org.eclipse.gemini.web.tomcat@4:true,com.springsource.org.apache.commons.collections@default:default,org.eclipse.equinox.ds@4:true,com.springsource.javax.xml.ws@default:default,org.sat4j.pb@default:default,org.eclipse.gemini.web.core@4:true,com.springsource.slf4j.simple@default:false,org.eclipse.equinox.registry@default:default,org.springframework.core@default:default,com.springsource.javax.servlet@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.catalina.springsource@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.util@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.apache.commons.codec@default:default,org.springframework.osgi.core@default:default,com.springsource.javax.xml.rpc@default:default,org.eclipse.equinox.common@2:true,com.springsource.slf4j.api@default:default,org.eclipse.equinox.preferences@default:default,org.restlet@3:true,org.eclipse.ecf@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,com.springsource.org.apache.juli.extras.springsource@default:default,org.eclipse.virgo.util.common@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.management.j2ee@default:default,org.springframework.osgi.io@default:default,com.springsource.org.apache.jasper.springsource@default:false,org.springframework.aop@default:default,com.springsource.org.apache.poi@default:default,com.springsource.org.apache.xmlcommons@default:default,javax.xml@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.p2.core@default:default,com.springsource.javax.activation@default:default,org.apache.commons.logging@default:default,com.springsource.org.apache.xerces@default:false,com.springsource.org.apache.kahadb@default:default,org.eclipse.virgo.util.osgi@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.org.apache.xml.serializer@default:default,org.eclipse.equinox.launcher@default:default,org.springframework.beans@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.http.registry@default:default,com.springsource.org.junit@default:default,com.springsource.org.apache.coyote.springsource@default:false,org.eclipse.osgi.services@4:true,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,com.springsource.org.eclipse.jdt.core.compiler.batch@default:default,com.springsource.javax.ejb@default:default,com.springsource.javax.servlet.jsp@default:default,org.apache.ant@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,com.springsource.org.apache.taglibs.standard@default:default,org.eclipse.core.runtime@4:true,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,com.springsource.org.apache.catalina.ha.springsource@default:false,org.eclipse.virgo.util.parser.manifest@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,com.springsource.org.aopalliance@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.annotation@default:default,com.springsource.org.apache.commons.net@default:default,org.eclipse.ecf.provider.filetransfer@default:default,com.springsource.net.sf.cglib@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.extend@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.payment.processor@default:default,org.adempiere.replication@default:default,org.adempiere.server@4:true,org.adempiere.tomcat.config@default:false,org.adempiere.replication.server@4:true,org.compiere.db.postgresql.provider@default:default,org.adempiere.install@3:true,org.adempiere.ui.zk@4:true,org.adempiere.base.process@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.plugin.utils@default:default,org.adempiere.base.callout@default:default,org.adempiere.pipo@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.compiere.db.oracle.provider@default:default,org.adempiere.report.jasper@default:default,org.adempiere.base@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>

2
org.adempiere.server-feature/setup-alt.bat
View File

@ -18,7 +18,7 @@ goto START
:START
@REM Setup Adempiere.properties and AdempiereEnv.properties
@"%JAVA%" -Dosgi.noShutdown=true -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.adempiere.install.application -consoleLog
@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.adempiere.install.application -consoleLog
@Echo ErrorLevel = %ERRORLEVEL%
@IF NOT ERRORLEVEL = 1 GOTO NEXT

2
org.adempiere.server-feature/setup-alt.sh
View File

@ -15,7 +15,7 @@ else
fi
#setup Adempiere.properties and AdempiereEnv.propertiess
$JAVA -Dosgi.noShutdown=true -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.adempiere.install.application -consoleLog
$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.adempiere.install.application -consoleLog
#setup tomcat
$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml

5
org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java
View File

@ -491,4 +491,9 @@ public class ConfigOracle implements IDatabaseConfig
return result == 0;
} // testSQL
@Override
public String getName() {
return Database.DB_ORACLE;
}
} // ConfigOracle

5
org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java
View File

@ -196,4 +196,9 @@ public class ConfigPostgreSQL implements IDatabaseConfig
return nativeConnectioName;
}
@Override
public String getName() {
return Database.DB_POSTGRESQL;
}
} // ConfigPostgreSQL