xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r1629261 - in /xmlgraphics/commons/trunk: ./ lib/build/
Date Fri, 03 Oct 2014 17:10:34 GMT
Author: vhennebert
Date: Fri Oct  3 17:10:33 2014
New Revision: 1629261

URL: http://svn.apache.org/r1629261
Log:
Merged branch commons-2_0 back to trunk

Added:
    xmlgraphics/commons/trunk/lib/build/resolver-1.2.LICENSE.txt
      - copied unchanged from r1629260, xmlgraphics/commons/tags/commons-2_0/lib/build/resolver-1.2.LICENSE.txt
    xmlgraphics/commons/trunk/lib/build/resolver-1.2.NOTICE.txt
      - copied unchanged from r1629260, xmlgraphics/commons/tags/commons-2_0/lib/build/resolver-1.2.NOTICE.txt
    xmlgraphics/commons/trunk/lib/build/resolver-1.2.jar
      - copied unchanged from r1629260, xmlgraphics/commons/tags/commons-2_0/lib/build/resolver-1.2.jar
Removed:
    xmlgraphics/commons/trunk/lib/build/resolver.LICENSE.txt
    xmlgraphics/commons/trunk/lib/build/resolver.NOTICE.txt
    xmlgraphics/commons/trunk/lib/build/resolver.jar
Modified:
    xmlgraphics/commons/trunk/   (props changed)
    xmlgraphics/commons/trunk/KEYS
    xmlgraphics/commons/trunk/NOTICE
    xmlgraphics/commons/trunk/README
    xmlgraphics/commons/trunk/build.xml

Propchange: xmlgraphics/commons/trunk/
------------------------------------------------------------------------------
  Merged /xmlgraphics/commons/branches/commons-2_0:r1628213-1628284,1628286-1628667
  Merged /xmlgraphics/commons/tags/commons-2_0:r1628668-1629260

Modified: xmlgraphics/commons/trunk/KEYS
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/KEYS?rev=1629261&r1=1629260&r2=1629261&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/KEYS (original)
+++ xmlgraphics/commons/trunk/KEYS Fri Oct  3 17:10:33 2014
@@ -21,6 +21,10 @@ pub   1024D/CC31AE97 2008-03-27 [expires
 uid                  Maximilian Berger <maxberger@apache.org>
 pub   1024R/C93C5700 2008-07-12
 uid                  Maximilian Berger <maxberger@apache.org>
+pub   4096R/72FA275A 2014-07-22
+uid                  Vincent Hennebert <vhennebert@apache.org>
+sub   4096R/EC50D2FD 2014-07-22
+
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.0.6 (GNU/Linux)
@@ -363,3 +367,56 @@ kFYW+vgKUMA8UrJ6j2Hk+vMFi0Odtntbc7AXvLif
 0Bl+bnb7FLxJjJGlGuO/Rn5SIR3fFNQGrE/zl2wsKtftUXse6kkZSue+
 =XDBB
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFPO06wBEADhHglUaaLI6Nk+CUkpKMRWtVScsljRTmS16wxTdJ22kHgzkVYq
+jomMDI2jAs0Bx//ju8Khsn3zZ/ipPVPgr9Wg3cwmnrmBDUP1qT34t0UQwBzot6PZ
+YHY2sGvCaIPbuh8ZOIbT7u73ir9L+pNl+BmeCPDGV7H++71HxvCAW+2fEjwo+14K
+Vua7HR/cwDa7DqnWXCLON7XMJmrzCr2YcKhyF9qAcMOyu/Y67yXEmlest6L/Nybm
+tuY8g9EBz3iyQ7Ahc6KPRw9uWTRwuUhQlEDRnqOgUGGwijBj6dArLCkK5Y4Uq/2w
+1MbWzjMcNVQO3nZJIhatczcvBWjR0MfdW5Px+lpdVanOTNPYz3lNsOcVr3UQEvJR
+T8sPB3qTRu/inQJ2HJwzh490z/FnCfGepxB+36RaEjy06vBTZYWH77adg1eklUQF
+h4pQq/mbEZvL/g1O3bWlUnWw/Xz1oBO/K8yqaryEEdTjcEVDXrvz3xDRSmXmZiei
+hcSbNuvEvZI8l4Pe3dDwkSeJxKpaIGgZfPZH833Uder3R8rO+WJynpNKdHChrDTN
++y3CqOVNtmdd9Cf3mFS91U89ul0wqrGyESV0180FsRBMLTQX6xsGARpGZg+DW4DB
+MhidUJbTOT7C0LYK39mimgFlzM+oN0tfU7tfYsNWzjsPJ5Rni/KGc9s8vQARAQAB
+tClWaW5jZW50IEhlbm5lYmVydCA8dmhlbm5lYmVydEBhcGFjaGUub3JnPokCOAQT
+AQIAIgUCU87TrAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ720xx3L6
+J1p8eg/+MkA0oWfP3SV47QtVxXSywCTGn1oN9R1k+iw+FHFitJ2u3dfZpVWbySSv
+o49OhlR5YoQjA5aR4hXpicSmu0DJyBbZQBHjzllZC8CcU810uwT5E7qMD6rKviwk
+cKM+q2ntI0yfZ0wI8rHWtTIV9FV0Y3YNuHoIPP86gyDTmNOMX5lR5EXGPYLZdD6e
+NTMzu5VlQoW11AgXx5N+2qbRVD07v9nJpbl8c76/9A4eahVSXV9nhFsP2PFuEsDu
+/EbszLALevu/ieE2delBpXcOErZsn4Tkg56pebOS4kjitERvzb5axAskulhQVVF0
+DTUOq21d77pD7Al6qRHODFH3hPGjCsk/2h8yVs1SK/IKRHR7LE5IP9EfVazJmOZa
+/7DQ1my5WGD61/i2qa4hXYmDVTNEUWfJ5eSZ9Newm8pwa4pAVx2umOLe0xqxbUnk
+SzbZGXKREIFOiDh0XA9VN7yNUWAFs6T49NsCHzn6q138I2Pp8hVL8Q142ywu5OLH
+RDNTYfJZ0qLV/UyQv53g0zss2OkJz/r9WL7feWNtj15N3jJj+SCtj4f7PsJ5O7GX
+LFWBV7HrXhfNQxwaRoE6ksDshW/AVIJ7mwNu4tXmXksFYd32VVHoHL+ppOqRo9aV
+iN5aRt6CJFWYk4CU47rm7Vfgp9RRCXJyen8vM+KOe8gfIMG7g/OIRgQQEQIABgUC
+U87YHgAKCRCgctTQQ1jFhA3gAJ9P8I4e6oTZrE7MPF0f+VlxW06BvQCfect5XgkZ
+SjzjS7htUjNUApEcbN25Ag0EU87TrAEQAJ34nOX/79PUAl8kAyyPl/3V2My0DxnB
+gyXwYne47fQxwYne1EWljO90KGRKiJoarClUZ3/QkD0jArGRgLKK2kEAF1RIkLdz
+xNYE/weo7vc2rjRePSsGieE1Jy5aZHZkejaD95d/8Ve39qZqc17wWwF1ccw2OFlZ
+e0Z4rwLo4f1nNrRoI+RHeB/2vdwYGdQRWQ8IQVCkEZs41wFh9XUVuM/SpY7+Tet7
+pL/NsSy0YmyXae0mHMOn1pXq0/K0zXZGy54EDD2flvyZhai+t+I/+R0xElrFsBDo
+gt291s9YGPLJaQOHKXS9vxwUp7nj64rkE4fo5ogCSP+4WReZRfJaz+8tee3NE1zM
+JHuc7oolZKUpxJlBmKrFs9qZCvAnpkrBcIZgUwiEqgZP8ptGXvcle9fqcIhpvqDo
+NRyW98cGQZOe9QwV9tCnBtSFMnoUFUXuvfy3stEBBWLYSWABip98W75TO8tVn8DG
+SX3ApIpIIBhUmnDR3RWN9N/5AFTiDLr/Ux+mUBM7u7vTImMvuQF8+UNxXCg//rmg
+vtYtMQ8Jv1k6V7RPbjEbkRXNt+JIpxSy5rQo/USEJxiwoiQKq5blGrBxURWS4jQs
+Vc/Mhh9OUdDftqyH4ZHgNbbzgTu9y9CCloD4N0gzGTjqPFvLpKMuiv3IKKlHe9wC
+Vtjq2eShQOxvABEBAAGJAh8EGAECAAkFAlPO06wCGwwACgkQ720xx3L6J1qAzw/+
+PQ1gpXiNz4+6GJqDWhtmzbPpg5XVUMkO1fCyaqdJu7QmQhZQo3ZNtqqq7zm2PuA8
+/HJEzbzq6s7jB+qiR7lsLIzqiXVTe0kBpjva8PbPf9m8o7sm79hDwIhxuP0vac+6
+bpdpbzuEQ9VczVVgz1UruHhfA2Jgd67D9gXykQCNWWTewZ6MX0bWUQFkI0kIcFSq
+QqPMoHBm1LNef6sUg+bCDn1lGiXZZYeMkbeMZ7zlsqERBijFGfAatyjUk/I/W/R6
+o9ZKHsWJTLYg9oKTzwYYErHXoDm0wYehGC8vhMlc4QpCx0HrLBl2w+br7AErfKO9
+5g/YF1lotpsgFm8gswmED0+8qM9xm7JbJah3ahv6anttk7FjUOxgcclMNf+8ZW8l
+oKnOev7LmF9pBLBZ2YYZPl/GOU/x5aRqU12qmxeHwPp1hZ0C7kngkhtlR/WGuWp3
+FfAihujJYCm/OLL/sfZYJcC1W1w5Q/tJsoVlwCuAJLifpHxvNcScdLYLfSVFX7L+
+WZd4RVs2TDptk5ovcQk0GnlMK090aGE8nV3+oV72wssjWlMycKfQnCN2fP/DvHic
+C7ntv74LfH+9sIY9lrW3mqPSUqBpEkVQvWfO5yaABDyKWQKbL0oTIOqwDSqOw0Ll
+Jb8/mPX9jDboY95OyNYZ8D7o+lwQFeUbNwQp/qCS52g=
+=zlG2
+-----END PGP PUBLIC KEY BLOCK-----

Modified: xmlgraphics/commons/trunk/NOTICE
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/NOTICE?rev=1629261&r1=1629260&r2=1629261&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/NOTICE (original)
+++ xmlgraphics/commons/trunk/NOTICE Fri Oct  3 17:10:33 2014
@@ -1,5 +1,5 @@
 Apache XML Graphics Commons
-Copyright 2006-2012 The Apache Software Foundation
+Copyright 2006-2014 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: xmlgraphics/commons/trunk/README
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/README?rev=1629261&r1=1629260&r2=1629261&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/README (original)
+++ xmlgraphics/commons/trunk/README Fri Oct  3 17:10:33 2014
@@ -33,7 +33,8 @@ Please subscribe to the general@xmlgraph
 an empty mail to general-subscribe@xmlgraphics.apache.org. All you questions
 about XML Graphics Commons will be answered there.    
 
-Please report bugs to bugzilla at http://issues.apache.org/bugzilla/
+Please report bugs to JIRA at http://issues.apache.org/jira/ (project
+XMLGraphicsCommons).
 
 
 How do I build Apache XML Graphics Commons?
@@ -81,6 +82,15 @@ License labeling (according to http://ww
 For more detailed info about the changes, please see:
 http://xmlgraphics.apache.org/commons/changes.html
 
+Version 2.0
+--------------
+
+The main new feature is the introduction of a URI resolution framework that
+makes it easier to control resource access in a cloud environment. Because of
+changes to the API, the version number has been bumped to 2.0.
+
+This release also contains a number of bug fixes.
+
 Version 1.5
 --------------
 

Modified: xmlgraphics/commons/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/build.xml?rev=1629261&r1=1629260&r2=1629261&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/build.xml (original)
+++ xmlgraphics/commons/trunk/build.xml Fri Oct  3 17:10:33 2014
@@ -25,7 +25,7 @@
 
   <property name="Name" value="Apache XML Graphics Commons"/>
   <property name="name" value="xmlgraphics-commons"/>
-  <property name="year" value="1999-2012"/>
+  <property name="year" value="1999-2014"/>
 
   <property name="javac.debug" value="on"/>
   <property name="javac.optimize" value="off"/>
@@ -106,6 +106,7 @@
       <include name="lib/build/hamcrest.core*"/>
       <include name="lib/build/mockito-core*"/>
       <include name="lib/build/objenesis*"/>
+      <include name="lib/build/resolver*"/>
     </patternset>
   </fileset>
 
@@ -122,7 +123,6 @@
     <include name="status.xml"/>
     <include name="*.pom"/>
     <include name="build.*"/>
-    <include name="forrest.*"/>
     <include name="checkstyle*"/>
     <exclude name="checkstyle-noframes.xsl"/>
   </fileset>
@@ -488,42 +488,19 @@ NOTE:
   </target>
 
   <!-- =================================================================== -->
-  <!-- Creates the documentation                                           -->
-  <!-- =================================================================== -->
-  <target name="docs" description="Generates documentation">
-    <echo message="Building documentation with Forrest..."/>
-    <!--
-    <echo message="Make sure that you have installed Apache Forrest and"/>
-    <echo message="the FORREST_HOME environment variable is set (see http://forrest.apache.org/)"/>
-    <echo message="FORREST_HOME = ${forrest.home}"/>
-    -->
-    <echo message="Make sure you have a proper Forrest installation (see http://forrest.apache.org/)"/>
-
-    <!--<antcall target="site"/>-->
-    
-    <condition property="forrest.call" value="forrest.bat" else="forrest">
-      <os family="windows"/>
-    </condition>
-    <exec executable="${forrest.call}"/>
-  </target>
-  
-  <!-- =================================================================== -->
   <!-- Creates the distribution                                            -->
   <!-- =================================================================== -->
   <target name="dist" depends="distclean,dist-src,dist-bin,maven-artifacts" description="Generates
the distribution package"/>
 
   <!-- IMPORTANT: .NET binaries must not be included in the distribution. License policy!
-->
 
-  <target name="dist-bin" depends="all,javadocs,docs">
+  <target name="dist-bin" depends="all,javadocs">
     <echo message="Building the binary distribution files (zip,tar)"/>
     <mkdir dir="${dist.bin.result.dir}"/>
     <copy todir="${dist.bin.result.dir}">
       <fileset refid="dist.bin"/>
       <fileset refid="dist.bin.lib"/>
     </copy>
-    <copy todir="${dist.bin.result.dir}/docs">
-      <fileset dir="${build.dir}/site"/>
-    </copy>
     <copy todir="${dist.bin.result.dir}/javadocs">
       <fileset dir="${build.javadocs.dir}"/>
     </copy>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org


Mime
View raw message