Bundle-ManifestVersion: 2
Bundle-Name: Application
Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
Bundle-Vendor: EDIT
Bundle-Localization: OSGI-INF/l10n/plugin
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Bulkeditor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: CDM Library Dependencies Plugin
Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Eclipse-BundleShape: dir
Export-Package: com.google.api,
com.google.api.detect,
<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>taxeditor-parent</artifactId>\r
- <version>3.12.2</version>\r
+ <version>3.12.3</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
configStringBuilder.append(" </bean>" + System.lineSeparator());
for(CdmPersistentDataSource dataSource : CdmPersistentDataSource.getAllDataSources()) {
- String beanId = dataSource.getName();
+ String beanId = xmlNCNamefrom(dataSource.getName());
String user = dataSource.getUsername();
String password = dataSource.getPassword();
String driverClass = dataSource.getCdmSourceProperty(CdmSourceProperties.DRIVER_CLASS);
return configStringBuilder.toString();
}
+ /**
+ * Assures that the datasource name is converted into a valid XML type NCName.
+ *
+ * Prefixes the string and replaces all forbidden characters by '_'.
+ *
+ * @param dataSource
+ * @return
+ */
+ public static String xmlNCNamefrom(String beanName) {
+ return "MGD_" + beanName.replaceAll("[^a-zA-Z0-9]", "_");
+ }
+
public static File writeManagedServerConfig(String config, String fileName) throws IOException {
File managedConfigFile = new File(CdmApplicationUtils.getWritableResourceDir(), fileName);
if(managedConfigFile.exists()) {
import eu.etaxonomy.cdm.database.ICdmDataSource;
import eu.etaxonomy.cdm.model.metadata.CdmMetaData;
import eu.etaxonomy.taxeditor.remoting.server.CDMServerException;
+import eu.etaxonomy.taxeditor.remoting.server.CDMServerUtils;
/**
* @author cmathew
public class CdmServerInfo {
public static final Logger logger = Logger.getLogger(CdmServerInfo.class);
- private final static String CDMSERVER_PREFIX = "";
+ private final static String CDMSERVER_PREFIX = "cdmserver/";
private final static String NAME_PRODUCTION = "cybertaxonomy.org";
private final static String SERVER_PRODUCTION = "api.cybertaxonomy.org";
private String cdmlibServicesVersion = "";
private String cdmlibServicesLastModified = "";
+ private String prefix = "";
- public CdmServerInfo(String name, String server, int port) {
+ private boolean ignoreCdmLibVersion = false;
+
+
+ public CdmServerInfo(String name, String server, int port, String prefix, boolean ignoreCdmLibVersion) {
this.name = name;
this.server = server;
this.port = port;
+ this.prefix = prefix;
+ this.ignoreCdmLibVersion = ignoreCdmLibVersion;
instances = new ArrayList<CdmInstanceInfo>();
}
}
public void updateInfo() throws CDMServerException {
- String url = "http://" + server + ":" + String.valueOf(port) + "/" + CDMSERVER_PREFIX + "/info.jsp";
+ String url = "http://" + server + ":" + String.valueOf(port) + "/" + prefix + "info.jsp";
String responseBody = getResponse(url);
if(responseBody != null) {
try {
public void addInstancesViaHttp() throws CDMServerException {
updateInfo();
- String url = "http://" + server + ":" + String.valueOf(port) + "/" + CDMSERVER_PREFIX + "/instances.jsp";
+ String url = "http://" + server + ":" + String.valueOf(port) + "/" + prefix + "instances.jsp";
String responseBody = getResponse(url);
if(responseBody != null) {
try {
public void addInstancesFromDataSourcesConfig() {
for(ICdmDataSource dataSource : CdmPersistentDataSource.getAllDataSources()){
- logger.info("Adding local instance " + dataSource.getName());
- addInstance(dataSource.getName(), dataSource.getName());
+ String datasourceNCName = CDMServerUtils.xmlNCNamefrom(dataSource.getName());
+ logger.info("Adding local instance " + dataSource.getName() + " as " + datasourceNCName);
+ addInstance(datasourceNCName, datasourceNCName);
}
}
String serverVersion = cdmlibServicesVersion;
String serverCdmlibLastModified = cdmlibServicesLastModified;
-
- return compareCdmlibServicesVersion(serverVersion, serverCdmlibLastModified);
+ if(ignoreCdmLibVersion) {
+ return 0;
+ } else {
+ return compareCdmlibServicesVersion(serverVersion, serverCdmlibLastModified);
+ }
}
public static List<CdmServerInfo> getCdmServers() {
if(cdmServerInfoList == null) {
- cdmServerInfoList = new ArrayList<CdmServerInfo>();
- cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80));
- //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80));
- cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80));
- // cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80));
- //cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80));
- // cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080));
- cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST,NULL_PORT));
+ cdmServerInfoList = new ArrayList<CdmServerInfo>();
+ cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80, "", false));
+ //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80, CDMSERVER_PREFIX));
+ cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80, CDMSERVER_PREFIX, false));
+ // cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80, CDMSERVER_PREFIX));
+ //cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
+ cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, false));
+ cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST, NULL_PORT, CDMSERVER_PREFIX, false));
}
return cdmServerInfoList;
}
CdmInstanceInfo devInstance = null;
if(value != null && !value.isEmpty()) {
int devPort = Integer.valueOf(value);
- CdmServerInfo devCii = new CdmServerInfo(NAME_LOCALHOST_DEV, SERVER_LOCALHOST_DEV, devPort);
+ CdmServerInfo devCii = new CdmServerInfo(NAME_LOCALHOST_DEV, SERVER_LOCALHOST_DEV, devPort, "", false);
try {
devInstance = devCii.addInstance(NAME_INSTANCE_LOCALHOST_DEV, BASEPATH_LOCALHOST_DEV);
available = devCii.pingInstance(devInstance, devPort);
Bundle-ManifestVersion: 2
Bundle-Name: Editor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: OSGI-INF/l10n/plugin
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<feature
id="eu.etaxonomy.taxeditor.feature.jre.linux64"
label="Taxonomic Editor JRE Linux64"
- version="3.12.2"
+ version="3.12.3"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>
<feature
id="eu.etaxonomy.taxeditor.feature.platform"
label="Taxeditor Dependencies"
- version="3.12.2"
+ version="3.12.3"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
arch="x86,x86_64">
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
<feature
id="eu.etaxonomy.taxeditor.feature"
label="Taxonomic Editor"
- version="3.12.2"
+ version="3.12.3"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux,macosx,win32"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
Bundle-ManifestVersion: 2
Bundle-Name: Help
Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
Bundle-Vendor: EDIT
Require-Bundle: org.eclipse.ui,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Bundle-ClassPath: .,
lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,
lib/bioinfweb-commons-core-2-SNAPSHOT.jar,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<build>
Bundle-ManifestVersion: 2
Bundle-Name: Molecular Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Navigation Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.cdm,
eu.etaxonomy.taxeditor.navigation,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Printpublisher Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Require-Bundle: org.eclipse.osgi,
org.eclipse.ui,
eu.etaxonomy.taxeditor.cdmlib,
<parent>
<artifactId>taxeditor-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: DataStore Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.cdm,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@Ignore // this should be targetting integration or production
@Test
public void pingInstancesTest() {
- CdmServerInfo csii = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080);
+ CdmServerInfo csii = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080, "cdmserver/", false);
try {
csii.refreshInstances();
List<CdmInstanceInfo> instances = csii.getInstances();
@Test
public void refreshWrongInstancesTest() {
- CdmServerInfo wrongCsii = new CdmServerInfo("local", "local", 8080);
+ CdmServerInfo wrongCsii = new CdmServerInfo("local", "local", 8080, "noserver", false);
try {
wrongCsii.refreshInstances();
List<CdmInstanceInfo> instances = wrongCsii.getInstances();
@Ignore // this should be targetting integration or production
@Test
public void refreshInstancesTest() throws CDMServerException {
- CdmServerInfo cdmServerInfo = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080);
+ CdmServerInfo cdmServerInfo = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080, "cdmserver/", false);
cdmServerInfo.refreshInstances();
List<CdmInstanceInfo> instances = cdmServerInfo.getInstances();
Assert.assertTrue(instances != null && !instances.isEmpty());
Bundle-ManifestVersion: 2
Bundle-Name: Webapp
Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
Require-Bundle: org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.12.2">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.12.3">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<text>
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.12.2" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.12.3" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</prerequisites>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.2</version>
+ <version>3.12.3</version>
<name>EDIT Taxonomic Editor</name>
<description>The Taxonomic Editor for EDIT's platform for
cybertaxonomy