Skip to content

Commit

Permalink
MONDRIAN: Packaging and documentation for Schema Workbench
Browse files Browse the repository at this point in the history 
[git-p4: depot-paths = "//open/mondrian/": change = 9249]
  • Loading branch information
Sherman Wood committed May 12, 2007
1 parent deaa646 commit f9035f8
Show file tree
Hide file tree
Showing 12 changed files with 552 additions and 63 deletions.
41 changes: 40 additions & 1 deletion build.xml
View file
Expand Up @@ -17,7 +17,7 @@
<property name="project.build.debug" value="on"/>
<property name="Name" value="Mondrian"/>
<property name="name" value="mondrian"/>
<property name="version" value="2.3.2.8944"/>
<property name="version" value="2.3.2.9247"/>
<property name="vendor" value="Pentaho"/>

<!--
Expand Down Expand Up @@ -52,6 +52,8 @@
<property name="jar.file" value="${lib.dir}/${name}.jar"/>
<property name="jar-jdk14.file" value="${lib.dir}/${name}-jdk14.jar" />
<property name="workbench.jar.file" value="${lib.dir}/workbench.jar"/>
<property name="workbench.dist.name" value="workbench-${version}"/>
<property name="workbench.dist.file" value="${workbench.dist.name}.zip"/>
<property name="resource.jar.file" value="${lib.dir}/eigenbase-resgen.jar"/>
<property name="xom.jar.file" value="${lib.dir}/eigenbase-xom.jar"/>
<property name="war.file" value="${lib.dir}/${name}.war"/>
Expand Down Expand Up @@ -1149,6 +1151,43 @@ xalan.jar"/>
<java jar="${workbench.jar.file}" fork="yes"/>
</target>

<target name="workbench-dist"
depends="version,workbench">
<mkdir dir="${dist.dir}" />
<delete file="${dist.dir}/${workbench.dist.file}"/>
<zip zipfile="${dist.dir}/${workbench.dist.file}">
<zipfileset
dir="."
prefix="${workbench.dist.name}"
includes="
${doc.dir}/**/*.pdf,
lib/mondrian.jar,
lib/workbench.jar,
lib/x*.jar,
lib/eigenbase*.jar,
lib/commons*.jar,
lib/javacup.jar,
lib/jlfgr-*.jar,
lib/*.dtd,
lib/*.xsd,
demo/FoodMart.xml,
LICENSE.html"
excludes="
**/*~,
**/_vti*/*,
**/*.psp,
${doc.dir}/api/src-html/**/*"/>
<zipfileset
dir="workbench"
prefix="${workbench.dist.name}"
includes="**/*"/>
<zipfileset
dir="src/main"
prefix="${workbench.dist.name}/src"
includes="mondrian/gui/**/*"/>
</zip>
</target>

<!--
Retroweaver re-engineers JDK 1.5-compatible code so it can run under
JDK 1.4. This task compiles all core and test classes under 1.5 then
Expand Down
Binary file modified doc/schema_workbench.doc
View file
Binary file not shown.
Binary file modified doc/schema_workbench.pdf
View file
Binary file not shown.
10 changes: 7 additions & 3 deletions src/main/mondrian/gui/Workbench.java
View file
Expand Up @@ -1341,14 +1341,18 @@ public String getDescription() {
}

});
jfc.setCurrentDirectory(new File(new URI(workbenchProperties.getProperty(LAST_USED1_URL))));

String lastUsed = workbenchProperties.getProperty(LAST_USED1_URL);

if (lastUsed != null) {
jfc.setCurrentDirectory(new File(new URI(lastUsed)));
}
} catch (Exception ex) {
LOGGER.error("==Could not set file chooser. last used file does not exist", ex);
LOGGER.error("Could not set file chooser", ex);
}
MondrianProperties.instance();
if (jfc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
try {
//setLastUsed(jfc.getSelectedFile().getName(), jfc.getSelectedFile().toURL().toString());
setLastUsed(jfc.getSelectedFile().getName(), jfc.getSelectedFile().toURI().toURL().toString());
} catch (MalformedURLException e) {
LOGGER.error(e);
Expand Down
93 changes: 34 additions & 59 deletions src/main/mondrian/gui/resources/schemaBuilder.html
View file
@@ -1,14 +1,14 @@
<html xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:w="urn:schemas-microsoft-com:office:word"
xmlns="http://www.w3.org/TR/REC-html40">

<head>
<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
<meta name=ProgId content=Word.Document>
<meta name=Generator content="Microsoft Word 11">
<meta name=Originator content="Microsoft Word 11">
<link rel=File-List href="schemaBuilder_files/filelist.xml">
<!--[if gte mso 9]><xml>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.0 (Win32)">
<META NAME="CREATED" CONTENT="20070511;16310421">
<META NAME="CHANGED" CONTENT="20070511;16334457">
<META NAME="ProgId" CONTENT="Word.Document">
<META NAME="Originator" CONTENT="Microsoft Word 11">
<!--[if gte mso 9]><xml>
<o:DocumentProperties>
<o:Author>Somita Arora</o:Author>
<o:Template>Normal</o:Template>
Expand All @@ -26,44 +26,21 @@
<o:CharactersWithSpaces>97</o:CharactersWithSpaces>
<o:Version>11.5606</o:Version>
</o:DocumentProperties>
</xml><![endif]--><!--[if gte mso 9]><xml>
</xml><![endif]-->
<!--[if gte mso 9]><xml>
<w:WordDocument>
<w:ValidateAgainstSchemas/>
<w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
<w:IgnoreMixedContent>false</w:IgnoreMixedContent>
<w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
<w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
</w:WordDocument>
</xml><![endif]--><!--[if gte mso 9]><xml>
</xml><![endif]-->
<!--[if gte mso 9]><xml>
<w:LatentStyles DefLockedState="false" LatentStyleCount="156">
</w:LatentStyles>
</xml><![endif]-->
<style>
<!--
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{mso-style-parent:"";
margin:0in;
margin-bottom:.0001pt;
mso-pagination:widow-orphan;
font-size:12.0pt;
font-family:"Times New Roman";
mso-fareast-font-family:"Times New Roman";}
p
{font-size:12.0pt;
font-family:"Times New Roman";
mso-fareast-font-family:"Times New Roman";}
@page Section1
{size:8.5in 11.0in;
margin:1.0in 1.25in 1.0in 1.25in;
mso-header-margin:.5in;
mso-footer-margin:.5in;
mso-paper-source:0;}
div.Section1
{page:Section1;}
-->
</style>
<!--[if gte mso 10]>
<!--[if gte mso 10]>
<style>
/* Style Definitions */
table.MsoNormalTable
Expand All @@ -83,23 +60,21 @@
mso-bidi-language:#0400;}
</style>
<![endif]-->
</head>

<body lang=EN-US style='tab-interval:.5in'>

<div class=Section1>

<h2><u>Schema Workbench Product Information</u></h2>

<p class=MsoNormal><br>
<b>Product Version :</b> Working Version 10.0 <br>
<br>
<b>New Features :</b> Access Control, Aggregate Tables <br>
<br>
<b>Java :</b> 1.4 and above </p>

</div>

</body>

</html>
<STYLE>
<!--
P { color: #000000 }
H2 { color: #000000 }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" TEXT="#000000" DIR="LTR">
<H2><U><FONT FACE="Tahoma, sans-serif">Schema Workbench</U></FONT></H2>
<P CLASS="msonormal"><FONT FACE="Tahoma, sans-serif"><BR><B>Product
Version :</B> Release candidate based on Mondrian HEAD, revision 9247
<BR><BR><B>New Features :</B> Access Control, Aggregate Tables <BR><BR><B>Java
:</B> 1.5 and above</FONT></P>
<P CLASS="msonormal"><BR><BR>
</P>
<P CLASS="msonormal"><FONT FACE="Tahoma, sans-serif"><B>License: </B>CPL</FONT></P>
</BODY>
</HTML>
1 change: 1 addition & 0 deletions workbench/cpappend.bat
View file
@@ -0,0 +1 @@
set CP=%CP%;%1
Binary file added workbench/lib/log4j-1.2.12.jar
View file
Binary file not shown.
83 changes: 83 additions & 0 deletions workbench/log4j.xml
View file
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">

<!-- ===================================================================== -->
<!-- -->
<!-- Log4j Configuration -->
<!-- -->
<!-- Default log configuration file for the Workbench. -->
<!-- Copied to the user home directory, where the user can change -->
<!-- settings for their own purposes. -->
<!-- -->
<!-- Sends log messages to the console and the workbench.log file -->
<!-- in the user's home directory. -->
<!-- -->
<!-- ===================================================================== -->

<!-- $Id$ -->

<!--
| For more configuration infromation and examples see the Jakarta Log4j
| owebsite: http://jakarta.apache.org/log4j
-->

<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">

<!-- ================================= -->
<!-- Preserve messages in a local file -->
<!-- ================================= -->

<!-- A size based file rolling appender, capturing everything -->

<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${user.home}/.schemaWorkbench/workbench.log"/>
<param name="Append" value="false"/>
<param name="MaxFileSize" value="500KB"/>
<param name="MaxBackupIndex" value="1"/>

<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
</layout>
</appender>

<!-- ============================== -->
<!-- Append messages to the console -->
<!-- ============================== -->

<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out"/>
<param name="Threshold" value="INFO"/>

<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
</layout>
</appender>

<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->

<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
<category name="org.apache">
<priority value="INFO"/>
</category>

<category name="mondrian.gui">
<priority value="DEBUG"/>
</category>

<category name="mondrian">
<priority value="INFO"/>
</category>

<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->

<root>
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>

</log4j:configuration>

0 comments on commit f9035f8

Please sign in to comment.