Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-03-24 16:16:45 +0000
committerEike Stepper2020-03-24 16:16:45 +0000
commit2b493f78abedf6edcb6710e74708272deadf163c (patch)
tree117c119ec7fff43e7835ef57c49a9ee441950aae /plugins/org.eclipse.emf.cdo.examples.installer
parent850a75fe1a44b4245f4bcffcfd9d7e8b49746e8d (diff)
downloadcdo-2b493f78abedf6edcb6710e74708272deadf163c.tar.gz
cdo-2b493f78abedf6edcb6710e74708272deadf163c.tar.xz
cdo-2b493f78abedf6edcb6710e74708272deadf163c.zip
[561421] Provide configurable AcceptorDescriptionParsers for the TransportConfigurator
https://bugs.eclipse.org/bugs/show_bug.cgi?id=561421
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples.installer')
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml2
3 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
index 0e74c60639..624fc7e2e6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.master;singleton:=true
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.2.1.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
index 27526095a7..65b63a4128 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
@@ -8,6 +8,8 @@
<acceptor type="tcp" listenAddr="0.0.0.0" port="2036"/>
<!-- Examples:
+ <acceptor type="ws" name="cdo_acceptor"/>
+ <acceptor type="jvm" name="cdo_acceptor"/>
<acceptor type="ssl" listenAddr="0.0.0.0" port="2036"/>
<acceptor type="http"/>
-->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml
index a11b9827cb..c03534406b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.examples.master</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

Back to the top