svn commit: r1451137 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/ojb/build.xml tools/src/blocks-build.xsl

Author: ilgrosso
Date: Thu Feb 28 08:25:53 2013
New Revision: 1451137

URL: http://svn.apache.org/r1451137
Log:
[COCOON-2334] Patch applied

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml
    cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml?rev=1451137&r1=1451136&r2=1451137&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml Thu Feb 28 08:25:53 2013
@@ -55,7 +55,7 @@
        so we have to do it here "by hand" -->
   <target name="compile" unless="unless.exclude.webapp.samples">
     <javac compiler="${compiler}" nowarn="${compiler.nowarn}"
-           target="${target.vm}" deprecation="${compiler.deprecation}"
+           target="${target.vm}" source="${source.vm}" deprecation="${compiler.deprecation}"
            optimize="${compiler.optimize}" debug="${compiler.debug}"
            destdir="${build.blocks.ojb.samples}">
       <src path="${blocks}/ojb/java"/>

Modified: cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl?rev=1451137&r1=1451136&r2=1451137&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl Thu Feb 28 08:25:53 2013
@@ -163,6 +163,7 @@
              debug="${{compiler.debug}}"
              optimize="${{compiler.optimize}}"
              deprecation="${{compiler.deprecation}}"
+             source="${{source.vm}}"
              target="${{target.vm}}"
              nowarn="${{compiler.nowarn}}"
              compiler="${{compiler}}">
@@ -235,6 +236,7 @@
              debug="${{compiler.debug}}"
              optimize="${{compiler.optimize}}"
              deprecation="${{compiler.deprecation}}"
+             source="${{source.vm}}"
              target="${{target.vm}}"
              nowarn="${{compiler.nowarn}}"
              compiler="${{compiler}}">
@@ -439,6 +441,7 @@
                      optimize="${{compiler.optimize}}"
                      deprecation="${{compiler.deprecation}}"
                      target="${{target.vm}}"
+                     source="${{source.vm}}"
                      nowarn="${{compiler.nowarn}}"
                      compiler="${{compiler}}">
                 <src path="@{{dir}}/test/org/apache"/>
@@ -499,6 +502,7 @@
                      optimize="${{compiler.optimize}}"
                      deprecation="${{compiler.deprecation}}"
                      target="${{target.vm}}"
+                     source="${{source.vm}}"
                      nowarn="${{compiler.nowarn}}"
                      compiler="${{compiler}}">
                 <src path="@{{dir}}/test/htmlunit"/>