Skip to content

Commit

Permalink
MONDRIAN: Generate mondrian.properties and doc/properties.html from
Browse files Browse the repository at this point in the history
    MondrianProperties.xml. properties.html is included in configuration.html
    when the web site is deployed. These files, and MondrianProperties.java,
    are now generated each build. Remove mondrian.properties from source
    control; people can copy mondrian.properties.template if they wish.

[git-p4: depot-paths = "//open/mondrian/": change = 14271]
  • Loading branch information
julianhyde committed May 12, 2011
1 parent c8099f7 commit 0dfbb1f
Show file tree
Hide file tree
Showing 8 changed files with 708 additions and 2,818 deletions.
1 change: 1 addition & 0 deletions bin/checkFile.sh
Expand Up @@ -59,6 +59,7 @@ doCheck() {
*/mondrian/xmla/DataSourcesConfig.java| \
*/mondrian/rolap/aggmatcher/DefaultDef.java| \
*/mondrian/resource/MondrianResource*.java| \
*/mondrian/olap/MondrianProperties.java| \
*/mondrian/olap/Parser.java| \
*/mondrian/olap/ParserSym.java| \
*/mondrian/parser/ParseException.java| \
Expand Down
26 changes: 26 additions & 0 deletions build.xml
Expand Up @@ -128,6 +128,7 @@ ${java.dir}/mondrian/parser/SimpleCharStream.java,
${java.dir}/mondrian/parser/Token.java,
${java.dir}/mondrian/parser/TokenMgrError.java,
${java.dir}/mondrian/olap/MondrianDef.java,
${java.dir}/mondrian/olap/MondrianProperties.java,
${java.dir}/mondrian/gui/MondrianGuiDef.java,
${java.dir}/mondrian/resource/MondrianResource*.java,
${java.dir}/mondrian/xmla/DataSourcesConfig*.java,
Expand All @@ -144,6 +145,8 @@ ${lib.dir}/web.xml,
${lib.dir}/index.jsp,
${lib.dir}/*.dtd,
VERSION.txt,
${doc.dir}/properties.html,
mondrian.properties.template,
demo/FoodMartCreateData.sql,
demo/access/MondrianFoodMart.mdb"/>

Expand Down Expand Up @@ -452,6 +455,7 @@ version,
prepare,
parser,
generate.resources,
generate.properties,
def,
compile.java"/>

Expand All @@ -464,6 +468,7 @@ compile.java"/>
destdir="${classes.dir}"
debug="${project.build.debug}"
classpathref="project.build.classpath"
includeantruntime="false"
source="1.5">
<include name="mondrian/olap/MondrianException.java" />
<include name="mondrian/olap/ResultLimitExceededException.java" />
Expand All @@ -484,6 +489,25 @@ compile.java"/>

</target>

<target name="generate.properties">
<!-- Generate MondrianProperties.java,
mondrian.properties.template, property.html. -->
<javac
srcdir="${java.dir}"
destdir="${classes.dir}"
debug="${project.build.debug}"
classpathref="project.build.classpath"
includeantruntime="false"
source="1.5">
<include name="mondrian/util/PropertyUtil.java" />
</javac>

<java classpathref="project.build.classpath"
classname="mondrian.util.PropertyUtil"
fork="no"/>
</target>


<condition property="jdk16.present">
<equals arg1="${ant.java.version}" arg2="1.6"/>
</condition>
Expand All @@ -500,6 +524,7 @@ compile.java"/>
destdir="${classes.dir}"
debug="${project.build.debug}"
classpathref="project.build.classpath"
includeantruntime="false"
source="1.5">
<include name="mondrian/**/*.java"/>
<exclude name="mondrian/olap4j/FactoryJdbc3Impl.java" if="jdk16.present"/>
Expand Down Expand Up @@ -950,6 +975,7 @@ ivy.xml,
ivysettings.xml,
log4j.properties,
mondrian.properties,
mondrian.properties.template,
LICENSE.html,
README.txt,
VERSION.txt,
Expand Down

0 comments on commit 0dfbb1f

Please sign in to comment.