diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f05e835 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.idea/ +.classpath +.project +.settings/ diff --git a/bunti_server/.classpath b/bunti_server/.classpath deleted file mode 100644 index 245ce4b..0000000 --- a/bunti_server/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/bunti_server/.project b/bunti_server/.project deleted file mode 100644 index 2e7aaf1..0000000 --- a/bunti_server/.project +++ /dev/null @@ -1,48 +0,0 @@ - - - bunti_server - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.maven.ide.eclipse.maven2Nature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/bunti_server/.settings/.jsdtscope b/bunti_server/.settings/.jsdtscope deleted file mode 100644 index b46b920..0000000 --- a/bunti_server/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/bunti_server/.settings/org.eclipse.jdt.core.prefs b/bunti_server/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ca24851..0000000 --- a/bunti_server/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -#Fri Feb 24 18:01:38 CET 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bunti_server/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs b/bunti_server/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs deleted file mode 100644 index 7c8126d..0000000 --- a/bunti_server/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs +++ /dev/null @@ -1,5 +0,0 @@ -XDOCLETBUILDERACTIVE=true -XDOCLETHOME= -XDOCLETUSEGLOBAL=true -XDOCLETVERSION=1.2.1 -eclipse.preferences.version=1 diff --git a/bunti_server/.settings/org.eclipse.ltk.core.refactoring.prefs b/bunti_server/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64..0000000 --- a/bunti_server/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/bunti_server/.settings/org.eclipse.m2e.core.prefs b/bunti_server/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index 56d56a8..0000000 --- a/bunti_server/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Dec 23 16:41:12 CET 2011 -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bunti_server/.settings/org.eclipse.wst.common.component b/bunti_server/.settings/org.eclipse.wst.common.component deleted file mode 100644 index fbaf1a5..0000000 --- a/bunti_server/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bunti_server/.settings/org.eclipse.wst.common.project.facet.core.xml b/bunti_server/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 924e80f..0000000 --- a/bunti_server/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bunti_server/.settings/org.eclipse.wst.jsdt.ui.superType.container b/bunti_server/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/bunti_server/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/bunti_server/.settings/org.eclipse.wst.jsdt.ui.superType.name b/bunti_server/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/bunti_server/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/bunti_server/.settings/org.eclipse.wst.ws.service.policy.prefs b/bunti_server/.settings/org.eclipse.wst.ws.service.policy.prefs deleted file mode 100644 index 9cfcabe..0000000 --- a/bunti_server/.settings/org.eclipse.wst.ws.service.policy.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.wst.ws.service.policy.projectEnabled=false diff --git a/bunti_server/.settings/org.maven.ide.eclipse.prefs b/bunti_server/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 7713a11..0000000 --- a/bunti_server/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Dec 23 00:40:34 CET 2011 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/bunti_server/pom.xml b/pom.xml similarity index 100% rename from bunti_server/pom.xml rename to pom.xml diff --git a/bunti_server/src/main/java/de/ctdo/bunti/DeviceChangedEvent.java b/src/main/java/de/ctdo/bunti/DeviceChangedEvent.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/DeviceChangedEvent.java rename to src/main/java/de/ctdo/bunti/DeviceChangedEvent.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/artnet/ArtNetSocket.java b/src/main/java/de/ctdo/bunti/artnet/ArtNetSocket.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/artnet/ArtNetSocket.java rename to src/main/java/de/ctdo/bunti/artnet/ArtNetSocket.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/artnet/ArtNetSocketImpl.java b/src/main/java/de/ctdo/bunti/artnet/ArtNetSocketImpl.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/artnet/ArtNetSocketImpl.java rename to src/main/java/de/ctdo/bunti/artnet/ArtNetSocketImpl.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/artnet/ByteUtils.java b/src/main/java/de/ctdo/bunti/artnet/ByteUtils.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/artnet/ByteUtils.java rename to src/main/java/de/ctdo/bunti/artnet/ByteUtils.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSender.java b/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSender.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSender.java rename to src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSender.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSenderImpl.java b/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSenderImpl.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSenderImpl.java rename to src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSenderImpl.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/artnet/packets/ArtDmxPacket.java b/src/main/java/de/ctdo/bunti/artnet/packets/ArtDmxPacket.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/artnet/packets/ArtDmxPacket.java rename to src/main/java/de/ctdo/bunti/artnet/packets/ArtDmxPacket.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/artnet/packets/ArtNetPacket.java b/src/main/java/de/ctdo/bunti/artnet/packets/ArtNetPacket.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/artnet/packets/ArtNetPacket.java rename to src/main/java/de/ctdo/bunti/artnet/packets/ArtNetPacket.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/artnet/packets/PacketType.java b/src/main/java/de/ctdo/bunti/artnet/packets/PacketType.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/artnet/packets/PacketType.java rename to src/main/java/de/ctdo/bunti/artnet/packets/PacketType.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/control/BuntiController.java b/src/main/java/de/ctdo/bunti/control/BuntiController.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/control/BuntiController.java rename to src/main/java/de/ctdo/bunti/control/BuntiController.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java b/src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java rename to src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAO.java b/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAO.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAO.java rename to src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAO.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java b/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java rename to src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/devices/DeviceMixer.java b/src/main/java/de/ctdo/bunti/devices/DeviceMixer.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/devices/DeviceMixer.java rename to src/main/java/de/ctdo/bunti/devices/DeviceMixer.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java b/src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java rename to src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/dmx/DMX.java b/src/main/java/de/ctdo/bunti/dmx/DMX.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/dmx/DMX.java rename to src/main/java/de/ctdo/bunti/dmx/DMX.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXChannel.java b/src/main/java/de/ctdo/bunti/dmx/DMXChannel.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXChannel.java rename to src/main/java/de/ctdo/bunti/dmx/DMXChannel.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXChannels.java b/src/main/java/de/ctdo/bunti/dmx/DMXChannels.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXChannels.java rename to src/main/java/de/ctdo/bunti/dmx/DMXChannels.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXMixer.java b/src/main/java/de/ctdo/bunti/dmx/DMXMixer.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXMixer.java rename to src/main/java/de/ctdo/bunti/dmx/DMXMixer.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java b/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java rename to src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/model/BuntiDMXDevice.java b/src/main/java/de/ctdo/bunti/model/BuntiDMXDevice.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/model/BuntiDMXDevice.java rename to src/main/java/de/ctdo/bunti/model/BuntiDMXDevice.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/model/BuntiDevice.java b/src/main/java/de/ctdo/bunti/model/BuntiDevice.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/model/BuntiDevice.java rename to src/main/java/de/ctdo/bunti/model/BuntiDevice.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/model/BuntiSwitchingDevice.java b/src/main/java/de/ctdo/bunti/model/BuntiSwitchingDevice.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/model/BuntiSwitchingDevice.java rename to src/main/java/de/ctdo/bunti/model/BuntiSwitchingDevice.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/model/Par56Spot.java b/src/main/java/de/ctdo/bunti/model/Par56Spot.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/model/Par56Spot.java rename to src/main/java/de/ctdo/bunti/model/Par56Spot.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/model/Strobe1500.java b/src/main/java/de/ctdo/bunti/model/Strobe1500.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/model/Strobe1500.java rename to src/main/java/de/ctdo/bunti/model/Strobe1500.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java b/src/main/java/de/ctdo/bunti/web/TestController.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java rename to src/main/java/de/ctdo/bunti/web/TestController.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerApplication.java b/src/main/java/de/ctdo/bunti/websocket/BuntiControllerApplication.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerApplication.java rename to src/main/java/de/ctdo/bunti/websocket/BuntiControllerApplication.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerServlet.java b/src/main/java/de/ctdo/bunti/websocket/BuntiControllerServlet.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerServlet.java rename to src/main/java/de/ctdo/bunti/websocket/BuntiControllerServlet.java diff --git a/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerWebSocket.java b/src/main/java/de/ctdo/bunti/websocket/BuntiControllerWebSocket.java similarity index 100% rename from bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerWebSocket.java rename to src/main/java/de/ctdo/bunti/websocket/BuntiControllerWebSocket.java diff --git a/bunti_server/src/main/resources/log4j.properties b/src/main/resources/log4j.properties similarity index 100% rename from bunti_server/src/main/resources/log4j.properties rename to src/main/resources/log4j.properties diff --git a/bunti_server/src/main/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from bunti_server/src/main/webapp/META-INF/MANIFEST.MF rename to src/main/webapp/META-INF/MANIFEST.MF diff --git a/bunti_server/src/main/webapp/WEB-INF/bunti-steuerung.html b/src/main/webapp/WEB-INF/bunti-steuerung.html similarity index 100% rename from bunti_server/src/main/webapp/WEB-INF/bunti-steuerung.html rename to src/main/webapp/WEB-INF/bunti-steuerung.html diff --git a/bunti_server/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/dispatcher-servlet.xml similarity index 100% rename from bunti_server/src/main/webapp/WEB-INF/dispatcher-servlet.xml rename to src/main/webapp/WEB-INF/dispatcher-servlet.xml diff --git a/bunti_server/src/main/webapp/WEB-INF/sun-web.xml b/src/main/webapp/WEB-INF/sun-web.xml similarity index 100% rename from bunti_server/src/main/webapp/WEB-INF/sun-web.xml rename to src/main/webapp/WEB-INF/sun-web.xml diff --git a/bunti_server/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from bunti_server/src/main/webapp/WEB-INF/web.xml rename to src/main/webapp/WEB-INF/web.xml diff --git a/bunti_server/src/main/webapp/app.js b/src/main/webapp/app.js similarity index 100% rename from bunti_server/src/main/webapp/app.js rename to src/main/webapp/app.js diff --git a/bunti_server/src/main/webapp/css/screen.css b/src/main/webapp/css/screen.css similarity index 100% rename from bunti_server/src/main/webapp/css/screen.css rename to src/main/webapp/css/screen.css diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/src/main/webapp/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/src/main/webapp/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/src/main/webapp/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_222222_256x240.png b/src/main/webapp/css/ui-lightness/images/ui-icons_222222_256x240.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_222222_256x240.png rename to src/main/webapp/css/ui-lightness/images/ui-icons_222222_256x240.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/src/main/webapp/css/ui-lightness/images/ui-icons_228ef1_256x240.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_228ef1_256x240.png rename to src/main/webapp/css/ui-lightness/images/ui-icons_228ef1_256x240.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/src/main/webapp/css/ui-lightness/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_ef8c08_256x240.png rename to src/main/webapp/css/ui-lightness/images/ui-icons_ef8c08_256x240.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/src/main/webapp/css/ui-lightness/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_ffd27a_256x240.png rename to src/main/webapp/css/ui-lightness/images/ui-icons_ffd27a_256x240.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/src/main/webapp/css/ui-lightness/images/ui-icons_ffffff_256x240.png similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/images/ui-icons_ffffff_256x240.png rename to src/main/webapp/css/ui-lightness/images/ui-icons_ffffff_256x240.png diff --git a/bunti_server/src/main/webapp/css/ui-lightness/jquery-ui-1.8.16.custom.css b/src/main/webapp/css/ui-lightness/jquery-ui-1.8.16.custom.css similarity index 100% rename from bunti_server/src/main/webapp/css/ui-lightness/jquery-ui-1.8.16.custom.css rename to src/main/webapp/css/ui-lightness/jquery-ui-1.8.16.custom.css diff --git a/bunti_server/src/main/webapp/hello.jsp b/src/main/webapp/hello.jsp similarity index 100% rename from bunti_server/src/main/webapp/hello.jsp rename to src/main/webapp/hello.jsp diff --git a/bunti_server/src/main/webapp/index.html b/src/main/webapp/index.html similarity index 100% rename from bunti_server/src/main/webapp/index.html rename to src/main/webapp/index.html diff --git a/bunti_server/src/main/webapp/index.jsp b/src/main/webapp/index.jsp similarity index 100% rename from bunti_server/src/main/webapp/index.jsp rename to src/main/webapp/index.jsp diff --git a/bunti_server/src/main/webapp/js/jquery-1.6.2.min.js b/src/main/webapp/js/jquery-1.6.2.min.js similarity index 100% rename from bunti_server/src/main/webapp/js/jquery-1.6.2.min.js rename to src/main/webapp/js/jquery-1.6.2.min.js diff --git a/bunti_server/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js b/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js similarity index 100% rename from bunti_server/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js rename to src/main/webapp/js/jquery-ui-1.8.16.custom.min.js