Delete duplicate resources directory in exec.mimis

2016-08-10 14:53:46 +01:00
parent 7a1576eb4d
commit 6bc47ee8b5
37 changed files with 1 additions and 17 deletions
--- a/exec.mimis/build.gradle
+++ b/exec.mimis/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
 	compile project(':core.mimis')
-	
+	compile project(':application.itunes')	
 	compile project(':device.wiimote')
 }

--- a/exec.mimis/src/main/resources/M.ico
+++ b/exec.mimis/src/main/resources/M.ico
--- a/exec.mimis/src/main/resources/M.png
+++ b/exec.mimis/src/main/resources/M.png
--- a/exec.mimis/src/main/resources/META-INF/services/mimis.application.Application
+++ b/exec.mimis/src/main/resources/META-INF/services/mimis.application.Application
@@ -1 +0,0 @@
-mimis.application.itunes.iTunesApplication
--- a/exec.mimis/src/main/resources/META-INF/services/mimis.device.Device
+++ b/exec.mimis/src/main/resources/META-INF/services/mimis.device.Device
@@ -1,6 +0,0 @@
-mimis.device.javainput.extreme3d.Extreme3DDevice
-mimis.device.javainput.rumblepad.RumblepadDevice
-mimis.device.javainput.xbox360.Xbox360Device
-mimis.device.jintellitype.JIntellitypeDevice
-mimis.device.panel.PanelDevice
-mimis.device.wiimote.WiimoteDevice
--- a/exec.mimis/src/main/resources/Mimis.bmp
+++ b/exec.mimis/src/main/resources/Mimis.bmp
--- a/exec.mimis/src/main/resources/Mimis.png
+++ b/exec.mimis/src/main/resources/Mimis.png
--- a/exec.mimis/src/main/resources/commons-logging.properties
+++ b/exec.mimis/src/main/resources/commons-logging.properties
@@ -1 +0,0 @@
-#org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
--- a/exec.mimis/src/main/resources/icons/camera.png
+++ b/exec.mimis/src/main/resources/icons/camera.png
--- a/exec.mimis/src/main/resources/icons/comment.png
+++ b/exec.mimis/src/main/resources/icons/comment.png
--- a/exec.mimis/src/main/resources/icons/connect.png
+++ b/exec.mimis/src/main/resources/icons/connect.png
--- a/exec.mimis/src/main/resources/icons/control_eject_blue.png
+++ b/exec.mimis/src/main/resources/icons/control_eject_blue.png
--- a/exec.mimis/src/main/resources/icons/control_end_blue.png
+++ b/exec.mimis/src/main/resources/icons/control_end_blue.png
--- a/exec.mimis/src/main/resources/icons/control_fastforward_blue.png
+++ b/exec.mimis/src/main/resources/icons/control_fastforward_blue.png
--- a/exec.mimis/src/main/resources/icons/control_pause_blue.png
+++ b/exec.mimis/src/main/resources/icons/control_pause_blue.png
--- a/exec.mimis/src/main/resources/icons/control_play_blue.png
+++ b/exec.mimis/src/main/resources/icons/control_play_blue.png
--- a/exec.mimis/src/main/resources/icons/control_rewind_blue.png
+++ b/exec.mimis/src/main/resources/icons/control_rewind_blue.png
--- a/exec.mimis/src/main/resources/icons/control_start_blue.png
+++ b/exec.mimis/src/main/resources/icons/control_start_blue.png
--- a/exec.mimis/src/main/resources/icons/control_stop_blue.png
+++ b/exec.mimis/src/main/resources/icons/control_stop_blue.png
--- a/exec.mimis/src/main/resources/icons/down.png
+++ b/exec.mimis/src/main/resources/icons/down.png
--- a/exec.mimis/src/main/resources/icons/forward.png
+++ b/exec.mimis/src/main/resources/icons/forward.png
--- a/exec.mimis/src/main/resources/icons/image.png
+++ b/exec.mimis/src/main/resources/icons/image.png
--- a/exec.mimis/src/main/resources/icons/mute.png
+++ b/exec.mimis/src/main/resources/icons/mute.png
--- a/exec.mimis/src/main/resources/icons/next.png
+++ b/exec.mimis/src/main/resources/icons/next.png
--- a/exec.mimis/src/main/resources/icons/pause.png
+++ b/exec.mimis/src/main/resources/icons/pause.png
--- a/exec.mimis/src/main/resources/icons/play.png
+++ b/exec.mimis/src/main/resources/icons/play.png
--- a/exec.mimis/src/main/resources/icons/previous.png
+++ b/exec.mimis/src/main/resources/icons/previous.png
--- a/exec.mimis/src/main/resources/icons/repeat.png
+++ b/exec.mimis/src/main/resources/icons/repeat.png
--- a/exec.mimis/src/main/resources/icons/rewind.png
+++ b/exec.mimis/src/main/resources/icons/rewind.png
--- a/exec.mimis/src/main/resources/icons/shuffle.png
+++ b/exec.mimis/src/main/resources/icons/shuffle.png
--- a/exec.mimis/src/main/resources/icons/sound_mute.png
+++ b/exec.mimis/src/main/resources/icons/sound_mute.png
--- a/exec.mimis/src/main/resources/icons/stop.png
+++ b/exec.mimis/src/main/resources/icons/stop.png
--- a/exec.mimis/src/main/resources/icons/unmute.png
+++ b/exec.mimis/src/main/resources/icons/unmute.png
--- a/exec.mimis/src/main/resources/icons/up.png
+++ b/exec.mimis/src/main/resources/icons/up.png
--- a/exec.mimis/src/main/resources/icons/volumeDown.png
+++ b/exec.mimis/src/main/resources/icons/volumeDown.png
--- a/exec.mimis/src/main/resources/icons/volumeUp.png
+++ b/exec.mimis/src/main/resources/icons/volumeUp.png
--- a/exec.mimis/src/main/resources/log4j.properties
+++ b/exec.mimis/src/main/resources/log4j.properties
@@ -1,8 +0,0 @@
-log4j.rootLogger=INFO, CA
-log4j.appender.CA=org.apache.log4j.ConsoleAppender
-log4j.appender.CA.layout=org.apache.log4j.PatternLayout
-log4j.appender.CA.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-log4j.appender.CUSTOM=test.CustomAppender
-log4j.appender.CUSTOM.Bla=1234
-log4j.appender.CUSTOM.layout=org.apache.log4j.PatternLayout
-log4j.appender.CUSTOM.layout.ConversionPattern=[%d{MMM dd HH:mm:ss}] %-5p (%F:%L) - %m%n
				`@@ -1 +0,0 @@`
				`#org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog`