Merge pull request #370 from devgateway/3.x/devgateway-open-source-repo

(3.x) Build setup updates

Author: mpostelnicu

forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/AbstractEditPage.java

@@ -581,7 +581,7 @@ protected void onInitialize() {
         if (model != null) {
             editForm.setCompoundPropertyModel(model);
         }
-        
+
         afterLoad(model);
     }
 

forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/reports/AbstractReportPage.java

@@ -39,7 +39,6 @@
 import org.devgateway.toolkit.forms.wicket.styles.BlockUiReportsJavaScript;
 import org.devgateway.toolkit.forms.wicket.styles.ReportsStyles;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -75,7 +74,7 @@ public abstract class AbstractReportPage extends BasePage {
     @SpringBean
     protected MarkupCacheService markupCacheService;
 
-    /**
+    /*
      * A special Wicket panel that displays the stream coming from Pentaho's
      * {@link AbstractReportProcessor}
      */
@@ -315,7 +314,7 @@ public Component getLazyLoadComponent(final String id) {
      */
     public abstract Map<String, Object> getReportParameters();
 
-    /**
+    /*
      * Generates the report in the specified <code>outputType</code> and writes
      * it into the specified <code>outputStream</code>.
      *

forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/reports/WicketResourceURLRewriter.java

@@ -10,7 +10,7 @@
  * Development Gateway - initial API and implementation
  *******************************************************************************/
 /**
- * 
+ *
  */
 package org.devgateway.toolkit.forms.wicket.page.reports;
 
@@ -19,7 +19,7 @@
 import org.apache.wicket.request.resource.SharedResourceReference;
 import org.devgateway.toolkit.forms.util.FolderContentResource;
 
-/**
+/*
  * @author mpostelnicu This {@link URLRewriter} will translate local folder
  *         resources into wicket encoded resources using the
  *         {@link SharedResourceReference} to {@link FolderContentResource}
@@ -31,7 +31,7 @@ public class WicketResourceURLRewriter {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.pentaho.reporting.engine.classic.core.modules.output.table.html.
      * URLRewriter
      * #rewrite(org.pentaho.reporting.libraries.repository.ContentEntity,

pom.xml

@@ -1,11 +1,11 @@
 <!--
     Copyright (c) 2015 Development Gateway, Inc and others.
-   
+
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the MIT License (MIT)
     which accompanies this distribution, and is available at
     https://opensource.org/licenses/MIT
-   
+
     Contributors:
     Development Gateway - initial API and implementation
  -->
@@ -83,37 +83,17 @@
             <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
         </repository>
         <repository>
-            <id>jcenter</id>
-            <url>https://jcenter.bintray.com/</url>
-        </repository>
-        <repository>
-            <id>DGToolkit</id>
-            <name>DGToolkit</name>
-            <url>http://artifactory.ampdev.net/artifactory/dg-toolkit/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>bintray-devgateway-dozer-hibernate-model</id>
-            <name>bintray</name>
-            <url>https://dl.bintray.com/devgateway/dozer-hibernate-model</url>
+            <id>devgateway-open-source</id>
+            <name>devgateway-open-source</name>
+            <url>https://artifactory.dgdev.org/artifactory/devgateway-open-source/</url>
         </repository>
     </repositories>
 
     <pluginRepositories>
         <pluginRepository>
-            <id>jcenter</id>
-            <name>jcenter</name>
-            <url>https://jcenter.bintray.com</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>DGToolkit</id>
-            <name>DGToolkit</name>
-            <url>http://artifactory.ampdev.net/artifactory/dg-toolkit/</url>
+            <id>devgateway-open-source</id>
+            <name>devgateway-open-source</name>
+            <url>https://artifactory.dgdev.org/artifactory/devgateway-open-source/</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>