Updated to Maven structure

forge · Apr 8, 2015 · 5ed446e · 5ed446e
1 parent 407051e
commit 5ed446e
Show file tree

Hide file tree

Showing 131 changed files with 141 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-parent</artifactId>
+      <version>17</version>
+   </parent>
+   <groupId>org.jboss.forge.website</groupId>
+   <artifactId>website</artifactId>
+   <version>2.0.0-SNAPSHOT</version>
+   <packaging>war</packaging>
+   <properties>
+      <version.rewrite>2.0.12.Final</version.rewrite>
+      <version.prettytime>3.2.5.Final</version.prettytime>
+   </properties>
+   <dependencyManagement>
+      <dependencies>
+         <dependency>
+            <groupId>org.ocpsoft.rewrite</groupId>
+            <artifactId>rewrite-servlet</artifactId>
+            <version>${version.rewrite}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.ocpsoft.rewrite</groupId>
+            <artifactId>rewrite-integration-cdi</artifactId>
+            <version>${version.rewrite}</version>
+         </dependency>
+         <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>7.0</version>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
+   <dependencies>
+      <dependency>
+         <groupId>org.ocpsoft.rewrite</groupId>
+         <artifactId>rewrite-servlet</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.ocpsoft.rewrite</groupId>
+         <artifactId>rewrite-integration-cdi</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax</groupId>
+         <artifactId>javaee-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <!-- 
+      <dependency>
+         <groupId>org.webjars</groupId>
+         <artifactId>jquery</artifactId>
+         <version>1.10.2</version>
+      </dependency>
+      <dependency>
+         <groupId>org.webjars</groupId>
+         <artifactId>jquery-ui</artifactId>
+         <version>1.10.2</version>
+      </dependency>
+      <dependency>
+         <groupId>org.webjars</groupId>
+         <artifactId>bootstrap</artifactId>
+         <version>3.0.2</version>
+      </dependency>
+      <dependency>
+         <groupId>org.webjars</groupId>
+         <artifactId>modernizr</artifactId>
+         <version>2.6.2-1</version>
+      </dependency>
+       -->
+      <dependency>
+         <groupId>org.apache.httpcomponents</groupId>
+         <artifactId>httpclient</artifactId>
+         <version>4.3.1</version>
+      </dependency>
+      <dependency>
+         <groupId>org.yaml</groupId>
+         <artifactId>snakeyaml</artifactId>
+         <version>1.13</version>
+      </dependency>
+      <dependency>
+         <groupId>commons-codec</groupId>
+         <artifactId>commons-codec</artifactId>
+         <version>1.7</version>
+      </dependency>
+      <dependency>
+         <groupId>com.google.code.gson</groupId>
+         <artifactId>gson</artifactId>
+         <version>2.2.4</version>
+      </dependency>
+      <dependency>
+         <groupId>org.jsoup</groupId>
+         <artifactId>jsoup</artifactId>
+         <version>1.7.2</version>
+      </dependency>
+      <dependency>
+         <groupId>rome</groupId>
+         <artifactId>rome</artifactId>
+         <version>1.0</version>
+      </dependency>
+   </dependencies>
+   <profiles>
+      <profile>
+         <id>openshift</id>
+         <build>
+            <finalName>website</finalName>
+            <plugins>
+               <plugin>
+                  <artifactId>maven-war-plugin</artifactId>
+                  <configuration>
+                     <outputDirectory>deployments</outputDirectory>
+                     <warName>ROOT</warName>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+</project>
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+   <display-name>website</display-name>
+   <context-param>
+      <param-name>org.ocpsoft.rewrite.config.CONFIG_RELOADING</param-name>
+      <param-value>false</param-value>
+   </context-param>
+   <session-config>
+      <session-timeout>30</session-timeout>
+   </session-config>
+   <mime-mapping>
+      <extension>ico</extension>
+      <mime-type>image/icon</mime-type>
+   </mime-mapping>
+   <welcome-file-list>
+      <welcome-file>index.html</welcome-file>
+   </welcome-file-list>
+</web-app>
diff --git a/addons.html → src/main/webapp/addons.html b/addons.html → src/main/webapp/addons.html
diff --git a/community.html → src/main/webapp/community.html b/community.html → src/main/webapp/community.html
diff --git a/css/bootstrap-theme.css → src/main/webapp/css/bootstrap-theme.css b/css/bootstrap-theme.css → src/main/webapp/css/bootstrap-theme.css
diff --git a/css/bootstrap-theme.css.map → src/main/webapp/css/bootstrap-theme.css.map b/css/bootstrap-theme.css.map → src/main/webapp/css/bootstrap-theme.css.map
diff --git a/css/bootstrap-theme.min.css → src/main/webapp/css/bootstrap-theme.min.css b/css/bootstrap-theme.min.css → src/main/webapp/css/bootstrap-theme.min.css
diff --git a/css/bootstrap.css → src/main/webapp/css/bootstrap.css b/css/bootstrap.css → src/main/webapp/css/bootstrap.css
diff --git a/css/bootstrap.css.map → src/main/webapp/css/bootstrap.css.map b/css/bootstrap.css.map → src/main/webapp/css/bootstrap.css.map
diff --git a/css/bootstrap.min.css → src/main/webapp/css/bootstrap.min.css b/css/bootstrap.min.css → src/main/webapp/css/bootstrap.min.css
diff --git a/css/forge.css → src/main/webapp/css/forge.css b/css/forge.css → src/main/webapp/css/forge.css
diff --git a/css/forge_addons.css → src/main/webapp/css/forge_addons.css b/css/forge_addons.css → src/main/webapp/css/forge_addons.css
diff --git a/css/forge_community.css → src/main/webapp/css/forge_community.css b/css/forge_community.css → src/main/webapp/css/forge_community.css
diff --git a/css/forge_doc_pages.css → src/main/webapp/css/forge_doc_pages.css b/css/forge_doc_pages.css → src/main/webapp/css/forge_doc_pages.css
diff --git a/css/forge_documentation.css → src/main/webapp/css/forge_documentation.css b/css/forge_documentation.css → src/main/webapp/css/forge_documentation.css
diff --git a/css/forge_news.css → src/main/webapp/css/forge_news.css b/css/forge_news.css → src/main/webapp/css/forge_news.css
diff --git a/css/parallax-styles.css → src/main/webapp/css/parallax-styles.css b/css/parallax-styles.css → src/main/webapp/css/parallax-styles.css
diff --git a/css/testing.css → src/main/webapp/css/testing.css b/css/testing.css → src/main/webapp/css/testing.css
diff --git a/documentation.html → src/main/webapp/documentation.html b/documentation.html → src/main/webapp/documentation.html
diff --git a/documentation_page.html → src/main/webapp/documentation_page.html b/documentation_page.html → src/main/webapp/documentation_page.html
diff --git a/fonts/glyphicons-halflings-regular.eot → ...pp/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot → ...pp/fonts/glyphicons-halflings-regular.eot
diff --git a/fonts/glyphicons-halflings-regular.svg → ...pp/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg → ...pp/fonts/glyphicons-halflings-regular.svg
diff --git a/fonts/glyphicons-halflings-regular.ttf → ...pp/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf → ...pp/fonts/glyphicons-halflings-regular.ttf
diff --git a/fonts/glyphicons-halflings-regular.woff → ...p/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff → ...p/fonts/glyphicons-halflings-regular.woff
diff --git a/images/anvil_download_section_150x132.png → ...images/anvil_download_section_150x132.png b/images/anvil_download_section_150x132.png → ...images/anvil_download_section_150x132.png
diff --git a/images/anvil_download_section_300x264.png → ...images/anvil_download_section_300x264.png b/images/anvil_download_section_300x264.png → ...images/anvil_download_section_300x264.png
diff --git a/images/anvil_download_section_450x396.png → ...images/anvil_download_section_450x396.png b/images/anvil_download_section_450x396.png → ...images/anvil_download_section_450x396.png
diff --git a/images/anvil_image500x493.png → ...main/webapp/images/anvil_image500x493.png b/images/anvil_image500x493.png → ...main/webapp/images/anvil_image500x493.png
diff --git a/images/anvil_image880x868.png → ...main/webapp/images/anvil_image880x868.png b/images/anvil_image880x868.png → ...main/webapp/images/anvil_image880x868.png
diff --git a/images/anvil_medallion_170x170.png → ...webapp/images/anvil_medallion_170x170.png b/images/anvil_medallion_170x170.png → ...webapp/images/anvil_medallion_170x170.png
diff --git a/images/anvil_medallion_300x300.png → ...webapp/images/anvil_medallion_300x300.png b/images/anvil_medallion_300x300.png → ...webapp/images/anvil_medallion_300x300.png
diff --git a/images/bg-block-darkblue.png → src/main/webapp/images/bg-block-darkblue.png b/images/bg-block-darkblue.png → src/main/webapp/images/bg-block-darkblue.png
diff --git a/images/bg-block-grey.png → src/main/webapp/images/bg-block-grey.png b/images/bg-block-grey.png → src/main/webapp/images/bg-block-grey.png
diff --git a/images/bg-block-orange-horiz_20x10.png → ...pp/images/bg-block-orange-horiz_20x10.png b/images/bg-block-orange-horiz_20x10.png → ...pp/images/bg-block-orange-horiz_20x10.png
diff --git a/images/bg-block-orange-horiz_5x120.png → ...pp/images/bg-block-orange-horiz_5x120.png b/images/bg-block-orange-horiz_5x120.png → ...pp/images/bg-block-orange-horiz_5x120.png
diff --git a/images/bg-block-orange-horiz_5x40.png → ...app/images/bg-block-orange-horiz_5x40.png b/images/bg-block-orange-horiz_5x40.png → ...app/images/bg-block-orange-horiz_5x40.png
diff --git a/images/bg-block-orange-horiz_5x80.png → ...app/images/bg-block-orange-horiz_5x80.png b/images/bg-block-orange-horiz_5x80.png → ...app/images/bg-block-orange-horiz_5x80.png
diff --git a/images/bg-block-orange-ver_10x20.png → ...bapp/images/bg-block-orange-ver_10x20.png b/images/bg-block-orange-ver_10x20.png → ...bapp/images/bg-block-orange-ver_10x20.png
diff --git a/images/bg-block-orange-ver_4x20.png → ...ebapp/images/bg-block-orange-ver_4x20.png b/images/bg-block-orange-ver_4x20.png → ...ebapp/images/bg-block-orange-ver_4x20.png
diff --git a/images/bg-block-orange-ver_5x100.png → ...bapp/images/bg-block-orange-ver_5x100.png b/images/bg-block-orange-ver_5x100.png → ...bapp/images/bg-block-orange-ver_5x100.png
diff --git a/images/bg-block-orange-ver_5x110.png → ...bapp/images/bg-block-orange-ver_5x110.png b/images/bg-block-orange-ver_5x110.png → ...bapp/images/bg-block-orange-ver_5x110.png
diff --git a/images/bg-block-orange-ver_5x150.png → ...bapp/images/bg-block-orange-ver_5x150.png b/images/bg-block-orange-ver_5x150.png → ...bapp/images/bg-block-orange-ver_5x150.png
diff --git a/images/bg-block-orange-ver_5x40.png → ...ebapp/images/bg-block-orange-ver_5x40.png b/images/bg-block-orange-ver_5x40.png → ...ebapp/images/bg-block-orange-ver_5x40.png
diff --git a/images/bg-block-orange-ver_5x70.png → ...ebapp/images/bg-block-orange-ver_5x70.png b/images/bg-block-orange-ver_5x70.png → ...ebapp/images/bg-block-orange-ver_5x70.png
diff --git a/images/bg-block-orange.png → src/main/webapp/images/bg-block-orange.png b/images/bg-block-orange.png → src/main/webapp/images/bg-block-orange.png
diff --git a/images/checkbox_92x46.png → src/main/webapp/images/checkbox_92x46.png b/images/checkbox_92x46.png → src/main/webapp/images/checkbox_92x46.png
diff --git a/images/chevron-down-92x57.png → ...main/webapp/images/chevron-down-92x57.png b/images/chevron-down-92x57.png → ...main/webapp/images/chevron-down-92x57.png
diff --git a/images/close_x_108x216.png → src/main/webapp/images/close_x_108x216.png b/images/close_x_108x216.png → src/main/webapp/images/close_x_108x216.png
diff --git a/images/community-contrib-heart_100x100.png → ...mages/community-contrib-heart_100x100.png b/images/community-contrib-heart_100x100.png → ...mages/community-contrib-heart_100x100.png
diff --git a/images/community-flame_2000x1120.jpg → ...bapp/images/community-flame_2000x1120.jpg b/images/community-flame_2000x1120.jpg → ...bapp/images/community-flame_2000x1120.jpg
diff --git a/images/computer_396x216.png → src/main/webapp/images/computer_396x216.png b/images/computer_396x216.png → src/main/webapp/images/computer_396x216.png
diff --git a/images/core_addons_100x100.png → ...ain/webapp/images/core_addons_100x100.png b/images/core_addons_100x100.png → ...ain/webapp/images/core_addons_100x100.png
diff --git a/images/dark-blue-chevron-down-w-padding.png → ...ages/dark-blue-chevron-down-w-padding.png b/images/dark-blue-chevron-down-w-padding.png → ...ages/dark-blue-chevron-down-w-padding.png
diff --git a/images/dark-blue-chevron-down.png → .../webapp/images/dark-blue-chevron-down.png b/images/dark-blue-chevron-down.png → .../webapp/images/dark-blue-chevron-down.png
diff --git a/images/dark-blue-chevron-left-w-padding.png → ...ages/dark-blue-chevron-left-w-padding.png b/images/dark-blue-chevron-left-w-padding.png → ...ages/dark-blue-chevron-left-w-padding.png
diff --git a/images/dark-blue-chevron-right-w-padding.png → ...ges/dark-blue-chevron-right-w-padding.png b/images/dark-blue-chevron-right-w-padding.png → ...ges/dark-blue-chevron-right-w-padding.png
diff --git a/images/dark-blue-chevron-up-w-padding.png → ...images/dark-blue-chevron-up-w-padding.png b/images/dark-blue-chevron-up-w-padding.png → ...images/dark-blue-chevron-up-w-padding.png
diff --git a/images/dark-blue-overlay-75percent.png → ...pp/images/dark-blue-overlay-75percent.png b/images/dark-blue-overlay-75percent.png → ...pp/images/dark-blue-overlay-75percent.png
diff --git a/images/deltaspike_120x120.png → ...main/webapp/images/deltaspike_120x120.png b/images/deltaspike_120x120.png → ...main/webapp/images/deltaspike_120x120.png
diff --git a/images/documentation-welding-bg.jpg → ...ebapp/images/documentation-welding-bg.jpg b/images/documentation-welding-bg.jpg → ...ebapp/images/documentation-welding-bg.jpg
diff --git a/images/down-arrow-124x248.png → ...main/webapp/images/down-arrow-124x248.png b/images/down-arrow-124x248.png → ...main/webapp/images/down-arrow-124x248.png
diff --git a/images/down-arrow-248x496.png → ...main/webapp/images/down-arrow-248x496.png b/images/down-arrow-248x496.png → ...main/webapp/images/down-arrow-248x496.png
diff --git a/images/down-arrow-372x744.png → ...main/webapp/images/down-arrow-372x744.png b/images/down-arrow-372x744.png → ...main/webapp/images/down-arrow-372x744.png
diff --git a/images/down-arrow-large.png → src/main/webapp/images/down-arrow-large.png b/images/down-arrow-large.png → src/main/webapp/images/down-arrow-large.png
diff --git a/images/down-arrow-small.png → src/main/webapp/images/down-arrow-small.png b/images/down-arrow-small.png → src/main/webapp/images/down-arrow-small.png
diff --git a/images/facebook_60x120.png → src/main/webapp/images/facebook_60x120.png b/images/facebook_60x120.png → src/main/webapp/images/facebook_60x120.png
diff --git a/images/facebook_color_60x60.png → ...in/webapp/images/facebook_color_60x60.png b/images/facebook_color_60x60.png → ...in/webapp/images/facebook_color_60x60.png
diff --git a/images/fire-icon-faded.png → src/main/webapp/images/fire-icon-faded.png b/images/fire-icon-faded.png → src/main/webapp/images/fire-icon-faded.png
diff --git a/images/flag-french.png → src/main/webapp/images/flag-french.png b/images/flag-french.png → src/main/webapp/images/flag-french.png
diff --git a/images/flag-german.png → src/main/webapp/images/flag-german.png b/images/flag-german.png → src/main/webapp/images/flag-german.png
diff --git a/images/flag-japanese.png → src/main/webapp/images/flag-japanese.png b/images/flag-japanese.png → src/main/webapp/images/flag-japanese.png
diff --git a/images/flag-spanish.png → src/main/webapp/images/flag-spanish.png b/images/flag-spanish.png → src/main/webapp/images/flag-spanish.png
diff --git a/images/flag-usa.png → src/main/webapp/images/flag-usa.png b/images/flag-usa.png → src/main/webapp/images/flag-usa.png
diff --git a/images/forge-network_816x680.png → ...n/webapp/images/forge-network_816x680.png b/images/forge-network_816x680.png → ...n/webapp/images/forge-network_816x680.png
diff --git a/images/forge_120x120.png → src/main/webapp/images/forge_120x120.png b/images/forge_120x120.png → src/main/webapp/images/forge_120x120.png
diff --git a/images/forge_anvil_1020x592.jpg → ...in/webapp/images/forge_anvil_1020x592.jpg b/images/forge_anvil_1020x592.jpg → ...in/webapp/images/forge_anvil_1020x592.jpg
diff --git a/images/forge_logo_215x60.png → src/main/webapp/images/forge_logo_215x60.png b/images/forge_logo_215x60.png → src/main/webapp/images/forge_logo_215x60.png
diff --git a/images/forge_logo_430x120.png → ...main/webapp/images/forge_logo_430x120.png b/images/forge_logo_430x120.png → ...main/webapp/images/forge_logo_430x120.png
diff --git a/images/forge_logo_645x180.png → ...main/webapp/images/forge_logo_645x180.png b/images/forge_logo_645x180.png → ...main/webapp/images/forge_logo_645x180.png
diff --git a/images/forge_logo_no_anvil_138x60.png → ...app/images/forge_logo_no_anvil_138x60.png b/images/forge_logo_no_anvil_138x60.png → ...app/images/forge_logo_no_anvil_138x60.png
diff --git a/images/forge_logo_no_anvil_276x120.png → ...pp/images/forge_logo_no_anvil_276x120.png b/images/forge_logo_no_anvil_276x120.png → ...pp/images/forge_logo_no_anvil_276x120.png
diff --git a/images/forge_logo_no_anvil_414x180.png → ...pp/images/forge_logo_no_anvil_414x180.png b/images/forge_logo_no_anvil_414x180.png → ...pp/images/forge_logo_no_anvil_414x180.png
diff --git a/images/google_color_60x60.png → ...main/webapp/images/google_color_60x60.png b/images/google_color_60x60.png → ...main/webapp/images/google_color_60x60.png
diff --git a/images/googleplus_60x120.png → src/main/webapp/images/googleplus_60x120.png b/images/googleplus_60x120.png → src/main/webapp/images/googleplus_60x120.png
diff --git a/images/horiz-img-placeholder.jpg → ...n/webapp/images/horiz-img-placeholder.jpg b/images/horiz-img-placeholder.jpg → ...n/webapp/images/horiz-img-placeholder.jpg
diff --git a/images/instagram_72x72.png → src/main/webapp/images/instagram_72x72.png b/images/instagram_72x72.png → src/main/webapp/images/instagram_72x72.png
diff --git a/images/jboss_as_120x120.png → src/main/webapp/images/jboss_as_120x120.png b/images/jboss_as_120x120.png → src/main/webapp/images/jboss_as_120x120.png
diff --git a/images/level-one-beginner_73x73.png → ...ebapp/images/level-one-beginner_73x73.png b/images/level-one-beginner_73x73.png → ...ebapp/images/level-one-beginner_73x73.png
diff --git a/images/level-three-advanced.png → ...in/webapp/images/level-three-advanced.png b/images/level-three-advanced.png → ...in/webapp/images/level-three-advanced.png
diff --git a/images/level-two-intermediate.png → .../webapp/images/level-two-intermediate.png b/images/level-two-intermediate.png → .../webapp/images/level-two-intermediate.png
diff --git a/images/linkedin_60x120.png → src/main/webapp/images/linkedin_60x120.png b/images/linkedin_60x120.png → src/main/webapp/images/linkedin_60x120.png
diff --git a/images/linkedin_color_60x60.png → ...in/webapp/images/linkedin_color_60x60.png b/images/linkedin_color_60x60.png → ...in/webapp/images/linkedin_color_60x60.png
diff --git a/images/magnifying-glass-small.png → .../webapp/images/magnifying-glass-small.png b/images/magnifying-glass-small.png → .../webapp/images/magnifying-glass-small.png
diff --git a/images/magnifying-glass.png → src/main/webapp/images/magnifying-glass.png b/images/magnifying-glass.png → src/main/webapp/images/magnifying-glass.png
diff --git a/images/network_temp_1450x985.png → ...n/webapp/images/network_temp_1450x985.png b/images/network_temp_1450x985.png → ...n/webapp/images/network_temp_1450x985.png
diff --git a/images/network_temp_580x394.png → ...in/webapp/images/network_temp_580x394.png b/images/network_temp_580x394.png → ...in/webapp/images/network_temp_580x394.png
diff --git a/images/news-background-2000x900.jpg → ...ebapp/images/news-background-2000x900.jpg b/images/news-background-2000x900.jpg → ...ebapp/images/news-background-2000x900.jpg
diff --git a/images/place-img-300x300.jpg → src/main/webapp/images/place-img-300x300.jpg b/images/place-img-300x300.jpg → src/main/webapp/images/place-img-300x300.jpg
diff --git a/images/place-img-alt-300x300.jpg → ...n/webapp/images/place-img-alt-300x300.jpg b/images/place-img-alt-300x300.jpg → ...n/webapp/images/place-img-alt-300x300.jpg
diff --git a/images/right-arrow-124x248.png → ...ain/webapp/images/right-arrow-124x248.png b/images/right-arrow-124x248.png → ...ain/webapp/images/right-arrow-124x248.png
diff --git a/images/right-arrow-248x496.png → ...ain/webapp/images/right-arrow-248x496.png b/images/right-arrow-248x496.png → ...ain/webapp/images/right-arrow-248x496.png
diff --git a/images/small-grey-arrows.png → src/main/webapp/images/small-grey-arrows.png b/images/small-grey-arrows.png → src/main/webapp/images/small-grey-arrows.png
diff --git a/images/small-icon-notebook_32x32.png → ...bapp/images/small-icon-notebook_32x32.png b/images/small-icon-notebook_32x32.png → ...bapp/images/small-icon-notebook_32x32.png
diff --git a/images/small-icon-notepaper_32x32.png → ...app/images/small-icon-notepaper_32x32.png b/images/small-icon-notepaper_32x32.png → ...app/images/small-icon-notepaper_32x32.png
diff --git a/images/small-icon-talk-bubble_32x32.png → ...p/images/small-icon-talk-bubble_32x32.png b/images/small-icon-talk-bubble_32x32.png → ...p/images/small-icon-talk-bubble_32x32.png
diff --git a/images/sparks-bg-white-overlay.jpg → ...webapp/images/sparks-bg-white-overlay.jpg b/images/sparks-bg-white-overlay.jpg → ...webapp/images/sparks-bg-white-overlay.jpg
diff --git a/images/sparks_large_res.jpg → src/main/webapp/images/sparks_large_res.jpg b/images/sparks_large_res.jpg → src/main/webapp/images/sparks_large_res.jpg
diff --git a/images/sparks_med_res.jpg → src/main/webapp/images/sparks_med_res.jpg b/images/sparks_med_res.jpg → src/main/webapp/images/sparks_med_res.jpg
diff --git a/images/sponsored_addons_100x100.png → ...ebapp/images/sponsored_addons_100x100.png b/images/sponsored_addons_100x100.png → ...ebapp/images/sponsored_addons_100x100.png
diff --git a/images/twitter_60x120.png → src/main/webapp/images/twitter_60x120.png b/images/twitter_60x120.png → src/main/webapp/images/twitter_60x120.png
diff --git a/images/twitter_color_60x60.png → ...ain/webapp/images/twitter_color_60x60.png b/images/twitter_color_60x60.png → ...ain/webapp/images/twitter_color_60x60.png
diff --git a/images/white-chevron-down-outline_120x72.png → ...ges/white-chevron-down-outline_120x72.png b/images/white-chevron-down-outline_120x72.png → ...ges/white-chevron-down-outline_120x72.png
diff --git a/images/white-chevron-down_120x72.png → ...bapp/images/white-chevron-down_120x72.png b/images/white-chevron-down_120x72.png → ...bapp/images/white-chevron-down_120x72.png
diff --git a/images/white-chevron-up-outline_120x72.png → ...mages/white-chevron-up-outline_120x72.png b/images/white-chevron-up-outline_120x72.png → ...mages/white-chevron-up-outline_120x72.png
diff --git a/images/white-chevron-up.png → src/main/webapp/images/white-chevron-up.png b/images/white-chevron-up.png → src/main/webapp/images/white-chevron-up.png
diff --git a/images/white_sparks_large_res.jpg → .../webapp/images/white_sparks_large_res.jpg b/images/white_sparks_large_res.jpg → .../webapp/images/white_sparks_large_res.jpg
diff --git a/images/white_sparks_med_res.jpg → ...in/webapp/images/white_sparks_med_res.jpg b/images/white_sparks_med_res.jpg → ...in/webapp/images/white_sparks_med_res.jpg
diff --git a/images/youtube_60x120.png → src/main/webapp/images/youtube_60x120.png b/images/youtube_60x120.png → src/main/webapp/images/youtube_60x120.png
diff --git a/images/youtube_color_60x60.png → ...ain/webapp/images/youtube_color_60x60.png b/images/youtube_color_60x60.png → ...ain/webapp/images/youtube_color_60x60.png
diff --git a/index.html → src/main/webapp/index.html b/index.html → src/main/webapp/index.html
diff --git a/js/bootstrap.js → src/main/webapp/js/bootstrap.js b/js/bootstrap.js → src/main/webapp/js/bootstrap.js
diff --git a/js/bootstrap.min.js → src/main/webapp/js/bootstrap.min.js b/js/bootstrap.min.js → src/main/webapp/js/bootstrap.min.js
diff --git a/js/forge.jquery.js → src/main/webapp/js/forge.jquery.js b/js/forge.jquery.js → src/main/webapp/js/forge.jquery.js
diff --git a/js/ie10-viewport-bug-workaround.js → ...webapp/js/ie10-viewport-bug-workaround.js b/js/ie10-viewport-bug-workaround.js → ...webapp/js/ie10-viewport-bug-workaround.js
diff --git a/js/jquery-1.11.1.min.js → src/main/webapp/js/jquery-1.11.1.min.js b/js/jquery-1.11.1.min.js → src/main/webapp/js/jquery-1.11.1.min.js
diff --git a/js/jquery.2.1.3.min.js → src/main/webapp/js/jquery.2.1.3.min.js b/js/jquery.2.1.3.min.js → src/main/webapp/js/jquery.2.1.3.min.js
diff --git a/js/jquery.parallax.min.js → src/main/webapp/js/jquery.parallax.min.js b/js/jquery.parallax.min.js → src/main/webapp/js/jquery.parallax.min.js
diff --git a/js/jquery.touchSwipe.min.js → src/main/webapp/js/jquery.touchSwipe.min.js b/js/jquery.touchSwipe.min.js → src/main/webapp/js/jquery.touchSwipe.min.js
diff --git a/js/parallax.min.js → src/main/webapp/js/parallax.min.js b/js/parallax.min.js → src/main/webapp/js/parallax.min.js
diff --git a/news_main.html → src/main/webapp/news_main.html b/news_main.html → src/main/webapp/news_main.html
diff --git a/news_page.html → src/main/webapp/news_page.html b/news_page.html → src/main/webapp/news_page.html