Moved to prepare for master merge

talk2viren · Feb 12, 2016 · 5f5b0f1 · 5f5b0f1
1 parent edffd01
commit 5f5b0f1
Show file tree

Hide file tree

Showing 35 changed files with 0 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.classpath → simple-rss-portlet/.classpath b/.classpath → simple-rss-portlet/.classpath
diff --git a/.project → simple-rss-portlet/.project b/.project → simple-rss-portlet/.project
diff --git a/LICENSE → simple-rss-portlet/LICENSE b/LICENSE → simple-rss-portlet/LICENSE
diff --git a/NOTICE → simple-rss-portlet/NOTICE b/NOTICE → simple-rss-portlet/NOTICE
diff --git a/README.md → simple-rss-portlet/README.md b/README.md → simple-rss-portlet/README.md
diff --git a/docs/apache-license-2-template.txt → ...ortlet/docs/apache-license-2-template.txt b/docs/apache-license-2-template.txt → ...ortlet/docs/apache-license-2-template.txt
diff --git a/...hannel/example-rss-portlet-config.channel → ...hannel/example-rss-portlet-config.channel b/...hannel/example-rss-portlet-config.channel → ...hannel/example-rss-portlet-config.channel
diff --git a/docs/cpd/SimpleRSSPortlet.cpd → ...rss-portlet/docs/cpd/SimpleRSSPortlet.cpd b/docs/cpd/SimpleRSSPortlet.cpd → ...rss-portlet/docs/cpd/SimpleRSSPortlet.cpd
diff --git a/docs/type/rss.channel-type → ...le-rss-portlet/docs/type/rss.channel-type b/docs/type/rss.channel-type → ...le-rss-portlet/docs/type/rss.channel-type
diff --git a/pom.xml → simple-rss-portlet/pom.xml b/pom.xml → simple-rss-portlet/pom.xml
diff --git a/...u/anu/portal/portlets/rss/FeedParser.java → ...u/anu/portal/portlets/rss/FeedParser.java b/...u/anu/portal/portlets/rss/FeedParser.java → ...u/anu/portal/portlets/rss/FeedParser.java
diff --git a/...portal/portlets/rss/SimpleRSSPortlet.java → ...portal/portlets/rss/SimpleRSSPortlet.java b/...portal/portlets/rss/SimpleRSSPortlet.java → ...portal/portlets/rss/SimpleRSSPortlet.java
diff --git a/...portal/portlets/rss/model/Attachment.java → ...portal/portlets/rss/model/Attachment.java b/...portal/portlets/rss/model/Attachment.java → ...portal/portlets/rss/model/Attachment.java
diff --git a/.../portal/portlets/rss/utils/Constants.java → .../portal/portlets/rss/utils/Constants.java b/.../portal/portlets/rss/utils/Constants.java → .../portal/portlets/rss/utils/Constants.java
diff --git a/...u/portal/portlets/rss/utils/Messages.java → ...u/portal/portlets/rss/utils/Messages.java b/...u/portal/portlets/rss/utils/Messages.java → ...u/portal/portlets/rss/utils/Messages.java
diff --git a/...al/portlets/rss/utils/messages.properties → ...al/portlets/rss/utils/messages.properties b/...al/portlets/rss/utils/messages.properties → ...al/portlets/rss/utils/messages.properties
diff --git a/...portlets/rss/utils/messages_de.properties → ...portlets/rss/utils/messages_de.properties b/...portlets/rss/utils/messages_de.properties → ...portlets/rss/utils/messages_de.properties
diff --git a/...portlets/rss/utils/messages_es.properties → ...portlets/rss/utils/messages_es.properties b/...portlets/rss/utils/messages_es.properties → ...portlets/rss/utils/messages_es.properties
diff --git a/...portlets/rss/utils/messages_fr.properties → ...portlets/rss/utils/messages_fr.properties b/...portlets/rss/utils/messages_fr.properties → ...portlets/rss/utils/messages_fr.properties
diff --git a/...portlets/rss/utils/messages_ja.properties → ...portlets/rss/utils/messages_ja.properties b/...portlets/rss/utils/messages_ja.properties → ...portlets/rss/utils/messages_ja.properties
diff --git a/...portlets/rss/utils/messages_nl.properties → ...portlets/rss/utils/messages_nl.properties b/...portlets/rss/utils/messages_nl.properties → ...portlets/rss/utils/messages_nl.properties
diff --git a/...portlets/rss/utils/messages_pt.properties → ...portlets/rss/utils/messages_pt.properties b/...portlets/rss/utils/messages_pt.properties → ...portlets/rss/utils/messages_pt.properties
diff --git a/...portlets/rss/utils/messages_sv.properties → ...portlets/rss/utils/messages_sv.properties b/...portlets/rss/utils/messages_sv.properties → ...portlets/rss/utils/messages_sv.properties
diff --git a/...idator/SimpleRSSPreferencesValidator.java → ...idator/SimpleRSSPreferencesValidator.java b/...idator/SimpleRSSPreferencesValidator.java → ...idator/SimpleRSSPreferencesValidator.java
diff --git a/src/main/resources/ehcache.xml → ...ss-portlet/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml → ...ss-portlet/src/main/resources/ehcache.xml
diff --git a/src/main/resources/log4j.properties → ...rtlet/src/main/resources/log4j.properties b/src/main/resources/log4j.properties → ...rtlet/src/main/resources/log4j.properties
diff --git a/src/main/webapp/WEB-INF/portlet.xml → ...rtlet/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml → ...rtlet/src/main/webapp/WEB-INF/portlet.xml
diff --git a/...bapp/WEB-INF/sakai/simple-rss-portlet.xml → ...bapp/WEB-INF/sakai/simple-rss-portlet.xml b/...bapp/WEB-INF/sakai/simple-rss-portlet.xml → ...bapp/WEB-INF/sakai/simple-rss-portlet.xml
diff --git a/src/main/webapp/WEB-INF/web.xml → ...s-portlet/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml → ...s-portlet/src/main/webapp/WEB-INF/web.xml
diff --git a/src/main/webapp/css/simple-rss-portlet.css → ...rc/main/webapp/css/simple-rss-portlet.css b/src/main/webapp/css/simple-rss-portlet.css → ...rc/main/webapp/css/simple-rss-portlet.css
diff --git a/src/main/webapp/pages/edit.jsp → ...ss-portlet/src/main/webapp/pages/edit.jsp b/src/main/webapp/pages/edit.jsp → ...ss-portlet/src/main/webapp/pages/edit.jsp
diff --git a/src/main/webapp/pages/error.jsp → ...s-portlet/src/main/webapp/pages/error.jsp b/src/main/webapp/pages/error.jsp → ...s-portlet/src/main/webapp/pages/error.jsp
diff --git a/src/main/webapp/pages/nocontent.jsp → ...rtlet/src/main/webapp/pages/nocontent.jsp b/src/main/webapp/pages/nocontent.jsp → ...rtlet/src/main/webapp/pages/nocontent.jsp
diff --git a/src/main/webapp/pages/view.jsp → ...ss-portlet/src/main/webapp/pages/view.jsp b/src/main/webapp/pages/view.jsp → ...ss-portlet/src/main/webapp/pages/view.jsp