MONDRIAN: Change home page to mondrian.pentaho.org; update version nu…

…mber to 2.2.1.

[git-p4: depot-paths = "//open/mondrian/": change = 7893]

LicenseInfo.txt

@@ -1,6 +1,6 @@
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
-// Copyright (C) 2003-2003 Kana Software, Inc. and others.
+// Copyright (C) 2006-2006 Julian Hyde and others.
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.

README.txt

@@ -5,7 +5,7 @@ This code is released under the terms of the Common Public
 License; see LICENSE.html.
 
 For installation instructions, see doc/install.html
-(http://mondrian.sourceforge.net/install.html).
+(http://mondrian.pentaho.org/documentation/installation.php).
 
 The version is described in VERSION.txt.
 

build.xml

@@ -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.1.1"/>
+  <property name="version" value="2.2.1"/>
 
   <!--
     ===================================================================
@@ -801,7 +801,7 @@ META-INF/**"/>
 
   <target name="upload-javadoc" depends="javadoc" description="
 Copies javadoc to sourceforge, where it will be accessible via
-http://mondrian.sourceforge.net/api/index.html.
+http://mondrian.pentaho.org/api/index.html.
 You should set scp.user, scp.password and scp.path in build.properties">
     <exec executable="scp">
       <arg line="-r"/>

doc/doc2web.sh

@@ -20,29 +20,33 @@
 #          Connection.html (javadoc for mondrian.olap.Connection)
 #    (etc.)
 
+beep() {
+  echo x | tr x \\007
+}
+
 doHtml() {
   # LOCALE="en"
   LOCALE="$1"
   # SRCFILE="aggregate_tables.html"
   SRCFILE="$2"
-  # DSTFILE="content/en/documentation/aggregate_tables.html"
+  # DSTFILE="content/en/documentation/aggregate_tables_doc.htm"
   DSTFILE=content/${LOCALE}/documentation/$(echo $SRCFILE|sed -e s/.html$/_doc.htm/)
   if [ "$LOCALE" != "en" ]; then
     SRCFILE=$(echo $SRCFILE | sed -e "s/\.html/_${LOCALE}.html/")
   fi
   mkdir -p content/${LOCALE}/documentation
   echo :: copy $SRCFILE to $DSTFILE
-  cat $SRCFILE |
-  sed -e '
-s! src="images/! src="../images/!;
-s! href="\([^/]*\)\.html! href="\1.php!
-         ' |
-  awk '
+  case "$SRCFILE" in
+  xml_schema.html)
+    cp "$SRCFILE" "$DSTFILE";;
+  *)
+    cat "$SRCFILE" |
+    awk '
 /doc2web start/ {++x;next;}
 /doc2web end/ {++x;next;}
 {if (x == 1) print;}
-      ' >$DSTFILE
-
+        ' >"$DSTFILE";;
+  esac
 }
 
 doImg() {
@@ -52,13 +56,19 @@ doImg() {
 ROOT=$(cd $(dirname $0); pwd -P)
 cd $ROOT
 
+javadoc=true
+deploy=true
+scp=true
+
 # Remove output from previous run.
 rm -rf content
 
 # Build javadoc.
-if false; then
+if $javadoc; then
   (
-  cd $ROOT
+  cd $ROOT/..
+  rm -rf doc/api
+  mkdir -p doc/api
   ant javadoc xml_schema
   )
 fi
@@ -93,6 +103,7 @@ doImg images/arch_mondrian_v1_tn.png
 doImg images/arch_mondrian_sketch_tn.png
 doImg images/zoom.png
 doImg images/logo_mondrian_lrg.png
+doImg images/perforce_setup.gif
 doImg images/code_spacing.png
 doImg images/code_indentation.png
 doImg images/perforce_setup.png
@@ -104,15 +115,36 @@ rm -f mondrianPentaho.tar.gz
 tar -cvz -f mondrianPentaho.tar.gz content images api
 
 # Copy file to server, and deploy.
-if true; then
-  scp mondrianPentaho.tar.gz mondriantest@mondriantest.pentaho.org:httpdocs
-  ssh mondriantest@mondriantest.pentaho.org <<EOF
+if $scp; then
+  beep
+  scp -oConnectTimeout=300 mondrianPentaho.tar.gz mondrian@mondrian.pentaho.org:httpdocs
+fi
+
+if $deploy; then
+  beep
+  ssh -oConnectTimeout=300 mondrian@mondrian.pentaho.org <<EOF
     cd httpdocs
     tar xvfz mondrianPentaho.tar.gz
 
     # Fix up file permissions
     find api content images -type d | xargs chmod go+rx
     find api content images -type f | xargs chmod go+r
+
+    # Replace references to documents from javadoc.
+    find api -name \*.html |
+    xargs perl -p -i -e '
+s!architecture.html!../documentation/architecture.php!;
+s!mdx.html!../documentation/mdx.php!;
+s!schema.html!../documentation/schema.php!;
+                        '
+
+    # Change references to javadoc from documents.
+    find content -name \*.htm |
+    xargs perl -p -i -e '
+s! src="images/! src="../images/!;
+s! href="api! href="../api!;
+s! href="\([^/]*\)\.html! href="\1.php!;
+                        ' 
 EOF
 fi
 

doc/faq.html

@@ -510,7 +510,8 @@ <h1>14.2 Tuning the Aggregate function<a name="Tuning_the_Aggregate_function">&n
 could I get more materials, howtos, etc. to reduce my learn curve?
 
 <p>A. As with any open source project, the documentation is the
-mondrian.sourceforge.net web site (which is in Perforce too), the forums
+<a href="http://mondrian.pentaho.org">web site</a>
+(which is source-controlled in Perforce too), the forums
 and mailing lists, the test suite and the code.</p>
 
 <p>Q. How could I enroll myself into mondrian source forge project?</p>

src/main/mondrian/olap/Mondrian.xml

@@ -450,7 +450,7 @@ Revision is $Id$
         <Attribute name="memberReaderClass">
             <Doc>
                 Name of the custom member reader class. Must implement
-                the <a href="http://mondrian.sourceforge.net/api/mondrian/rolap/MemberReader.html">mondrian.rolap.MemberReader</a> interface.
+                the <a href="api/mondrian/rolap/MemberReader.html">mondrian.rolap.MemberReader</a> interface.
             </Doc>
         </Attribute>
         <Attribute name="caption" required="false">
@@ -731,7 +731,7 @@ Revision is $Id$
         <Attribute name="formatString">
             <Doc>
                 Format string with which to format cells of this measure. For
-                more details, see the <a href="http://mondrian.sourceforge.net/api/mondrian/util/Format.html">mondrian.util.Format</a> class.
+                more details, see the <a href="api/mondrian/util/Format.html">mondrian.util.Format</a> class.
             </Doc>
         </Attribute>
         <Attribute name="aggregator" required="true">
@@ -1552,7 +1552,7 @@ Revision is $Id$
             <code>access</code> may be "all", "all_dimensions", or "none".
             If <code>access</code> is "all_dimensions", the role has access
             to all dimensions but still needs explicit access to cubes.
-            See <a href="http://mondrian.sourceforge.net/api/mondrian/olap/Role.html#grant(mondrian.olap.Schema, int)">mondrian.olap.Role#grant(mondrian.olap.Schema,int)</a>.
+            See <a href="api/mondrian/olap/Role.html#grant(mondrian.olap.Schema, int)">mondrian.olap.Role#grant(mondrian.olap.Schema,int)</a>.
         </Doc>
         <Array name="cubeGrants" type="CubeGrant"/>
     </Element>
@@ -1561,7 +1561,7 @@ Revision is $Id$
         <Doc>
             Grants (or denies) this role access to a cube.
             <code>access</code> may be "all" or "none".
-            See <a href="http://mondrian.sourceforge.net/api/mondrian/olap/Role.html#grant(mondrian.olap.Cube, int)">mondrian.olap.Role#grant(mondrian.olap.Cube,int)</a>.
+            See <a href="api/mondrian/olap/Role.html#grant(mondrian.olap.Cube, int)">mondrian.olap.Role#grant(mondrian.olap.Cube,int)</a>.
         </Doc>
         <Attribute name="cube" required="true">
             <Doc>The unique name of the cube</Doc>
@@ -1577,7 +1577,7 @@ Revision is $Id$
             Note that a role is implicitly given access to a dimension when it
             is given acess to a cube.
             See also the "all_dimensions" option of the "SchemaGrant" element.
-            See <a href="http://mondrian.sourceforge.net/api/mondrian/olap/Role.html#grant(mondrian.olap.Dimension, int)">mondrian.olap.Role#grant(mondrian.olap.Dimension,int)</a>.
+            See <a href="api/mondrian/olap/Role.html#grant(mondrian.olap.Dimension, int)">mondrian.olap.Role#grant(mondrian.olap.Dimension,int)</a>.
         </Doc>
         <Attribute name="dimension" required="true">
             <Doc>The unique name of the dimension</Doc>
@@ -1591,7 +1591,7 @@ Revision is $Id$
             If <code>access</code> is "custom", you may also specify the
             attributes <code>topLevel</code>, <code>bottomLevel</code>, and
             the member grants.
-            See <a href="http://mondrian.sourceforge.net/api/mondrian/olap/Role.html#grant(mondrian.olap.Hierarchy, int, mondrian.olap.Level)">mondrian.olap.Role#grant(mondrian.olap.Hierarchy, int, mondrian.olap.Level)</a>.
+            See <a href="api/mondrian/olap/Role.html#grant(mondrian.olap.Hierarchy, int, mondrian.olap.Level)">mondrian.olap.Role#grant(mondrian.olap.Hierarchy, int, mondrian.olap.Level)</a>.
         </Doc>
         <Attribute name="hierarchy" required="true">
             <Doc>The unique name of the hierarchy</Doc>
@@ -1616,7 +1616,7 @@ Revision is $Id$
             Grants (or denies) this role access to a member.
             The children of this member inherit that access.
             You can implicitly see a member if you can see any of its children.
-            See <a href="http://mondrian.sourceforge.net/api/mondrian/olap/Role.html#grant(mondrian.olap.Member, int)">mondrian.olap.Role#grant(mondrian.olap.Member,int)</a>.
+            See <a href="api/mondrian/olap/Role.html#grant(mondrian.olap.Member, int)">mondrian.olap.Role#grant(mondrian.olap.Member,int)</a>.
         </Doc>
         <Attribute name="member" required="true">
             <Doc>The unique name of the member</Doc>
@@ -1633,7 +1633,7 @@ Revision is $Id$
             A <code>UserDefinedFunction</code> is a function which
             extends the MDX language. It must be implemented by a Java
             class which implements the interface
-            <a href="http://mondrian.sourceforge.net/api/mondrian/spi/UserDefinedFunction.html">mondrian.spi.UserDefinedFunction</a>.
+            <a href="api/mondrian/spi/UserDefinedFunction.html">mondrian.spi.UserDefinedFunction</a>.
         </Doc>
         <Attribute name="name" required="true">
             <Doc>Name with which the user-defined function will be referenced in MDX expressions.</Doc>

src/main/mondrian/olap/MondrianProperties.java

@@ -705,7 +705,7 @@ public Property getPropertyDefinition(String path) {
      *
      * <p>Used for the {@link mondrian.rolap.DynamicSchemaProcessor
      * LocalizingDynamicSchemaProcessor}; see
-     * <a href="http://mondrian.sourceforge.net/schema.html#I18n">Internationalization</a>
+     * <a href="{@docRoot}/../schema.html#I18n">Internationalization</a>
      * for more details.</td>
      *
      * <p>Default value is null.

src/main/mondrian/rolap/RolapConnectionProperties.java

@@ -62,18 +62,18 @@ private RolapConnectionProperties() {
 
     /**
      * The "Catalog" property is the URL of the catalog, an XML file which
-     * describes the schema: cubes, hierarchies, and so forth. Catalogs are
-     * described <a target="_top"
-     * href="http://mondrian.sourceforge.net/schema.html">here</a>.
+     * describes the schema: cubes, hierarchies, and so forth.
+     * Catalogs are described in <a target="_top"
+     * href="{@docRoot}/../schema.html">the Schema Guide</a>.
      * See also {@link #CatalogContent}.
      */
     public static final String Catalog = "Catalog";
 
     /**
      * The "CatalogContent" property is an XML string representing the schema:
-     * cubes, hierarchies, and so forth. Catalogs are described <a
-     * target="_top"
-     * href="http://mondrian.sourceforge.net/schema.html">here</a>.
+     * cubes, hierarchies, and so forth.
+     * Catalogs are described in <a target="_top"
+     * href="{@docRoot}/../schema.html">the Schema Guide</a>.
      * See also {@link #Catalog}.
      */
     public static final String CatalogContent = "CatalogContent";

testsrc/main/mondrian/olap/fun/FunctionTest.java

@@ -6625,7 +6625,7 @@ public void testCast() {
      * Tests {@link mondrian.olap.FunTable#getFunInfoList()}, but more
      * importantly, generates an HTML table of all implemented functions into
      * a file called "functions.html". You can manually include that table
-     * in the <a href="http://mondrian.sourceforge.net/mdx.html">MDX
+     * in the <a href="{@docRoot}/../mdx.html">MDX
      * specification</a>.
      */
     public void testDumpFunctions() throws IOException {

webapp/WEB-INF/datasources.xml

@@ -34,7 +34,7 @@
         <!-- 
              The URL of the servlet.
         -->
-        <URL>http://localhost:8080/mondrian/xmla</URL>
+        <URL>http://localhost:8888/mondrian/xmla</URL>
 
         <!--
              Mondrian connect string for the data source. If this data
@@ -45,7 +45,7 @@
              Catalogs can override the connect string with their own
              <DataSourceInfo> element.
           -->
-        <DataSourceInfo>Provider=mondrian;Jdbc=jdbc:odbc:MondrianFoodMart;JdbcDrivers=sun.jdbc.odbc.JdbcOdbcDriver;Catalog=/WEB-INF/queries/FoodMart.xml</DataSourceInfo>
+        <DataSourceInfo>Provider=mondrian;Jdbc=jdbc:oracle:thin:foodmart/foodmart@//marmalade.hydromatic.net:1521/XE;JdbcUser=foodmart;JdbcPassword=foodmart;JdbcDrivers=oracle.jdbc.OracleDriver;Catalog=/WEB-INF/queries/FoodMart.xml</DataSourceInfo>
 
         <!-- 
              Provider name must be 'Mondrian'.

webapp/index.html

@@ -33,7 +33,7 @@
 
 <p>Other links:</p>
 <ul>
-<li><a href="http://mondrian.sourceforge.net/">Mondrian home page</a></li>
+<li><a href="http://mondrian.pentaho.org">Mondrian home page</a></li>
 <li><a href="http://sourceforge.net/projects/mondrian">Mondrian project page</a></li>
 <li><a href="http://jpivot.sourceforge.net/">JPivot home page</a></li>
 <li><a href="http://sourceforge.net/projects/jpivot">JPivot project page</a></li>

webapp/index.jsp

@@ -29,7 +29,7 @@
 
 <p>Other links:</p>
 <ul>
-<li><a href="http://mondrian.sourceforge.net/">Mondrian home page</a></li>
+<li><a href="http://mondrian.pentaho.org">Mondrian home page</a></li>
 <li><a href="http://sourceforge.net/projects/mondrian">Mondrian project page</a></li>
 <li><a href="http://jpivot.sourceforge.net/">JPivot home page</a></li>
 <li><a href="http://sourceforge.net/projects/jpivot">JPivot project page</a></li>