Merge pull request DeBortoliWines#42 from DeBortoliWines/ref-domain-maven

flotho · web-flow · commit 563152de51d2 · 2018-02-22T22:38:19.000+01:00
[REF]packages rename for maven deployment
diff --git a/README.md b/README.md
@@ -3,9 +3,19 @@ Odoo Java Api
 
 A Java API to connect to Odoo and manage data using the XMLRPC interface.
 
-The API reduces the amount of boiler plate code needed to communicate with Odoo by doing error checking and type conversions.
+The API reduces the amount of boiler plate code needed to communicate with Odoo 
+by doing error checking and type conversions.
 
-For more information, including a Wiki please see the project on SourceForge: [https://sourceforge.net/projects/openerpjavaapi/](https://sourceforge.net/projects/openerpjavaapi)
+The Api IS known to work perfectly :
+* openerp-java-api-1.3.0 works perfectly up to OpenERP v7
+* openerp-java-api-2.0.x si supposed to work with the new API introduced in odoo v8
+** Take care, the package name have replace openerp by odoo so that compatibility is broken
+* openerp-java-api-3.0.x , package renamed, tested on Odoo v10
+** purposed is to be pushed on maven for pentaho integration
 
-The project is realeased under the Apache V2 license starting from version 1.5.  Earlier versions are dual licenced and developers can choose between LGPL3 (original license) and Apache V2.
+For more information, including a Wiki please see the project on SourceForge: 
+[https://sourceforge.net/projects/openerpjavaapi/](https://sourceforge.net/projects/openerpjavaapi)
+
+The project is realeased under the Apache V2 license starting from version 1.5.  
+Earlier versions are dual licenced and developers can choose between LGPL3 (original license) and Apache V2.
 
diff --git a/pom.xml b/pom.xml
@@ -2,9 +2,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.debortoliwines</groupId>
+  <groupId>com.odoojava</groupId>
   <artifactId>odoo-java-api</artifactId>
-  <version>2.0.2</version>
+  <version>3.0.1</version>
   <packaging>jar</packaging>
 
   <name>odoo-java-api</name>
diff --git a/src/main/java/com/odoojava/api/Context.java b/src/main/java/com/odoojava/api/Context.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/odoojava/api/Field.java b/src/main/java/com/odoojava/api/Field.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/odoojava/api/FieldCollection.java b/src/main/java/com/odoojava/api/FieldCollection.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/odoojava/api/FilterCollection.java b/src/main/java/com/odoojava/api/FilterCollection.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/odoojava/api/ObjectAdapter.java b/src/main/java/com/odoojava/api/ObjectAdapter.java
@@ -16,7 +16,7 @@
  *   limitations under the License. 
  *
  */
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -33,8 +33,8 @@
 
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.debortoliwines.odoo.api.Field.FieldType;
-import com.debortoliwines.odoo.api.helpers.FilterHelper;
+import com.odoojava.api.Field.FieldType;
+import com.odoojava.api.helpers.FilterHelper;
 
 /**
  * Main class for communicating with the server. It provides extra validation
diff --git a/src/main/java/com/odoojava/api/OdooApiException.java b/src/main/java/com/odoojava/api/OdooApiException.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 /**
  * Exception class for Odoo API errors
diff --git a/src/main/java/com/odoojava/api/OdooCommand.java b/src/main/java/com/odoojava/api/OdooCommand.java
@@ -16,7 +16,7 @@
  *   limitations under the License. 
  *
  */
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/odoojava/api/OdooXmlRpcProxy.java b/src/main/java/com/odoojava/api/OdooXmlRpcProxy.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
diff --git a/src/main/java/com/odoojava/api/Response.java b/src/main/java/com/odoojava/api/Response.java
@@ -1,4 +1,4 @@
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 public class Response {
 
diff --git a/src/main/java/com/odoojava/api/Row.java b/src/main/java/com/odoojava/api/Row.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -26,7 +26,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 
-import com.debortoliwines.odoo.api.Field.FieldType;
+import com.odoojava.api.Field.FieldType;
 
 /***
  * Holds data returned from the OpenERP server.
diff --git a/src/main/java/com/odoojava/api/RowCollection.java b/src/main/java/com/odoojava/api/RowCollection.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/odoojava/api/SelectionOption.java b/src/main/java/com/odoojava/api/SelectionOption.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 /**
  * Holds selection options for Field(s) in a FieldCollection if the field is a selection field.
diff --git a/src/main/java/com/odoojava/api/Session.java b/src/main/java/com/odoojava/api/Session.java
@@ -16,15 +16,15 @@
  *   limitations under the License. 
  *
  */
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.debortoliwines.odoo.api.OdooXmlRpcProxy.RPCProtocol;
-import com.debortoliwines.odoo.api.OdooXmlRpcProxy.RPCServices;
+import com.odoojava.api.OdooXmlRpcProxy.RPCProtocol;
+import com.odoojava.api.OdooXmlRpcProxy.RPCServices;
 import java.util.Arrays;
 
 /**
@@ -311,6 +311,7 @@ public int getUserID() {
         return userID;
     }
 
+    
     /**
      * Retrieves the context object for the session to set properties on
      *
diff --git a/src/main/java/com/odoojava/api/Version.java b/src/main/java/com/odoojava/api/Version.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 /**
  * Breaks up the OpenERP server version into a major, minor and build number
diff --git a/src/main/java/com/odoojava/api/helpers/FilterHelper.java b/src/main/java/com/odoojava/api/helpers/FilterHelper.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api.helpers;
+package com.odoojava.api.helpers;
 
 /**
  * Filter helper to assist is common tasks and store some hardcoded values
diff --git a/src/main/java/com/odoojava/api/helpers/FlatViewHelper.java b/src/main/java/com/odoojava/api/helpers/FlatViewHelper.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.debortoliwines.odoo.api.helpers;
+package com.odoojava.api.helpers;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,9 +27,9 @@
 
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.debortoliwines.odoo.api.Field;
-import com.debortoliwines.odoo.api.FieldCollection;
-import com.debortoliwines.odoo.api.Row;
+import com.odoojava.api.Field;
+import com.odoojava.api.FieldCollection;
+import com.odoojava.api.Row;
 
 /**
  * Helper class to take a row object and flatten it out.
diff --git a/src/test/java/com/odoojava/api/DemoDbGetter.java b/src/test/java/com/odoojava/api/DemoDbGetter.java
@@ -1,4 +1,4 @@
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
 import java.io.BufferedWriter;
 import java.io.FileReader;
@@ -17,7 +17,7 @@
 import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
 import org.junit.Ignore;
 
-import com.debortoliwines.odoo.api.OdooXmlRpcProxy.RPCProtocol;
+import com.odoojava.api.OdooXmlRpcProxy.RPCProtocol;
 
 @Ignore
 public class DemoDbGetter {
diff --git a/src/test/java/com/odoojava/api/ObjectAdapterTest.java b/src/test/java/com/odoojava/api/ObjectAdapterTest.java
@@ -1,5 +1,11 @@
-package com.debortoliwines.odoo.api;
-
+package com.odoojava.api;
+
+import com.odoojava.api.Response;
+import com.odoojava.api.OdooApiException;
+import com.odoojava.api.Row;
+import com.odoojava.api.OdooCommand;
+import com.odoojava.api.ObjectAdapter;
+import com.odoojava.api.FieldCollection;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
diff --git a/src/test/java/com/odoojava/api/OdooCommandTest.java b/src/test/java/com/odoojava/api/OdooCommandTest.java
@@ -1,5 +1,8 @@
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
+import com.odoojava.api.Response;
+import com.odoojava.api.Session;
+import com.odoojava.api.OdooCommand;
 import java.util.Map;
 import org.apache.xmlrpc.XmlRpcException;
 import static org.assertj.core.api.Assertions.fail;
diff --git a/src/test/java/com/odoojava/api/OdooXmlRpcProxyTest.java b/src/test/java/com/odoojava/api/OdooXmlRpcProxyTest.java
@@ -1,5 +1,7 @@
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
+import com.odoojava.api.Version;
+import com.odoojava.api.OdooXmlRpcProxy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
@@ -21,8 +23,8 @@
 import org.mockserver.socket.PortFactory;
 import org.mockserver.socket.SSLFactory;
 
-import com.debortoliwines.odoo.api.OdooXmlRpcProxy.RPCProtocol;
-import com.debortoliwines.odoo.api.OdooXmlRpcProxy.RPCServices;
+import com.odoojava.api.OdooXmlRpcProxy.RPCProtocol;
+import com.odoojava.api.OdooXmlRpcProxy.RPCServices;
 
 public class OdooXmlRpcProxyTest {
 
diff --git a/src/test/java/com/odoojava/api/ResponseTest.java b/src/test/java/com/odoojava/api/ResponseTest.java
@@ -1,5 +1,6 @@
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
+import com.odoojava.api.Response;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.assertj.core.api.SoftAssertions;
diff --git a/src/test/java/com/odoojava/api/SessionTest.java b/src/test/java/com/odoojava/api/SessionTest.java
@@ -1,5 +1,8 @@
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
+import com.odoojava.api.Version;
+import com.odoojava.api.Session;
+import com.odoojava.api.Context;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.assertj.core.api.Assertions.fail;
@@ -27,8 +30,8 @@
 import org.mockserver.socket.SSLFactory;
 import org.mockserver.verify.VerificationTimes;
 
-import com.debortoliwines.odoo.api.DemoDbGetter.DemoDbInfoRequester;
-import com.debortoliwines.odoo.api.OdooXmlRpcProxy.RPCProtocol;
+import com.odoojava.api.DemoDbGetter.DemoDbInfoRequester;
+import com.odoojava.api.OdooXmlRpcProxy.RPCProtocol;
 
 public class SessionTest {
 	private static final String MOCKSERVER_HOST = "localhost";
diff --git a/src/test/java/com/odoojava/api/VersionTest.java b/src/test/java/com/odoojava/api/VersionTest.java
@@ -1,5 +1,6 @@
-package com.debortoliwines.odoo.api;
+package com.odoojava.api;
 
+import com.odoojava.api.Version;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.assertj.core.api.SoftAssertions;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`*/`
`19`	`19`
`20`		`-package com.debortoliwines.odoo.api;`
	`20`	`+package com.odoojava.api;`
`21`	`21`
`22`	`22`	`import java.util.HashMap;`
`23`	`23`	`import java.util.Map;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* limitations under the License.`
`17`	`17`	`*`
`18`	`18`	`*/`
`19`		`-package com.debortoliwines.odoo.api;`
	`19`	`+package com.odoojava.api;`
`20`	`20`
`21`	`21`	`import java.util.Map;`
`22`	`22`