diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..19050d9b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "webmagic-avalon/forger"] + path = webmagic-avalon/forger + url = git@github.com:code4craft/forger.git diff --git a/pom.xml b/pom.xml index 77bc93e8..86f48856 100644 --- a/pom.xml +++ b/pom.xml @@ -54,8 +54,7 @@ webmagic-selenium webmagic-saxon webmagic-samples - webmagic-admin - webmagic-worker + webmagic-avalon diff --git a/webmagic-avalon/forger b/webmagic-avalon/forger new file mode 160000 index 00000000..9f08a0ff --- /dev/null +++ b/webmagic-avalon/forger @@ -0,0 +1 @@ +Subproject commit 9f08a0ffd09f5d59ae38091bca250d51aa54bfde diff --git a/webmagic-avalon/pom.xml b/webmagic-avalon/pom.xml new file mode 100644 index 00000000..21a4ca6e --- /dev/null +++ b/webmagic-avalon/pom.xml @@ -0,0 +1,120 @@ + + + + webmagic-parent + us.codecraft + 0.5.0-SNAPSHOT + + 4.0.0 + + us.codecraft + webmagic-avalon + pom + + + forger + webmagic-admin + webmagic-worker + + + + + us.codecraft + webmagic-scripts + ${project.version} + + + + org.mybatis + mybatis + 3.1.1 + + + + org.mybatis + mybatis-spring + 1.1.1 + + + + us.codecraft + forger + 0.1.0-SNAPSHOT + + + + org.freemarker + freemarker + 2.3.19 + + + + org.springframework + spring-test + ${spring-version} + test + + + + org.springframework + spring-aop + ${spring-version} + + + + org.aspectj + aspectjrt + 1.7.2 + + + org.aspectj + aspectjweaver + 1.7.2 + + + org.springframework + spring-core + ${spring-version} + + + org.springframework + spring-webmvc + ${spring-version} + + + + javax.servlet + javax.servlet-api + 3.0.1 + + + org.springframework + spring-context + ${spring-version} + + + org.springframework + spring-context-support + ${spring-version} + + + com.alibaba + fastjson + 1.1.37 + + + + + + + + maven-deploy-plugin + + true + + + + + + + \ No newline at end of file diff --git a/webmagic-admin/README.md b/webmagic-avalon/webmagic-admin/README.md similarity index 100% rename from webmagic-admin/README.md rename to webmagic-avalon/webmagic-admin/README.md diff --git a/webmagic-admin/pom.xml b/webmagic-avalon/webmagic-admin/pom.xml similarity index 98% rename from webmagic-admin/pom.xml rename to webmagic-avalon/webmagic-admin/pom.xml index 58068f93..e989782a 100644 --- a/webmagic-admin/pom.xml +++ b/webmagic-avalon/webmagic-admin/pom.xml @@ -1,7 +1,7 @@ - webmagic-parent + webmagic-avalon us.codecraft 0.5.0-SNAPSHOT diff --git a/webmagic-admin/src/main/java/us/codecraft/webmagic/avalon/web/DashBoardController.java b/webmagic-avalon/webmagic-admin/src/main/java/us/codecraft/webmagic/avalon/web/DashBoardController.java similarity index 100% rename from webmagic-admin/src/main/java/us/codecraft/webmagic/avalon/web/DashBoardController.java rename to webmagic-avalon/webmagic-admin/src/main/java/us/codecraft/webmagic/avalon/web/DashBoardController.java diff --git a/webmagic-admin/src/main/java/us/codecraft/webmagic/avalon/web/SpiderController.java b/webmagic-avalon/webmagic-admin/src/main/java/us/codecraft/webmagic/avalon/web/SpiderController.java similarity index 100% rename from webmagic-admin/src/main/java/us/codecraft/webmagic/avalon/web/SpiderController.java rename to webmagic-avalon/webmagic-admin/src/main/java/us/codecraft/webmagic/avalon/web/SpiderController.java diff --git a/webmagic-admin/src/main/resources/freemarker.properties b/webmagic-avalon/webmagic-admin/src/main/resources/freemarker.properties similarity index 100% rename from webmagic-admin/src/main/resources/freemarker.properties rename to webmagic-avalon/webmagic-admin/src/main/resources/freemarker.properties diff --git a/webmagic-admin/src/main/resources/log/log4j.xml b/webmagic-avalon/webmagic-admin/src/main/resources/log/log4j.xml similarity index 100% rename from webmagic-admin/src/main/resources/log/log4j.xml rename to webmagic-avalon/webmagic-admin/src/main/resources/log/log4j.xml diff --git a/webmagic-admin/src/main/resources/spring/applicationContext-freemarker.xml b/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-freemarker.xml similarity index 100% rename from webmagic-admin/src/main/resources/spring/applicationContext-freemarker.xml rename to webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-freemarker.xml diff --git a/webmagic-admin/src/main/resources/spring/applicationContext-myBatis.xml b/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-myBatis.xml similarity index 100% rename from webmagic-admin/src/main/resources/spring/applicationContext-myBatis.xml rename to webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-myBatis.xml diff --git a/webmagic-admin/src/main/resources/spring/applicationContext.xml b/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext.xml similarity index 100% rename from webmagic-admin/src/main/resources/spring/applicationContext.xml rename to webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext.xml diff --git a/webmagic-admin/src/main/webapp/WEB-INF/jsp/404.jsp b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/jsp/404.jsp similarity index 100% rename from webmagic-admin/src/main/webapp/WEB-INF/jsp/404.jsp rename to webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/jsp/404.jsp diff --git a/webmagic-admin/src/main/webapp/WEB-INF/jsp/500.jsp b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/jsp/500.jsp similarity index 100% rename from webmagic-admin/src/main/webapp/WEB-INF/jsp/500.jsp rename to webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/jsp/500.jsp diff --git a/webmagic-admin/src/main/webapp/WEB-INF/pages/create_spider.ftl b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/pages/create_spider.ftl similarity index 100% rename from webmagic-admin/src/main/webapp/WEB-INF/pages/create_spider.ftl rename to webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/pages/create_spider.ftl diff --git a/webmagic-admin/src/main/webapp/WEB-INF/pages/dashboard.ftl b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/pages/dashboard.ftl similarity index 100% rename from webmagic-admin/src/main/webapp/WEB-INF/pages/dashboard.ftl rename to webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/pages/dashboard.ftl diff --git a/webmagic-admin/src/main/webapp/WEB-INF/pages/spider_list.ftl b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/pages/spider_list.ftl similarity index 100% rename from webmagic-admin/src/main/webapp/WEB-INF/pages/spider_list.ftl rename to webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/pages/spider_list.ftl diff --git a/webmagic-admin/src/main/webapp/WEB-INF/web.xml b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from webmagic-admin/src/main/webapp/WEB-INF/web.xml rename to webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-cerulean.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cerulean.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-cerulean.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cerulean.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-classic.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-classic.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-classic.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-classic.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-classic.min.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-classic.min.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-classic.min.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-classic.min.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-cyborg.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cyborg.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-cyborg.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cyborg.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-journal.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-journal.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-journal.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-journal.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-redy.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-redy.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-redy.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-redy.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-responsive.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-responsive.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-responsive.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-responsive.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-responsive.min.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-responsive.min.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-responsive.min.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-responsive.min.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-simplex.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-simplex.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-simplex.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-simplex.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-slate.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-slate.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-slate.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-slate.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-spacelab.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-spacelab.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-spacelab.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-spacelab.css diff --git a/webmagic-admin/src/main/webapp/static/css/bootstrap-united.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-united.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/bootstrap-united.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-united.css diff --git a/webmagic-admin/src/main/webapp/static/css/charisma-app.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/charisma-app.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/charisma-app.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/charisma-app.css diff --git a/webmagic-admin/src/main/webapp/static/css/chosen.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/chosen.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/chosen.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/chosen.css diff --git a/webmagic-admin/src/main/webapp/static/css/colorbox.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/colorbox.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/colorbox.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/colorbox.css diff --git a/webmagic-admin/src/main/webapp/static/css/elfinder.min.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/elfinder.min.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/elfinder.min.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/elfinder.min.css diff --git a/webmagic-admin/src/main/webapp/static/css/elfinder.theme.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/elfinder.theme.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/elfinder.theme.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/elfinder.theme.css diff --git a/webmagic-admin/src/main/webapp/static/css/fullcalendar.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/fullcalendar.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/fullcalendar.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/fullcalendar.css diff --git a/webmagic-admin/src/main/webapp/static/css/fullcalendar.print.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/fullcalendar.print.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/fullcalendar.print.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/fullcalendar.print.css diff --git a/webmagic-admin/src/main/webapp/static/css/jquery-ui-1.8.21.custom.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/jquery-ui-1.8.21.custom.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/jquery-ui-1.8.21.custom.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/jquery-ui-1.8.21.custom.css diff --git a/webmagic-admin/src/main/webapp/static/css/jquery.cleditor.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/jquery.cleditor.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/jquery.cleditor.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/jquery.cleditor.css diff --git a/webmagic-admin/src/main/webapp/static/css/jquery.iphone.toggle.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/jquery.iphone.toggle.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/jquery.iphone.toggle.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/jquery.iphone.toggle.css diff --git a/webmagic-admin/src/main/webapp/static/css/jquery.noty.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/jquery.noty.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/jquery.noty.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/jquery.noty.css diff --git a/webmagic-admin/src/main/webapp/static/css/noty_theme_default.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/noty_theme_default.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/noty_theme_default.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/noty_theme_default.css diff --git a/webmagic-admin/src/main/webapp/static/css/opa-icons.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/opa-icons.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/opa-icons.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/opa-icons.css diff --git a/webmagic-admin/src/main/webapp/static/css/uniform.default.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/uniform.default.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/uniform.default.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/uniform.default.css diff --git a/webmagic-admin/src/main/webapp/static/css/uploadify.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/uploadify.css similarity index 100% rename from webmagic-admin/src/main/webapp/static/css/uploadify.css rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/css/uploadify.css diff --git a/webmagic-admin/src/main/webapp/static/favicon.jpg b/webmagic-avalon/webmagic-admin/src/main/webapp/static/favicon.jpg similarity index 100% rename from webmagic-admin/src/main/webapp/static/favicon.jpg rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/favicon.jpg diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-alert.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-alert.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-alert.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-alert.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-button.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-button.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-button.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-button.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-carousel.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-carousel.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-carousel.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-carousel.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-collapse.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-collapse.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-collapse.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-collapse.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-dropdown.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-dropdown.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-dropdown.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-dropdown.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-modal.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-modal.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-modal.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-modal.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-popover.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-popover.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-popover.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-popover.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-scrollspy.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-scrollspy.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-scrollspy.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-scrollspy.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-tab.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-tab.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-tab.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-tab.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-toggle.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-toggle.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-toggle.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-toggle.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-tooltip.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-tooltip.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-tooltip.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-tooltip.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-tour.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-tour.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-tour.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-tour.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-transition.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-transition.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-transition.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-transition.js diff --git a/webmagic-admin/src/main/webapp/static/js/bootstrap-typeahead.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-typeahead.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/bootstrap-typeahead.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/bootstrap-typeahead.js diff --git a/webmagic-admin/src/main/webapp/static/js/charisma.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/charisma.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/charisma.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/charisma.js diff --git a/webmagic-admin/src/main/webapp/static/js/excanvas.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/excanvas.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/excanvas.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/excanvas.js diff --git a/webmagic-admin/src/main/webapp/static/js/fullcalendar.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/fullcalendar.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/fullcalendar.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/fullcalendar.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery-1.7.2.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery-1.7.2.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery-1.7.2.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery-1.7.2.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery-ui-1.8.21.custom.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery-ui-1.8.21.custom.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery-ui-1.8.21.custom.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery-ui-1.8.21.custom.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.autogrow-textarea.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.autogrow-textarea.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.autogrow-textarea.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.autogrow-textarea.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.chosen.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.chosen.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.chosen.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.chosen.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.cleditor.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.cleditor.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.cleditor.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.cleditor.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.colorbox.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.colorbox.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.colorbox.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.colorbox.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.cookie.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.cookie.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.cookie.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.cookie.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.dataTables.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.dataTables.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.dataTables.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.dataTables.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.elfinder.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.elfinder.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.elfinder.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.elfinder.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.flot.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.flot.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.flot.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.flot.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.flot.pie.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.flot.pie.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.flot.pie.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.flot.pie.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.flot.resize.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.flot.resize.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.flot.resize.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.flot.resize.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.flot.stack.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.flot.stack.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.flot.stack.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.flot.stack.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.history.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.history.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.history.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.history.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.iphone.toggle.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.iphone.toggle.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.iphone.toggle.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.iphone.toggle.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.noty.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.noty.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.noty.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.noty.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.raty.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.raty.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.raty.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.raty.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.uniform.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.uniform.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.uniform.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.uniform.min.js diff --git a/webmagic-admin/src/main/webapp/static/js/jquery.uploadify-3.1.min.js b/webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.uploadify-3.1.min.js similarity index 100% rename from webmagic-admin/src/main/webapp/static/js/jquery.uploadify-3.1.min.js rename to webmagic-avalon/webmagic-admin/src/main/webapp/static/js/jquery.uploadify-3.1.min.js diff --git a/webmagic-worker/README.md b/webmagic-avalon/webmagic-worker/README.md similarity index 100% rename from webmagic-worker/README.md rename to webmagic-avalon/webmagic-worker/README.md diff --git a/webmagic-worker/pom.xml b/webmagic-avalon/webmagic-worker/pom.xml similarity index 98% rename from webmagic-worker/pom.xml rename to webmagic-avalon/webmagic-worker/pom.xml index cf10ab56..fd8edd5b 100644 --- a/webmagic-worker/pom.xml +++ b/webmagic-avalon/webmagic-worker/pom.xml @@ -1,7 +1,7 @@ - webmagic-parent + webmagic-avalon us.codecraft 0.5.0-SNAPSHOT diff --git a/webmagic-worker/src/main/java/us/codecraft/webmagic/avalon/web/DashBoardController.java b/webmagic-avalon/webmagic-worker/src/main/java/us/codecraft/webmagic/avalon/web/DashBoardController.java similarity index 100% rename from webmagic-worker/src/main/java/us/codecraft/webmagic/avalon/web/DashBoardController.java rename to webmagic-avalon/webmagic-worker/src/main/java/us/codecraft/webmagic/avalon/web/DashBoardController.java diff --git a/webmagic-worker/src/main/java/us/codecraft/webmagic/avalon/web/SpiderController.java b/webmagic-avalon/webmagic-worker/src/main/java/us/codecraft/webmagic/avalon/web/SpiderController.java similarity index 100% rename from webmagic-worker/src/main/java/us/codecraft/webmagic/avalon/web/SpiderController.java rename to webmagic-avalon/webmagic-worker/src/main/java/us/codecraft/webmagic/avalon/web/SpiderController.java diff --git a/webmagic-worker/src/main/resources/freemarker.properties b/webmagic-avalon/webmagic-worker/src/main/resources/freemarker.properties similarity index 100% rename from webmagic-worker/src/main/resources/freemarker.properties rename to webmagic-avalon/webmagic-worker/src/main/resources/freemarker.properties diff --git a/webmagic-worker/src/main/resources/log/log4j.xml b/webmagic-avalon/webmagic-worker/src/main/resources/log/log4j.xml similarity index 100% rename from webmagic-worker/src/main/resources/log/log4j.xml rename to webmagic-avalon/webmagic-worker/src/main/resources/log/log4j.xml diff --git a/webmagic-worker/src/main/resources/spring/applicationContext-freemarker.xml b/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-freemarker.xml similarity index 100% rename from webmagic-worker/src/main/resources/spring/applicationContext-freemarker.xml rename to webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-freemarker.xml diff --git a/webmagic-worker/src/main/resources/spring/applicationContext-myBatis.xml b/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-myBatis.xml similarity index 100% rename from webmagic-worker/src/main/resources/spring/applicationContext-myBatis.xml rename to webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-myBatis.xml diff --git a/webmagic-worker/src/main/resources/spring/applicationContext.xml b/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext.xml similarity index 100% rename from webmagic-worker/src/main/resources/spring/applicationContext.xml rename to webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext.xml diff --git a/webmagic-worker/src/main/webapp/WEB-INF/jsp/404.jsp b/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/jsp/404.jsp similarity index 100% rename from webmagic-worker/src/main/webapp/WEB-INF/jsp/404.jsp rename to webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/jsp/404.jsp diff --git a/webmagic-worker/src/main/webapp/WEB-INF/jsp/500.jsp b/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/jsp/500.jsp similarity index 100% rename from webmagic-worker/src/main/webapp/WEB-INF/jsp/500.jsp rename to webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/jsp/500.jsp diff --git a/webmagic-worker/src/main/webapp/WEB-INF/web.xml b/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from webmagic-worker/src/main/webapp/WEB-INF/web.xml rename to webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml