Fixes and version changes.

ECF · Jun 8, 2018 · 8e17c10 · 8e17c10
1 parent 8a6d260
commit 8e17c10
Show file tree

Hide file tree

Showing 7 changed files with 154 additions and 5 deletions.
diff --git a/bundles/org.eclipse.ecf.provider.xmlrpc/META-INF/MANIFEST.MF b/bundles/org.eclipse.ecf.provider.xmlrpc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Xmlrpc Remote Services Provider
 Bundle-SymbolicName: org.eclipse.ecf.provider.xmlrpc
 Automatic-Module-Name: org.eclipse.ecf.provider.xmlrpc
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
 Bundle-Vendor: Eclipse.org - ECF
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: lib/xmlrpc-client-3.1.3.jar,

diff --git a/bundles/org.eclipse.ecf.provider.xmlrpc/pom.xml b/bundles/org.eclipse.ecf.provider.xmlrpc/pom.xml
@@ -10,5 +10,5 @@
   </parent>
   <artifactId>org.eclipse.ecf.provider.xmlrpc</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
 </project>
diff --git a/...rg.eclipse.ecf.provider.xmlrpc/src/org/eclipse/ecf/provider/xmlrpc/XmlRpcTypeFactory.java b/...rg.eclipse.ecf.provider.xmlrpc/src/org/eclipse/ecf/provider/xmlrpc/XmlRpcTypeFactory.java
@@ -66,6 +66,9 @@ public XmlRpcTypeFactory(XmlRpcController pController) {
 	}
 	@Override
 	public TypeSerializer getSerializer(XmlRpcStreamConfig pConfig, Object pObject) throws SAXException {
+		TypeSerializer superSerializer = super.getSerializer(pConfig, pObject);
+		if (superSerializer != null)
+			return superSerializer;
 		if (pObject instanceof Serializable) {
 			if (pConfig.isEnabledForExtensions()) {
 				return new XmlRpcSerializableSerializer();
@@ -85,7 +88,7 @@ public TypeSerializer getSerializer(XmlRpcStreamConfig pConfig, Object pObject)
 				throw new SAXException(new XmlRpcExtensionException("Version objects aren't supported, if isEnabledForExtensions() == false"));
 			}			
 		}
-		return super.getSerializer(pConfig, pObject);
+		throw new SAXException(new XmlRpcExtensionException("Objects of class="+pObject.getClass().getName()+" are not serializable with XmlRpcTypeFactory"));
 	}
 
 	public TypeParser getParser(XmlRpcStreamConfig pConfig, NamespaceContextImpl pContext, String pURI, String pLocalName) {

diff --git a/features/org.eclipse.ecf.provider.xmlrpc.feature/feature.xml b/features/org.eclipse.ecf.provider.xmlrpc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.provider.xmlrpc.feature"
       label="XmlRpc Distribution Provider Feature"
-      version="1.2.0.qualifier"
+      version="1.2.1.qualifier"
       provider-name="Eclipse.org - ECF">
 
    <description url="http://www.example.com/description">

diff --git a/features/org.eclipse.ecf.provider.xmlrpc.feature/pom.xml b/features/org.eclipse.ecf.provider.xmlrpc.feature/pom.xml
@@ -10,5 +10,5 @@
   </parent>
   <artifactId>org.eclipse.ecf.provider.xmlrpc.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
 </project>
diff --git a/features/org.eclipse.ecf.provider.xmlrpc.feature/products/HelloConsumer.etcd.product b/features/org.eclipse.ecf.provider.xmlrpc.feature/products/HelloConsumer.etcd.product
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product uid="HelloConsumer" useFeatures="false" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-consoleLog -console
+      </programArgs>
+      <vmArgs>-Declipse.ignoreApp=true 
+-Dosgi.noShutdown=true
+-Decf.discovery.etcd.hostname=disco.ecf-project.org
+      </vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
+   </launcherArgs>
+
+   <vm>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
+   </vm>
+
+   <plugins>
+      <plugin id="javax.servlet"/>
+      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.felix.gogo.command"/>
+      <plugin id="org.apache.felix.gogo.runtime"/>
+      <plugin id="org.apache.felix.gogo.shell"/>
+      <plugin id="org.apache.felix.scr"/>
+      <plugin id="org.apache.log4j"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.ecf"/>
+      <plugin id="org.eclipse.ecf.console"/>
+      <plugin id="org.eclipse.ecf.discovery"/>
+      <plugin id="org.eclipse.ecf.examples.hello"/>
+      <plugin id="org.eclipse.ecf.examples.hello.javahost"/>
+      <plugin id="org.eclipse.ecf.identity"/>
+      <plugin id="org.eclipse.ecf.osgi.services.distribution"/>
+      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
+      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
+      <plugin id="org.eclipse.ecf.provider.etcd"/>
+      <plugin id="org.eclipse.ecf.provider.xmlrpc"/>
+      <plugin id="org.eclipse.ecf.remoteservice"/>
+      <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.concurrent"/>
+      <plugin id="org.eclipse.equinox.console"/>
+      <plugin id="org.eclipse.equinox.event"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
+      <plugin id="org.eclipse.osgi.util"/>
+      <plugin id="org.json"/>
+   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
+   </configurations>
+
+</product>
diff --git a/features/org.eclipse.ecf.provider.xmlrpc.feature/products/HelloImpl.etcd.product b/features/org.eclipse.ecf.provider.xmlrpc.feature/products/HelloImpl.etcd.product
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product uid="HelloConsumer" useFeatures="false" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-consoleLog -console
+      </programArgs>
+      <vmArgs>-Declipse.ignoreApp=true 
+-Dosgi.noShutdown=true
+-Decf.discovery.etcd.hostname=disco.ecf-project.org
+-Dorg.eclipse.equinox.http.jetty.http.port=8282
+      </vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
+   </launcherArgs>
+
+   <launcher>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
+   </vm>
+
+   <plugins>
+      <plugin id="javax.servlet"/>
+      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.felix.gogo.command"/>
+      <plugin id="org.apache.felix.gogo.runtime"/>
+      <plugin id="org.apache.felix.gogo.shell"/>
+      <plugin id="org.apache.felix.scr"/>
+      <plugin id="org.apache.log4j"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.ecf"/>
+      <plugin id="org.eclipse.ecf.console"/>
+      <plugin id="org.eclipse.ecf.discovery"/>
+      <plugin id="org.eclipse.ecf.examples.hello"/>
+      <plugin id="org.eclipse.ecf.examples.hello.javahost"/>
+      <plugin id="org.eclipse.ecf.identity"/>
+      <plugin id="org.eclipse.ecf.osgi.services.distribution"/>
+      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
+      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
+      <plugin id="org.eclipse.ecf.provider.etcd"/>
+      <plugin id="org.eclipse.ecf.provider.xmlrpc"/>
+      <plugin id="org.eclipse.ecf.remoteservice"/>
+      <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.concurrent"/>
+      <plugin id="org.eclipse.equinox.console"/>
+      <plugin id="org.eclipse.equinox.event"/>
+      <plugin id="org.eclipse.equinox.http.jetty"/>
+      <plugin id="org.eclipse.equinox.http.servlet"/>
+      <plugin id="org.eclipse.jetty.http"/>
+      <plugin id="org.eclipse.jetty.io"/>
+      <plugin id="org.eclipse.jetty.security"/>
+      <plugin id="org.eclipse.jetty.server"/>
+      <plugin id="org.eclipse.jetty.servlet"/>
+      <plugin id="org.eclipse.jetty.util"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
+      <plugin id="org.eclipse.osgi.util"/>
+      <plugin id="org.json"/>
+   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.http.jetty" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.jetty.server" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.jetty.servlet" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
+   </configurations>
+
+</product>