diff options
-rw-r--r-- | same-android/AndroidManifest.xml (renamed from master/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | same-android/pom.xml (renamed from master/pom.xml) | 4 | ||||
-rw-r--r-- | same-android/project.properties (renamed from master/project.properties) | 0 | ||||
-rw-r--r-- | same-android/src/main/java/com/orbekk/Broadcast.java (renamed from master/src/main/java/com/orbekk/Broadcast.java) | 0 | ||||
-rw-r--r-- | same-android/src/main/java/com/orbekk/HelloAndroidActivity.java (renamed from master/src/main/java/com/orbekk/HelloAndroidActivity.java) | 0 | ||||
-rw-r--r-- | same-android/src/main/java/com/orbekk/PingServer.java (renamed from master/src/main/java/com/orbekk/PingServer.java) | 0 | ||||
-rw-r--r-- | same/pom.xml (renamed from jsonrpc/pom.xml) | 6 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/net/BroadcastListener.java (renamed from jsonrpc/src/main/java/com/orbekk/net/BroadcastListener.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/net/Broadcaster.java (renamed from jsonrpc/src/main/java/com/orbekk/net/Broadcaster.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/net/HttpUtil.java (renamed from jsonrpc/src/main/java/com/orbekk/net/HttpUtil.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/rpc/App.java (renamed from jsonrpc/src/main/java/com/orbekk/rpc/App.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/rpc/Client.java (renamed from jsonrpc/src/main/java/com/orbekk/rpc/Client.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/rpc/RpcHandler.java (renamed from jsonrpc/src/main/java/com/orbekk/rpc/RpcHandler.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/same/ConnectionManager.java (renamed from jsonrpc/src/main/java/com/orbekk/same/ConnectionManager.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java (renamed from jsonrpc/src/main/java/com/orbekk/same/ConnectionManagerImpl.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/same/SameService.java (renamed from jsonrpc/src/main/java/com/orbekk/same/SameService.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/same/SameServiceImpl.java (renamed from jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/same/SameState.java (renamed from jsonrpc/src/main/java/com/orbekk/same/SameState.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/same/State.java (renamed from jsonrpc/src/main/java/com/orbekk/same/State.java) | 0 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/same/UrlReceiver.java (renamed from jsonrpc/src/main/java/com/orbekk/same/UrlReceiver.java) | 0 | ||||
-rw-r--r-- | same/src/main/resources/log4j.properties (renamed from jsonrpc/src/main/resources/log4j.properties) | 0 | ||||
-rw-r--r-- | same/src/test/java/com/orbekk/same/SameStateTest.java (renamed from jsonrpc/src/test/java/com/orbekk/same/SameStateTest.java) | 0 |
22 files changed, 5 insertions, 5 deletions
diff --git a/master/AndroidManifest.xml b/same-android/AndroidManifest.xml index 6a596ed..6a596ed 100644 --- a/master/AndroidManifest.xml +++ b/same-android/AndroidManifest.xml diff --git a/master/pom.xml b/same-android/pom.xml index ad0039a..0af6627 100644 --- a/master/pom.xml +++ b/same-android/pom.xml @@ -5,10 +5,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.orbekk</groupId> - <artifactId>master</artifactId> + <artifactId>same-android</artifactId> <version>1.0-SNAPSHOT</version> <packaging>apk</packaging> - <name>master</name> + <name>same-android</name> <dependencies> <dependency> diff --git a/master/project.properties b/same-android/project.properties index ea89160..ea89160 100644 --- a/master/project.properties +++ b/same-android/project.properties diff --git a/master/src/main/java/com/orbekk/Broadcast.java b/same-android/src/main/java/com/orbekk/Broadcast.java index 84b2d6e..84b2d6e 100644 --- a/master/src/main/java/com/orbekk/Broadcast.java +++ b/same-android/src/main/java/com/orbekk/Broadcast.java diff --git a/master/src/main/java/com/orbekk/HelloAndroidActivity.java b/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java index 4160bf4..4160bf4 100644 --- a/master/src/main/java/com/orbekk/HelloAndroidActivity.java +++ b/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java diff --git a/master/src/main/java/com/orbekk/PingServer.java b/same-android/src/main/java/com/orbekk/PingServer.java index 5df2346..5df2346 100644 --- a/master/src/main/java/com/orbekk/PingServer.java +++ b/same-android/src/main/java/com/orbekk/PingServer.java diff --git a/jsonrpc/pom.xml b/same/pom.xml index 7d2bba7..6d3d5f9 100644 --- a/jsonrpc/pom.xml +++ b/same/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.orbekk</groupId> - <artifactId>jsonrpc</artifactId> + <artifactId>same</artifactId> <version>0.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>jsonrpc</name> - <url>http://maven.apache.org</url> + <name>same</name> + <url>http://github.com/orbekk/master</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/jsonrpc/src/main/java/com/orbekk/net/BroadcastListener.java b/same/src/main/java/com/orbekk/net/BroadcastListener.java index c0b66e0..c0b66e0 100644 --- a/jsonrpc/src/main/java/com/orbekk/net/BroadcastListener.java +++ b/same/src/main/java/com/orbekk/net/BroadcastListener.java diff --git a/jsonrpc/src/main/java/com/orbekk/net/Broadcaster.java b/same/src/main/java/com/orbekk/net/Broadcaster.java index 95e279c..95e279c 100644 --- a/jsonrpc/src/main/java/com/orbekk/net/Broadcaster.java +++ b/same/src/main/java/com/orbekk/net/Broadcaster.java diff --git a/jsonrpc/src/main/java/com/orbekk/net/HttpUtil.java b/same/src/main/java/com/orbekk/net/HttpUtil.java index b4bb887..b4bb887 100644 --- a/jsonrpc/src/main/java/com/orbekk/net/HttpUtil.java +++ b/same/src/main/java/com/orbekk/net/HttpUtil.java diff --git a/jsonrpc/src/main/java/com/orbekk/rpc/App.java b/same/src/main/java/com/orbekk/rpc/App.java index 0e9dce3..0e9dce3 100644 --- a/jsonrpc/src/main/java/com/orbekk/rpc/App.java +++ b/same/src/main/java/com/orbekk/rpc/App.java diff --git a/jsonrpc/src/main/java/com/orbekk/rpc/Client.java b/same/src/main/java/com/orbekk/rpc/Client.java index 225347a..225347a 100644 --- a/jsonrpc/src/main/java/com/orbekk/rpc/Client.java +++ b/same/src/main/java/com/orbekk/rpc/Client.java diff --git a/jsonrpc/src/main/java/com/orbekk/rpc/RpcHandler.java b/same/src/main/java/com/orbekk/rpc/RpcHandler.java index 0bafad4..0bafad4 100644 --- a/jsonrpc/src/main/java/com/orbekk/rpc/RpcHandler.java +++ b/same/src/main/java/com/orbekk/rpc/RpcHandler.java diff --git a/jsonrpc/src/main/java/com/orbekk/same/ConnectionManager.java b/same/src/main/java/com/orbekk/same/ConnectionManager.java index 985f6f0..985f6f0 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/ConnectionManager.java +++ b/same/src/main/java/com/orbekk/same/ConnectionManager.java diff --git a/jsonrpc/src/main/java/com/orbekk/same/ConnectionManagerImpl.java b/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java index 841d5fa..841d5fa 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/ConnectionManagerImpl.java +++ b/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java diff --git a/jsonrpc/src/main/java/com/orbekk/same/SameService.java b/same/src/main/java/com/orbekk/same/SameService.java index 8f239da..8f239da 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/SameService.java +++ b/same/src/main/java/com/orbekk/same/SameService.java diff --git a/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java b/same/src/main/java/com/orbekk/same/SameServiceImpl.java index 27579b5..27579b5 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java +++ b/same/src/main/java/com/orbekk/same/SameServiceImpl.java diff --git a/jsonrpc/src/main/java/com/orbekk/same/SameState.java b/same/src/main/java/com/orbekk/same/SameState.java index c9cd216..c9cd216 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/SameState.java +++ b/same/src/main/java/com/orbekk/same/SameState.java diff --git a/jsonrpc/src/main/java/com/orbekk/same/State.java b/same/src/main/java/com/orbekk/same/State.java index 70ffa83..70ffa83 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/State.java +++ b/same/src/main/java/com/orbekk/same/State.java diff --git a/jsonrpc/src/main/java/com/orbekk/same/UrlReceiver.java b/same/src/main/java/com/orbekk/same/UrlReceiver.java index 31a0276..31a0276 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/UrlReceiver.java +++ b/same/src/main/java/com/orbekk/same/UrlReceiver.java diff --git a/jsonrpc/src/main/resources/log4j.properties b/same/src/main/resources/log4j.properties index 70f8a5f..70f8a5f 100644 --- a/jsonrpc/src/main/resources/log4j.properties +++ b/same/src/main/resources/log4j.properties diff --git a/jsonrpc/src/test/java/com/orbekk/same/SameStateTest.java b/same/src/test/java/com/orbekk/same/SameStateTest.java index b16f5f9..b16f5f9 100644 --- a/jsonrpc/src/test/java/com/orbekk/same/SameStateTest.java +++ b/same/src/test/java/com/orbekk/same/SameStateTest.java |