You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/05/26 21:11:28 UTC

svn commit: r1486448 - in /incubator/jspwiki/branches/MVN3_BRANCH: ChangeLog OldChangeLog jspwiki-war/DISCLAIMER jspwiki-war/KEYS jspwiki-war/LICENSE jspwiki-war/NOTICE jspwiki-war/README jspwiki-war/ReleaseNotes jspwiki-war/UPGRADING

Author: juanpablo
Date: Sun May 26 19:11:27 2013
New Revision: 1486448

URL: http://svn.apache.org/r1486448
Log:
removed duplicated files, updated ChangeLog with jspwiki-war/ChangeLog

Removed:
    incubator/jspwiki/branches/MVN3_BRANCH/OldChangeLog
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/DISCLAIMER
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/KEYS
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/LICENSE
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/NOTICE
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/README
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/ReleaseNotes
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/UPGRADING
Modified:
    incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog

Modified: incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog?rev=1486448&r1=1486447&r2=1486448&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog Sun May 26 19:11:27 2013
@@ -1,10 +1,220 @@
+2013-05-23  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-14
+       
+       * Had Ant webtests and dist targets now write
+         to target/ant-webtests and target/ant-dist
+         respectively instead of non-Mavenized folder
+       * Removed ant clean target in favor
+         of mvn clean. 
+
+       * Selenium tests folder moved to 
+         src/test/config; deleted now-unused tests folder.
+
+2013-05-23  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-13
+       
+       * Adjusted exclusions in Apache Rat, nonvital
+         i18n stuff removed from build.xml, HSQLDB now
+         writing temp files to target instead of base
+         directory (easier to remove that way).
+
+2013-05-23  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-12
+       
+       * Removed Cobertura and Sonar tasks from Ant build
+         and placed into Maven project (relying on config
+         in MVN3_BRANCH with comments added.)
+
+2013-05-23  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-11
+       
+       * Remove unused .externalToolBuilders, .fbprefs folders
+         OldChangeLog out of root directory and now under config/dev,
+         build.properties deleted, JDBC config notes moved from
+         build.xml to JDBCUserDatabase.java, removed no longer used
+         etc/WEB-INF folder, jartests target gone from build.xml. 
+
+2013-05-22  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-10
+       
+       * Removed the war target from the Ant build.xml, 
+         the Ant webtests and dist targets run fine with
+         the results from mvn clean install.
+
+2013-05-22  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-9
+       
+       * Removed the unit test targets from the Ant build.xml, 
+         the Ant war, webtests, and dist targets run 
+         fine with the results from mvn clean install.
+
+2013-05-22  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-8
+       
+       * Removed the Compile and Compile test targets from the Ant 
+         build.xml, the Ant tests, war, webtests, and dist targets
+         run fine with the results from mvn clean install.
+
+2013-05-22  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-7
+       
+       * Moved the javadoc and Rat plugins from MVN3_BRANCH to 
+         trunk and removed corresponding javadoc and rat code from
+         the Ant script; "ant dist" will now use the javadoc generated
+         from Maven.  Note additional configuration for javadoc plugin 
+         still present in MVN3_BRANCH; that can be moved over as part
+         of the move to submodules.
+
+2013-05-22  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-6
+       
+       * Moved to one source of record for JSPWiki's 
+         dependencies (the Maven pom.xml file), it will
+         now be needed to run "mvn clean install [-Dmaven.test.skip]"
+         prior to running any of the Ant tasks, in
+         order to download the necessary libs.
+
+       * Added maven-eclipse-plugin to pom.xml to create necessary
+         Eclipse .project/.settings/.classpath settings upon calling
+         mvn eclipse:clean eclipse:eclipse and removed corresponding
+         folders in SVN repository. (IDEA users use mvn idea:idea
+         instead.)
+
+2013-05-22  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-5
+       
+       * Mavenized location of doc directory; rat, javadoc,
+         and releases folder now under target.         
+
+2013-05-20  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-4
+       
+       * Mavenized location of src/wikipages files
+
+2013-05-19  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-3
+       
+       * Mavenized location of src/webdocs files
+
+2013-05-18  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-2
+       
+       * Mavenized locations of remaining etc/ files.
+       * Defaulting storageDir to same "jspwiki-files" dir as pageDir.
+
+2013-05-18  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-1
+       
+       * Removed filtering within DB and DB test creation scripts although 
+         retained it within JDBC[User|Group]Database.java for users
+         wishing to use different table/column names.
+
+2013-05-16  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-0
+       
+       * Mavenized location of jdbc.properties.tmpl, routed JDBC tests 
+         from tests/etc/db to target/etc/db, removed unused Ant API-difference
+         detector & switched to Maven Clirr plugin equivalent.
+
+2013-05-06  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.1-incubating-10
+       
+       * Mavenized locations of most tests/etc/ files -> src/test/resources
+
+2013-05-03  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * 2.9.1-incubating-9
+       
+       * Refactored TemplateManager#listLanguages(PageContext pageContext) so it doesn't search for 
+         i18n files under a specific jar filename
+       
+2013-05-03 Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.1-incubating-8
+
+       * Moved test jspwiki{_vers, _rcs}.properties, filter.xml to Maven test/resources
+         location; activated Maven filtering for those files and updated build.xml and
+         pom.xml to point to new location for these files. 
+
+2013-05-02 Glen Mazza (gmazza AT apache DOT org)
+
+       * Removed install.sh, build.sh/build.bat/build.properties.win, moved latter's
+         info into build.properties.
+
+       * slight renaming of web.xml files generated in build.xml for readability
+
+       * Added Maven-only filters.properties to src/main/filters (not yet used)
+        
+2013-04-30 Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.1-incubating-7
+
+       * Moved WAR resources from previous commit to correct src/main/webapps/WEB-INF location, fixed pom.xml
+         to stop duplicating those resources in both webapps and webapps/WEB-INF
+         
+
+2013-04-30 Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.1-incubating-6
+
+       * Moved WAR resources that don't require modification from etc/ to Mavenized src/main/webapps location.
+         
+       * removed unused etc/dtd folder
+
+2013-04-29 Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.1-incubating-5
+
+       * Moved i18n resource files to Mavenized location.
+         
+       * Updated build.xml and pom.xml for new i18n source locations
+
+2013-04-25 Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.1-incubating-4
+
+       * Moved ini folders from etc/ and tests/etc to 
+         Mavenized locations src/[main|test]/resources/ini
+         
+       * Updated build.xml and pom.xml for new ini source locations
+
+2013-04-24 Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.1-incubating-3
+
+       * Moved JSPWiki source and test source to Mavenized locations
+         
+       * Updated build.xml and pom.xml for new JSPWiki source locations
+
+2013-04-23  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.9.1-incubating-2
+
+       * JSPWIKI-775, fixing "null" change-notes in PageInfo.jsp.
+
 2013-04-21  Harry Metske <me...@apache.org>
 
        * 2.9.1-incubating-1
 
        * fixed JSPWIKI-396): UTF-8 characters in wiki pages incorrectly rendered if served by Tomcat
 
-2013-04-14 Glen Mazza (glenmazza AT apache DOT org)
+2013-04-14 Glen Mazza (gmazza AT apache DOT org)
 
        * Start of Selenium plugin (just testing prior to it moving into its own module)
          
@@ -16,25 +226,25 @@
 
        * 2.9.1-incubating-0
        
-2013-04-04 Glen Mazza (glenmazza AT apache DOT org)
+2013-04-04 Glen Mazza (gmazza AT apache DOT org)
 
        * Updated pom.xml by removing Jaxen transitive dependencies and providing
          comments on how to deploy via tomcat7:run-war and tomcat7:redeploy
 
-2013-04-02 Glen Mazza (glenmazza AT apache DOT org)
+2013-04-02 Glen Mazza (gmazza AT apache DOT org)
 
        * Removed apparently unused stripes library from WAR created by build.xml
 
        * Updated Maven WAR plugin to bring in WEB-INF artifacts: classes, JARs, etc.
 
-2013-04-01 Glen Mazza (glenmazza AT apache DOT org)
+2013-04-01 Glen Mazza (gmazza AT apache DOT org)
 
        * Added YUICompressor Maven plugin into pom.xml to do the same compression
          done by the Ant build script to CSS and JS files in webdocs/scripts and /templates
 
        * Updated Maven WAR plugin to bring in the webdocs/scripts and /templates files.
 
-2013-03-24 Glen Mazza (glenmazza AT apache DOT org)
+2013-03-24 Glen Mazza (gmazza AT apache DOT org)
 
        * Removed empty src/applets folder
 
@@ -57,7 +267,7 @@
 
        * fixed JSPWIKI-765): lucene search returns 3 results at max, discovered by Dave Koelmeyer
 
-2013-03-06 Glen Mazza (glenmazza AT apache DOT org)
+2013-03-06 Glen Mazza (gmazza AT apache DOT org)
 
        * Upgraded Maven's tomcat plugin to latest version 2.1