You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2010/06/29 21:19:56 UTC
svn commit: r959076 - in /ofbiz/trunk: ./ framework/base/lib/
framework/service/config/ framework/service/dtd/
framework/service/servicedef/ framework/service/src/org/ofbiz/service/config/
framework/service/src/org/ofbiz/service/engine/ framework/servi...
Author: erwan
Date: Tue Jun 29 19:19:55 2010
New Revision: 959076
URL: http://svn.apache.org/viewvc?rev=959076&view=rev
Log:
Reverting previous commit as it wasn't fully reviewed and was producing errors. Sorry guys...
Added:
ofbiz/trunk/framework/webapp/lib/xmlrpc-client-3.0.jar
- copied unchanged from r958953, ofbiz/trunk/framework/webapp/lib/xmlrpc-client-3.0.jar
ofbiz/trunk/framework/webapp/lib/xmlrpc-common-3.0.jar
- copied unchanged from r958953, ofbiz/trunk/framework/webapp/lib/xmlrpc-common-3.0.jar
ofbiz/trunk/framework/webapp/lib/xmlrpc-server-3.0.jar
- copied unchanged from r958953, ofbiz/trunk/framework/webapp/lib/xmlrpc-server-3.0.jar
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/AbstractXmlRpcTestCase.java
- copied unchanged from r958953, ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/AbstractXmlRpcTestCase.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/XmlRpcTests.java
- copied unchanged from r958953, ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/XmlRpcTests.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/AliasSupportedTransportFactory.java
- copied unchanged from r958953, ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/AliasSupportedTransportFactory.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/XmlRpcClient.java
- copied unchanged from r958953, ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/XmlRpcClient.java
Removed:
ofbiz/trunk/framework/base/lib/xmlrpc-client-3.0.jar
ofbiz/trunk/framework/base/lib/xmlrpc-common-3.0.jar
ofbiz/trunk/framework/base/lib/xmlrpc-server-3.0.jar
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/AbstractXmlRpcTestCase.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/xmlrpc/
Modified:
ofbiz/trunk/.classpath
ofbiz/trunk/LICENSE
ofbiz/trunk/framework/service/config/serviceengine.xml
ofbiz/trunk/framework/service/dtd/service-config.xsd
ofbiz/trunk/framework/service/servicedef/services_test_se.xml
ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java
ofbiz/trunk/framework/service/testdef/servicetests.xml
Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=959076&r1=959075&r2=959076&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Tue Jun 29 19:19:55 2010
@@ -46,9 +46,6 @@
<classpathentry kind="lib" path="framework/base/lib/xml-apis-2.9.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xml-apis-ext-1.3.04.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xmlgraphics-commons-1.3.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xmlrpc-client-3.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xmlrpc-common-3.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xmlrpc-server-3.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xstream-1.3.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/>
@@ -149,6 +146,9 @@
<classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/>
<classpathentry kind="lib" path="framework/webapp/lib/ws-commons-java5-1.0.1.jar"/>
<classpathentry kind="lib" path="framework/webapp/lib/ws-commons-util-1.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-client-3.0.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-common-3.0.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-server-3.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar"/>
<classpathentry kind="lib" path="framework/webslinger/lib/webslinger-20091211-3897-7ab22baea4b6.jar"/>
<classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-cache-20091211-3897-7ab22baea4b6.jar"/>
Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=959076&r1=959075&r2=959076&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Tue Jun 29 19:19:55 2010
@@ -65,9 +65,6 @@ ofbiz/trunk/framework/base/lib/j2eespecs
ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar
ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar
ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.3.jar
-ofbiz/trunk/framework/base/lib/xmlrpc-client-3.0.jar
-ofbiz/trunk/framework/base/lib/xmlrpc-common-3.0.jar
-ofbiz/trunk/framework/base/lib/xmlrpc-server-3.0.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina.jar
@@ -107,6 +104,9 @@ ofbiz/trunk/framework/webapp/lib/ezmorph
ofbiz/trunk/framework/webapp/lib/rome-0.9.jar
ofbiz/trunk/framework/webapp/lib/serializer-2.7.0.jar
ofbiz/trunk/framework/webapp/lib/xalan-2.7.1.jar
+ofbiz/trunk/framework/webapp/lib/xmlrpc-client-3.0.jar
+ofbiz/trunk/framework/webapp/lib/xmlrpc-common-3.0.jar
+ofbiz/trunk/framework/webapp/lib/xmlrpc-server-3.0.jar
ofbiz/trunk/framework/webapp/lib/ws-commons-java5-1.0.1.jar
ofbiz/trunk/framework/webapp/lib/ws-commons-util-1.0.1.jar
ofbiz/trunk/framework/geronimo/lib/geronimo-connector-2.1.1.jar
Modified: ofbiz/trunk/framework/service/config/serviceengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/serviceengine.xml?rev=959076&r1=959075&r2=959076&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/config/serviceengine.xml (original)
+++ ofbiz/trunk/framework/service/config/serviceengine.xml Tue Jun 29 19:19:55 2010
@@ -58,11 +58,7 @@ under the License.
<engine name="ofbiz-workflow" class="org.ofbiz.workflow.WorkflowEngine"/>
<engine name="workflow" class="org.ofbiz.shark.service.SharkServiceEngine"/>
<engine name="webslinger-server" class="org.ofbiz.webslinger.WebslingerServerEngine"/>
- <engine name="xml-rpc-local" class="org.ofbiz.service.engine.XMLRPCClientEngine">
- <parameter name="url" value="http://localhost:8080/webtools/control/xmlrpc"/>
- <parameter name="login" value="admin"/>
- <parameter name="password" value="ofbiz"/>
- </engine>
+
<service-location name="main-rmi" location="rmi://localhost:1099/RMIDispatcher"/>
<service-location name="main-http" location="http://localhost:8080/webtools/control/httpService"/>
Modified: ofbiz/trunk/framework/service/dtd/service-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/dtd/service-config.xsd?rev=959076&r1=959075&r2=959076&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/dtd/service-config.xsd (original)
+++ ofbiz/trunk/framework/service/dtd/service-config.xsd Tue Jun 29 19:19:55 2010
@@ -92,26 +92,9 @@ under the License.
</xs:attributeGroup>
<xs:element name="engine">
<xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
- </xs:sequence>
<xs:attributeGroup ref="attlist.engine"/>
</xs:complexType>
</xs:element>
- <xs:element name="parameter">
- <xs:annotation>
- <xs:documentation>
- Technical parameters use by engine
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attributeGroup ref="attlist.parameter"/>
- </xs:complexType>
- </xs:element>
- <xs:attributeGroup name="attlist.parameter">
- <xs:attribute type="xs:string" name="name" use="required"/>
- <xs:attribute type="xs:string" name="value" use="required"/>
- </xs:attributeGroup>
<xs:attributeGroup name="attlist.engine">
<xs:attribute type="xs:string" name="name" use="required"/>
<xs:attribute type="xs:string" name="class" use="required"/>
Modified: ofbiz/trunk/framework/service/servicedef/services_test_se.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/servicedef/services_test_se.xml?rev=959076&r1=959075&r2=959076&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/servicedef/services_test_se.xml (original)
+++ ofbiz/trunk/framework/service/servicedef/services_test_se.xml Tue Jun 29 19:19:55 2010
@@ -83,19 +83,4 @@ under the License.
<service name="testServiceEcaGlobalEventExecOnRollback" engine="java" auth="false"
location="org.ofbiz.service.test.ServiceEngineTestServices" invoke="testServiceEcaGlobalEventExecOnRollback">
</service>
-
- <!-- Call xml rpc from engine -->
- <service name="testXmlRpcAdd" engine="java" auth="false" location="org.ofbiz.service.test.XmlRpcTests" invoke="testXmlRpcAdd" export="true">
- <attribute name="num1" mode="IN" type="Integer"/>
- <attribute name="num2" mode="IN" type="Integer"/>
- <attribute name="resulting" mode="OUT" type="Integer"/>
- </service>
- <service name="testXmlRpcLocalEngine" engine="xml-rpc-local" auth="false" invoke="testXmlRpcAdd">
- <attribute name="num1" mode="IN" type="Integer"/>
- <attribute name="num2" mode="IN" type="Integer"/>
- <attribute name="resulting" mode="OUT" type="Integer"/>
- </service>
- <service name="testXmlRpcClientAdd" engine="java" auth="false" location="org.ofbiz.service.test.XmlRpcTests" invoke="testXmlRpcClientAdd">
- <implements service="testServiceInterface"/>
- </service>
</services>
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java?rev=959076&r1=959075&r2=959076&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java Tue Jun 29 19:19:55 2010
@@ -31,8 +31,6 @@ import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.cache.UtilCache;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* Misc. utility method for dealing with the serviceengine.xml file
@@ -146,32 +144,6 @@ public class ServiceConfigUtil implement
return null;
}
-
- public static String getEngineParameter(String engineName, String name) throws GenericConfigException {
- Element root = ServiceConfigUtil.getXmlRootElement();
- Node node = root.getFirstChild();
-
- if (node != null) {
- do {
- if (node.getNodeType() == Node.ELEMENT_NODE && "engine".equals(node.getLocalName())) {
- Element engine = (Element) node;
- if (engineName.equals(engine.getAttribute("name"))) {
- NodeList params = engine.getElementsByTagName("parameter");
- if (params.getLength() > 0) {
- for (int index = 0; index < params.getLength(); index++) {
- Element param = (Element) params.item(index);
- if (param != null && name.equals(param.getAttribute("name"))) {
- return (String) param.getAttribute("value");
- }
- }
- }
- }
- }
- } while ((node = node.getNextSibling()) != null);
- }
- return null;
- }
-
public static class NotificationGroup implements Serializable {
protected Notification notification;
protected List<Notify> notify;
Modified: ofbiz/trunk/framework/service/testdef/servicetests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/testdef/servicetests.xml?rev=959076&r1=959075&r2=959076&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/testdef/servicetests.xml (original)
+++ ofbiz/trunk/framework/service/testdef/servicetests.xml Tue Jun 29 19:19:55 2010
@@ -65,11 +65,4 @@ under the License.
<test-case case-name="service-eca-global-event-exec-assert-data">
<entity-xml action="assert" entity-xml-url="component://service/testdef/data/ServiceEcaGlobalEventAssertData.xml"/>
</test-case>
-
- <test-case case-name="service-xml-rpc">
- <junit-test-suite class-name="org.ofbiz.service.test.XmlRpcTests"/>
- </test-case>
- <test-case case-name="service-xml-rpc-local-engine">
- <service-test service-name="testXmlRpcClientAdd"/>
- </test-case>
</test-suite>