Skip to content

Commit 45a054f

Browse files
hovoerehovoere
committed
Renamed package to io.realm
1 parent 97b02ba commit 45a054f

256 files changed

Lines changed: 1606 additions & 1631 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.JNI-h-file-generation.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</listAttribute>
66
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
77
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\Program Files\Java\jdk1.7.0\bin\javah.exe"/>
8-
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d ${workspace_loc:/realm-core/target/classes} com.realm.Group com.realm.Table com.realm.TableView com.realm.TableQuery com.realm.internal.Util com.realm.SharedGroup com.realm.SubtableSchema com.realm.Version"/>
8+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d ${workspace_loc:/realm-core/target/classes} io.realm.Group io.realm.Table io.realm.TableView io.realm.TableQuery io.realm.internal.Util io.realm.SharedGroup io.realm.SubtableSchema io.realm.Version"/>
99
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/realm-core/target/classes}"/>
1010
</launchConfiguration>

‎.gitignore‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ _ReSharper*/
8787

8888
# Ref doc generated classes
8989

90-
/doc/ref/examples/generated/com/realm/refdoc/*.java
90+
/doc/ref/examples/generated/io/realm/refdoc/*.java
9191

9292
# generated json output in ref doc json example
9393

@@ -105,4 +105,6 @@ _ReSharper*/
105105

106106
# generated lib files
107107
/java/share/java/*.jar
108-
/tightdb_jni/src/*.dylib
108+
/realm_jni/src/*.dylib
109+
110+
realm-java-test/*.realm

‎build-replication.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ cd "$TIGHTDB_JAVA_HOME/tightdb-example/src/main/java" || exit 1
1919
find com/ -type f -name '*.class' -delete || exit 1
2020
export CLASSPATH="$TIGHTDB_JAVA_HOME/src/main/java/tightdb.jar:."
2121
javac com/tightdb/example/ReplicationExample.java com/tightdb/example/generated/*.java || exit 1
22-
java -Djava.library.path="$TIGHTDB_JAVA_HOME/tightdb_jni/src" com.realm.example.ReplicationExample --database-file /tmp/replication.tightdb || exit 1
22+
java -Djava.library.path="$TIGHTDB_JAVA_HOME/tightdb_jni/src" io.realm.example.ReplicationExample --database-file /tmp/replication.tightdb || exit 1

‎build.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -675,8 +675,8 @@ EOF
675675
echo "Building 'lib/realm.jar'"
676676
dir="realm-java-core/src/main"
677677
realm_jar="$TIGHTDB_JAVA_HOME/lib/realm.jar"
678-
(cd "$dir/java" && $javac_cmd com/realm/*.java com/realm/internal/*.java com/realm/typed/*.java) || exit 1
679-
(cd "$dir/java" && jar cf "$realm_jar" com/realm/*.class com/realm/internal/*.class com/realm/typed/*.class) || exit 1
678+
(cd "$dir/java" && $javac_cmd io/realm/*.java io/realm/internal/*.java io/realm/typed/*.java) || exit 1
679+
(cd "$dir/java" && jar cf "$realm_jar" io/realm/*.class io/realm/internal/*.class io/realm/typed/*.class) || exit 1
680680
(cd "lib" && jar i "realm.jar") || exit 1
681681

682682
# Build realm-devkit.jar
@@ -694,11 +694,11 @@ EOF
694694
path_list_append CLASSPATH "$realm_jar" || exit 1
695695
export CLASSPATH
696696
dir="realm-java-generator/src/main"
697-
# FIXME: Must run ResourceGenerator to produce "$dir/java/com/realm/generator/Templates.java"
697+
# FIXME: Must run ResourceGenerator to produce "$dir/java/io/realm/generator/Templates.java"
698698
devkit_jar="$TIGHTDB_JAVA_HOME/lib/realm-devkit.jar"
699699
(cd "$dir" && jar cfm "$devkit_jar" "$manifest" -C resources META-INF) || exit 1
700-
(cd "$dir/java" && $javac_cmd com/realm/generator/*.java) || exit 1
701-
(cd "$dir/java" && jar uf "$devkit_jar" com/realm/generator/*.class) || exit 1
700+
(cd "$dir/java" && $javac_cmd io/realm/generator/*.java) || exit 1
701+
(cd "$dir/java" && jar uf "$devkit_jar" io/realm/generator/*.class) || exit 1
702702
(cd "lib" && jar i "realm-devkit.jar") || exit 1
703703
exit 0
704704
;;
@@ -862,7 +862,7 @@ EOF
862862
dir="realm-java-test/src/test"
863863
echo "Building test suite in '$dir'"
864864
export CLASSPATH="$devkit_jar:$temp_dir/gen:."
865-
(cd "$dir/../test/java" && $javac_cmd -d "$temp_dir/out" -s "$temp_dir/gen" com/realm/test/TestTableModel.java) || exit 1
865+
(cd "$dir/../test/java" && $javac_cmd -d "$temp_dir/out" -s "$temp_dir/gen" io/realm/test/TestTableModel.java) || exit 1
866866

867867
path_list_append "CLASSPATH" "../main" || exit 1
868868
testing_jars="$(get_config_param "TESTING_JARS")" || exit 1

‎doc/developer_instructions.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ How to run Java tests:
7575

7676
3. Execute the examples(from Eclipse):
7777
a) Execute the any of the examples in the tightdb-java-example project, by right-clicking the java file
78-
(under "src/main/java" -> "com.realm.example") and -> Run As -> Java Application
78+
(under "src/main/java" -> "io.realm.example") and -> Run As -> Java Application
7979

8080

8181
How to update Java bindings:
@@ -87,7 +87,7 @@ How to update Java bindings:
8787
Click the button next to the "Play": "External Tools" -> JNI-h-file-generation
8888
b) Or from cmd line:
8989
cd workspace (assuming it's located next to the tightdb_java)
90-
javah -d ..\tightdb_java\tightdb-java-core\target\classes\jni com.realm.Group com.realm.TableBase com.realm.TableViewBase com.realm.TableQuery com.realm.util com.realm.SharedGroup
90+
javah -d ..\tightdb_java\tightdb-java-core\target\classes\jni io.realm.Group io.realm.TableBase io.realm.TableViewBase io.realm.TableQuery io.realm.util io.realm.SharedGroup
9191

9292

9393
How to update Java tightdb-jars:

‎doc/ref/examples/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<javac source="${source}" target="${target}" srcdir="${srcdir}" includeantruntime="false">
5353
<classpath refid="build-classpath"/>
5454
<compilerarg value="-processor" />
55-
<compilerarg value="com.realm.generator.CodeGenProcessor" />
55+
<compilerarg value="io.realm.generator.CodeGenProcessor" />
5656
<compilerarg value="-processorpath" />
5757
<compilerarg value="${libpath}/realm-devkit.jar" />
5858
<compilerarg value="-s" />
@@ -62,7 +62,7 @@
6262
</target>
6363

6464
<target depends="build" name="refdoc">
65-
<java classname="com.realm.refdoc.RefDocExamples" failonerror="true" fork="yes">
65+
<java classname="io.realm.refdoc.RefDocExamples" failonerror="true" fork="yes">
6666
<sysproperty key="java.library.path" path="${libpath}"/>
6767
<classpath refid="samples-classpath"/>
6868
</java>

‎doc/ref/examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<phase>generate-test-sources</phase>
3737
<configuration>
3838
<processors>
39-
<processor>com.realm.generator.CodeGenProcessor</processor>
39+
<processor>io.realm.generator.CodeGenProcessor</processor>
4040
</processors>
4141
<outputDirectory>${project.build.directory}/generated-test</outputDirectory>
4242
</configuration>

doc/ref/examples/src/main/java/com/tightdb/refdoc/DynQueryExamples.java renamed to doc/ref/examples/src/main/java/io/realm/refdoc/DynQueryExamples.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.realm.refdoc;
1+
package io.realm.refdoc;
22

3-
import com.realm.*;
3+
import io.realm.*;
44

55
public class DynQueryExamples {
66

doc/ref/examples/src/main/java/com/tightdb/refdoc/DynQueryIntro.java renamed to doc/ref/examples/src/main/java/io/realm/refdoc/DynQueryIntro.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// @@Example: ex_java_dyn_query_intro @@
2-
package com.realm.refdoc;
2+
package io.realm.refdoc;
33

4-
import com.realm.ColumnType;
5-
import com.realm.Table;
6-
import com.realm.TableQuery;
7-
import com.realm.TableView;
4+
import io.realm.ColumnType;
5+
import io.realm.Table;
6+
import io.realm.TableQuery;
7+
import io.realm.TableView;
88

99
public class DynQueryIntro {
1010

doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java renamed to doc/ref/examples/src/main/java/io/realm/refdoc/DynTableExamples.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package com.realm.refdoc;
1+
package io.realm.refdoc;
22

33
import java.io.FileNotFoundException;
44
import java.io.PrintWriter;
5-
6-
import com.realm.*;
7-
import com.realm.TableView.Order;
5+
import io.realm.*;
6+
import io.realm.TableView.Order;
87

98
public class DynTableExamples {
109

0 commit comments

Comments
 (0)