Remove trademark from Java binding package names

native_client/java/Makefile

@@ -28,4 +28,4 @@ maven-bundle: apk
 	$(GRADLE) zipMavenArtifacts
 
 bindings: clean ds-swig
-	$(DS_SWIG_ENV) swig -c++ -java -package org.mozilla.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i
+	$(DS_SWIG_ENV) swig -c++ -java -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i

native_client/java/app/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion 27
 
     defaultConfig {
-        applicationId "org.mozilla.deepspeech"
+        applicationId "org.deepspeech"
         minSdkVersion 21
         targetSdkVersion 27
         versionName androidGitVersion.name()

native_client/java/app/src/androidTest/java/org/mozilla/deepspeech/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.mozilla.deepspeech", appContext.getPackageName());
+        assertEquals("org.deepspeech", appContext.getPackageName());
     }
 }

native_client/java/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.deepspeech">
+    package="org.deepspeech">
 
     <application
         android:allowBackup="true"

native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -16,7 +16,7 @@ import java.io.IOException;
 import java.nio.ByteOrder;
 import java.nio.ByteBuffer;
 
-import org.mozilla.deepspeech.libdeepspeech.DeepSpeechModel;
+import org.deepspeech.libdeepspeech.DeepSpeechModel;
 
 public class DeepSpeechActivity extends AppCompatActivity {
 

native_client/java/app/src/test/java/org/mozilla/deepspeech/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import org.junit.Test;
 

native_client/java/libdeepspeech/build.gradle

@@ -46,7 +46,7 @@ android {
 
     // Avoid scanning libdeepspeech_doc
     sourceSets {
-        main.java.srcDirs = [ 'src/main/java/org/mozilla/deepspeech/libdeepspeech/' ]
+        main.java.srcDirs = [ 'src/main/java/org/deepspeech/libdeepspeech/' ]
     }
 }
 
@@ -77,7 +77,7 @@ uploadArchives {
         mavenDeployer {
             pom.packaging  = 'aar'
             pom.name       = 'libdeepspeech'
-            pom.groupId    = 'org.mozilla.deepspeech'
+            pom.groupId    = 'org.deepspeech'
             pom.artifactId = 'libdeepspeech'
             pom.version    = dsVersionString + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '')
 

native_client/java/libdeepspeech/src/androidTest/java/org/deepspeech/libdeepspeech/test/BasicTest.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech.test;
+package org.deepspeech.libdeepspeech.test;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -11,8 +11,8 @@ import org.junit.runners.MethodSorters;
 
 import static org.junit.Assert.*;
 
-import org.mozilla.deepspeech.libdeepspeech.DeepSpeechModel;
+import org.deepspeech.libdeepspeech.DeepSpeechModel;
-import org.mozilla.deepspeech.libdeepspeech.CandidateTranscript;
+import org.deepspeech.libdeepspeech.CandidateTranscript;
 
 import java.io.RandomAccessFile;
 import java.io.FileNotFoundException;
@@ -54,7 +54,7 @@ public class BasicTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.mozilla.deepspeech.libdeepspeech.test", appContext.getPackageName());
+        assertEquals("org.deepspeech.libdeepspeech.test", appContext.getPackageName());
     }
 
     @Test

native_client/java/libdeepspeech/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.deepspeech.libdeepspeech" />
+    package="org.deepspeech.libdeepspeech" />

native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * @brief Exposes a DeepSpeech model in Java

native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 public final class DeepSpeechStreamingState {
     private SWIGTYPE_p_StreamingState _sp;

native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/CandidateTranscript.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * A single transcript computed by the model, including a confidence<br>

native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 public enum DeepSpeech_Error_Codes {
   ERR_OK(0x0000),

native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/Metadata.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * An array of CandidateTranscript objects computed by the model.

native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/README.rst

@@ -8,4 +8,4 @@ To update, please install SWIG (4.0 at least) and then run from native_client/ja
 
 .. code-block::
 
-   swig -c++ -java -doxygen -package org.mozilla.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i
+   swig -c++ -java -doxygen -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i

native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/TokenMetadata.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * Stores text of an individual token, along with its timing information

native_client/java/libdeepspeech/src/test/java/org/deepspeech/libdeepspeech/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 import org.junit.Test;