Skip to content

Commit

Permalink
MONDRIAN: Update domain from pentaho.org to pentaho.com.
Browse files Browse the repository at this point in the history
[git-p4: depot-paths = "//open/mondrian-release/3.2/": change = 13780]
  • Loading branch information
julianhyde committed Jul 29, 2010
1 parent 04fc013 commit 1d4b953
Show file tree
Hide file tree
Showing 27 changed files with 197 additions and 197 deletions.
4 changes: 2 additions & 2 deletions README.txt
Expand Up @@ -5,10 +5,10 @@ This code is released under the terms of the Eclipse Public
License v1.0 (EPL); see LICENSE.html.

For installation instructions, see doc/install.html
(http://mondrian.pentaho.org/documentation/installation.php).
(http://mondrian.pentaho.com/documentation/installation.php).

The version is described in VERSION.txt.

Home page: http://mondrian.pentaho.org
Home page: http://mondrian.pentaho.com
Project home: http://sourceforge.net/projects/mondrian/
Email: jhyde@pentaho.com
4 changes: 2 additions & 2 deletions RELEASE.txt
Expand Up @@ -6,7 +6,7 @@ Introduction

Mondrian 3.2.0.13661 is a minor release version of the leading
open-source OLAP engine. To find out more about mondrian, go
to http://mondrian.pentaho.org.
to http://mondrian.pentaho.com.

Contents
--------
Expand All @@ -29,7 +29,7 @@ mondrian-jdk14.jar for mondrian.jar, and add
retroweaver-rt-1.2.4.jar to your classpath.

For further installation instructions, see
http://mondrian.pentaho.org/documentation/installation.php
http://mondrian.pentaho.com/documentation/installation.php
or the included file doc/installation.html.

* Note that the below is not a complete list of changes
Expand Down
14 changes: 7 additions & 7 deletions doc/architecture.html
Expand Up @@ -5,7 +5,7 @@
== Agreement, available at the following URL:
== http://www.eclipse.org/legal/epl-v10.html.
== Copyright (C) 2001-2002 Kana Software, Inc.
== Copyright (C) 2001-2007 Julian Hyde
== Copyright (C) 2001-2010 Julian Hyde
== All Rights Reserved.
== You must accept the terms of that agreement to use this software.
== jhyde, 24 September, 2002
Expand Down Expand Up @@ -61,7 +61,7 @@ <h3>Layers of a Mondrian system</h3>
<table width="200" class="whiteTable">
<tr>
<td>
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.org/images/arch_mondrian_v1_lrg.png')">
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.com/images/arch_mondrian_v1_lrg.png')">
<img border="0" alt="Mondrian architecture" src="images/arch_mondrian_v1_tn.png" width="200" height="147"></a>
</td>
</tr>
Expand All @@ -70,11 +70,11 @@ <h3>Layers of a Mondrian system</h3>
<table class="whiteTable" align="center">
<tr>
<td width="19">
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.org/images/arch_mondrian_v1_lrg.png')">
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.com/images/arch_mondrian_v1_lrg.png')">
<img height="15" alt="Zoom" src="images/zoom.png" width="14" border="0" /></a>
</td>
<td>
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.org/images/arch_mondrian_v1_lrg.png')">
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.com/images/arch_mondrian_v1_lrg.png')">
Zoom
</a>
</td>
Expand All @@ -88,7 +88,7 @@ <h3>Layers of a Mondrian system</h3>
<table width="200" class="whiteTable">
<tr>
<td>
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.org/images/architecture2_big.png')">
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.com/images/architecture2_big.png')">
<img border="0" alt="Mondrian architecture (hand-drawn)" src="images/arch_mondrian_sketch_tn.png" width="201" height="158" align="middle"></a>
</td>
</tr>
Expand All @@ -97,11 +97,11 @@ <h3>Layers of a Mondrian system</h3>
<table class="whiteTable" align="center">
<tr>
<td width="19">
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.org/images/architecture2_big.png')">
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.com/images/architecture2_big.png')">
<img height="15" alt="Zoom" src="images/zoom.png" width="14" border="0" /></a>
</td>
<td>
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.org/images/architecture2_big.png')">
<a href="javascript:popUpSnapsVert('http://mondrian.pentaho.com/images/architecture2_big.png')">
Zoom
</a>
</td>
Expand Down
12 changes: 6 additions & 6 deletions doc/doc2web.sh
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# Converts documentation from Mondrian's source format to Pentaho's web site.
#
# The file structure looks like this:
Expand Down Expand Up @@ -56,6 +56,7 @@ doImg() {
ROOT=$(cd $(dirname $0); pwd -P)
cd $ROOT

site=changeme@mondrian.pentaho.com
javadoc=true
deploy=true
scp=true
Expand All @@ -80,8 +81,8 @@ if $headJavadoc; then
rm -rf headapi
mv api headapi
tar -cvz -f headJavadoc.tar.gz headapi
scp -oConnectTimeout=300 headJavadoc.tar.gz mondrian@mondrian.pentaho.org:httpdocs
ssh -oConnectTimeout=300 mondrian@mondrian.pentaho.org <<EOF
scp -oConnectTimeout=300 headJavadoc.tar.gz ${site}:httpdocs
ssh -oConnectTimeout=300 ${site} <<EOF
cd httpdocs
tar xvfz headJavadoc.tar.gz
Expand Down Expand Up @@ -139,11 +140,11 @@ tar -cvz -f mondrianPentaho.tar.gz content images api

# Copy file to server, and deploy.
if $scp; then
scp -oConnectTimeout=300 mondrianPentaho.tar.gz mondrian@mondrian.pentaho.org:httpdocs
scp -oConnectTimeout=300 mondrianPentaho.tar.gz ${site}:httpdocs
fi

if $deploy; then
ssh -oConnectTimeout=300 mondrian@mondrian.pentaho.org <<EOF
ssh -oConnectTimeout=300 ${site} <<EOF
cd httpdocs
tar xvfz mondrianPentaho.tar.gz
Expand Down Expand Up @@ -178,4 +179,3 @@ EOF
fi

# End doc2web.sh

16 changes: 8 additions & 8 deletions doc/faq.html
Expand Up @@ -4,7 +4,7 @@
== This software is subject to the terms of the Eclipse Public License v1.0
== Agreement, available at the following URL:
== http://www.eclipse.org/legal/epl-v10.html.
== Copyright (C) 2002-2007 Julian Hyde
== Copyright (C) 2002-2010 Julian Hyde
== All Rights Reserved.
== You must accept the terms of that agreement to use this software.
-->
Expand Down Expand Up @@ -82,7 +82,7 @@ <h3>2. What API does Mondrian use?<a name="API">&nbsp;</a></h3>
applications.</p>
<p>Mondrian also has a provider for XML for Analysis.</p>
<p>Historically, Mondrian had its own API, consisting of classes in the
<a href="http://mondrian.pentaho.org/api/mondrian/olap/package-summary.html">
<a href="http://mondrian.pentaho.com/api/mondrian/olap/package-summary.html">
mondrian.olap</a> package. That API has been deprecated since mondrian-3.0, and
may change or be removed without warning in future versions. JPivot still uses
it.</p>
Expand Down Expand Up @@ -173,7 +173,7 @@ <h3>10. Mondrian is wonderful! How can I possibly thank you?<a name="Feedback">&

<p>We'd love to hear what you liked and didn't like about
it. Post questions and comments to the
<a href="http://mondrian.pentaho.org/forum">forum</a>. If you can think of ways that Mondrian can be improved, roll up your sleeves
<a href="http://mondrian.pentaho.com/forum">forum</a>. If you can think of ways that Mondrian can be improved, roll up your sleeves
and help make it better!</p>

<p>If you modify Mondrian's source code, you are
Expand Down Expand Up @@ -444,7 +444,7 @@ <h3>16. More information, documentation, ...<a name="More_information,_documenta
could I get more materials, howtos, etc. to reduce my learning curve?

<p>A. As with any open source project, the documentation is the
<a href="http://mondrian.pentaho.org">web site</a>
<a href="http://mondrian.pentaho.com">web site</a>
(which is source-controlled in Perforce too), the forums
and mailing lists, the test suite and the code.</p>

Expand All @@ -457,8 +457,8 @@ <h3>17. Becoming a developer<a name="Becoming_a_developer">&nbsp;</a></h3>

<p>A. First, join the community. Sign up as a user in the
<a href="http://community.pentaho.com/">Pentaho developer community</a>.
Subscribe to the <a href="http://lists.pentaho.org/mailman/listinfo/mondrian">Mondrian mailing list</a>,
read the <a href="http://mondrian.pentaho.org/forum">Mondrian forum</a>
Subscribe to the <a href="http://lists.pentaho.com/mailman/listinfo/mondrian">Mondrian mailing list</a>,
read the <a href="http://mondrian.pentaho.com/forum">Mondrian forum</a>
regularly, and start answering questions.</p>

<p>Also, there are a lot of Mondrian
Expand All @@ -475,10 +475,10 @@ <h3>17. Becoming a developer<a name="Becoming_a_developer">&nbsp;</a></h3>
with the architecture.</p>

<p>
Author: Julian Hyde; last modified May 2009.<br/>
Author: Julian Hyde; last modified July 2010.<br/>
Version: $Id$
(<a href="http://p4web.eigenbase.org/open/mondrian/doc/faq.html?ac=22">log</a>)<br/>
Copyright (C) 2002-2009 Julian Hyde
Copyright (C) 2002-2010 Julian Hyde
</p>

<br />
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Expand Up @@ -36,7 +36,7 @@
</ul>
<li>Links</li>
<ul>
<li><a target="_top" href="http://www.pentaho.org">Pentaho</a></li>
<li><a target="_top" href="http://www.pentaho.com">Pentaho</a></li>
<li><a target="_top" href="http://sourceforge.net/projects/mondrian">SourceForge</a></li>
<li><a target="_top" href="http://sourceforge.net/projects/jpivot">JPivot</a></li>
<li><a href="http://eigenbase.sourceforge.net/resgen">ResGen</a></li>
Expand Down
2 changes: 1 addition & 1 deletion doc/install.html
Expand Up @@ -617,7 +617,7 @@ <h3>PostgreSQL<a name="PostgreSQL">&nbsp;</a></h3>

<h3>Sybase<a name="Sybase">&nbsp;</a></h3>

<p><a href="http://forums.pentaho.org/showthread.php?t=47918">mizar_sf writes</a>:</p>
<p><a href="http://forums.pentaho.com/showthread.php?t=47918">mizar_sf writes</a>:</p>
<blockquote>

<p>I tried some solutions to get mondrian (I used 2.1RC) connected with a Sybase
Expand Down
2 changes: 1 addition & 1 deletion doc/install_es.html
Expand Up @@ -509,7 +509,7 @@ <h3>General database tips</h3>
<p>Para ejemplos de cadenzas de conexión, mire en <code>mondrian.properties</code>. Hay ejemplos de cadenas de conexión para muchas bases de datos.
</p>
<h3>Sybase</h3>
<p><a href="http://forums.pentaho.org/showthread.php?t=47918">mizar_sf escribe</a>
<p><a href="http://forums.pentaho.com/showthread.php?t=47918">mizar_sf escribe</a>
:</p>

<blockquote>
Expand Down
2 changes: 1 addition & 1 deletion doc/install_fr.html
Expand Up @@ -887,7 +887,7 @@ <h3>&nbsp;</h3>

<h3>Sybase</h3>

<p><a href="http://forums.pentaho.org/showthread.php?t=47918">mizar_sf
<p><a href="http://forums.pentaho.com/showthread.php?t=47918">mizar_sf
&eacute;crit</a>:</p>

<blockquote>
Expand Down
4 changes: 2 additions & 2 deletions doc/roadmap.html
Expand Up @@ -4,7 +4,7 @@
== This software is subject to the terms of the Eclipse Public License v1.0
== Agreement, available at the following URL:
== http://www.eclipse.org/legal/epl-v10.html.
== Copyright (C) 2002-2009 Julian Hyde and others
== Copyright (C) 2002-2010 Julian Hyde and others
== All Rights Reserved.
== You must accept the terms of that agreement to use this software.
-->
Expand Down Expand Up @@ -723,7 +723,7 @@ <h1>4.4 Release 2.2 (2006/10/??)<a name="Release_2.2">&nbsp;</a></h1>
LastNonEmpty function, and crossjoin can be evaluated in SQL even for
virtual cubes.</li>
<li>Lastly, we moved <b>mondrian's website</b> to
<a href="http://mondrian.pentaho.org">http://mondrian.pentaho.org</a>. Same
<a href="http://mondrian.pentaho.com">http://mondrian.pentaho.com</a>. Same
content as before, but better formatted, and more integrated with the rest
of the Pentaho family of projects.</li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions doc/schema.html
Expand Up @@ -1712,9 +1712,9 @@ <h1>5.2.3 Populating closure tables<a name="Populating_closure_tables">&nbsp;</a
<p>The table needs to be re-populated whenever the hierarchy changes, and it is
the application's responsibility to do so &mdash; Mondrian does not do this!</p>

<p>If you are using <a href="http://kettle.pentaho.org/">Pentaho Data Integration (Kettle)</a>, there is a special step
<p>If you are using <a href="http://kettle.pentaho.com/">Pentaho Data Integration (Kettle)</a>, there is a special step
to populate closure tables as part of the ETL process. Further details in the
<a href="http://wiki.pentaho.org/display/EAI/Closure+Generator">Pentaho Data
<a href="http://wiki.pentaho.com/display/EAI/Closure+Generator">Pentaho Data
Integration wiki</a>.</p>

<p/>
Expand All @@ -1723,7 +1723,7 @@ <h1>5.2.3 Populating closure tables<a name="Populating_closure_tables">&nbsp;</a
<td>
<img
border="0"
src="http://wiki.pentaho.org/download/attachments/1050777/closure-generator-step.png"
src="http://wiki.pentaho.com/download/attachments/1050777/closure-generator-step.png"
alt="Closure Generator step in Pentaho Data Integration"
width="474"
height="218">
Expand Down
10 changes: 5 additions & 5 deletions doc/stylesheet.css
Expand Up @@ -3,14 +3,14 @@
// This software is subject to the terms of the Eclipse Public License v1.0
// Agreement, available at the following URL:
// http://www.eclipse.org/legal/epl-v10.html.
// Copyright (C) 2006-2006 Julian Hyde and others.
// Copyright (C) 2006-2010 Julian Hyde and others.
// All Rights Reserved.
// You must accept the terms of that agreement to use this software.
//
// Global style-sheet for mondrian project.
*/

/* http://mondrian.pentaho.org/css/styles.css */
/* http://mondrian.pentaho.com/css/styles.css */
#mtm_wrap {
border:1px solid black;
width:642px;
Expand Down Expand Up @@ -70,7 +70,7 @@ table.items tr.item td {
}


/* http://mondrian.pentaho.org/css/primary.css */
/* http://mondrian.pentaho.com/css/primary.css */

.bodyMain {
background-color: #ededed;
Expand Down Expand Up @@ -571,7 +571,7 @@ p {
PADDING-RIGHT: 0px;
DISPLAY: block;
PADDING-LEFT: 0px;
BACKGROUND: url(http://www.pentaho.org/images/stories/images/btn_download.gif) no-repeat 0px 0px;
BACKGROUND: url(http://www.pentaho.com/images/stories/images/btn_download.gif) no-repeat 0px 0px;
PADDING-BOTTOM: 8px;
FONT: bold 13px sans-serif;
WIDTH: 228px;
Expand Down Expand Up @@ -628,7 +628,7 @@ dfn {



/* http://mondrian.pentaho.org/css/transmenu.css */
/* http://mondrian.pentaho.com/css/transmenu.css */


/* this is the clipping region for the menu. it's width and height get set by script, depending on the size of the items table */
Expand Down
2 changes: 1 addition & 1 deletion doc/workbench.html
Expand Up @@ -35,7 +35,7 @@
These schema files are XML metadata models that are created in a specific structure used by the Mondrian engine.
These XML models can be considered cube-like structures which utilize existing FACT and DIMENSION tables found in your RDBMS.
It does not require that an actual physical cube is built or maintained; only that the metadata model is created.</p>
<p><b><i>Note</i></b>: For documentation on publishing Mondrian Schemas to Pentaho's BI Platform, see <a href="http://wiki.pentaho.org/display/PentahoDoc/Publishing+an+Analysis+Schema+Using+Schema+Workbench">Publishing an Analysis Schema Using the Schema Workbench</a>
<p><b><i>Note</i></b>: For documentation on publishing Mondrian Schemas to Pentaho's BI Platform, see <a href="http://wiki.pentaho.com/display/PentahoDoc/Publishing+an+Analysis+Schema+Using+Schema+Workbench">Publishing an Analysis Schema Using the Schema Workbench</a>


<img src="images/workbench_schema_editor.png">
Expand Down
2 changes: 1 addition & 1 deletion ivy.xml
Expand Up @@ -19,7 +19,7 @@
<license name="EPL" url="http://www.eclipse.org/legal/epl-v10.html"/>
<ivyauthor name="Julian Hyde" />
<repository name="pentaho-repository" url="http://repo.pentaho.org/artifactory"/>
<description homepage="http://mondrian.pentaho.org">
<description homepage="http://mondrian.pentaho.com">
Mondrian is an OLAP (online analytical processing) engine written
in Java. It reads from JDBC data sources, aggregates data in a
memory cache, and implements the MDX language and the olap4j and
Expand Down
2 changes: 1 addition & 1 deletion src/main/mondrian/rolap/MemberCacheHelper.java
Expand Up @@ -24,7 +24,7 @@
/**
* Encapsulation of member caching.
*
* @author Will Gorman (wgorman@pentaho.org)
* @author Will Gorman
* @version $Id$
*/
public class MemberCacheHelper implements MemberCache {
Expand Down
2 changes: 1 addition & 1 deletion src/main/mondrian/rolap/RolapAllCubeMember.java
Expand Up @@ -21,7 +21,7 @@
* <p>A minor extension to {@link mondrian.rolap.RolapCubeMember} because the
* naming rules are different.
*
* @author Will Gorman (wgorman@pentaho.org)
* @author Will Gorman
* @version $Id$
*/
class RolapAllCubeMember
Expand Down
2 changes: 1 addition & 1 deletion src/main/mondrian/rolap/RolapCubeDimension.java
Expand Up @@ -22,7 +22,7 @@
/**
* RolapCubeDimension wraps a RolapDimension for a specific Cube.
*
* @author Will Gorman (wgorman@pentaho.org)
* @author Will Gorman
* @version $Id$
*/
public class RolapCubeDimension extends RolapDimension {
Expand Down
2 changes: 1 addition & 1 deletion src/main/mondrian/rolap/RolapCubeHierarchy.java
Expand Up @@ -30,7 +30,7 @@
/**
* Hierarchy that is associated with a specific Cube.
*
* @author Will Gorman (wgorman@pentaho.org)
* @author Will Gorman
* @version $Id$
*/
public class RolapCubeHierarchy extends RolapHierarchy {
Expand Down
2 changes: 1 addition & 1 deletion src/main/mondrian/rolap/RolapCubeLevel.java
Expand Up @@ -22,7 +22,7 @@
/**
* RolapCubeLevel wraps a RolapLevel for a specific Cube.
*
* @author Will Gorman (wgorman@pentaho.org)
* @author Will Gorman
* @version $Id$
*/
public class RolapCubeLevel extends RolapLevel {
Expand Down
2 changes: 1 addition & 1 deletion src/main/mondrian/rolap/RolapCubeMember.java
Expand Up @@ -25,7 +25,7 @@
* reference the wrapped Member. Methods that only contain calls to other
* methods do not need wrapped.
*
* @author Will Gorman (wgorman@pentaho.org)
* @author Will Gorman
* @version $Id$
*/
public class RolapCubeMember
Expand Down
2 changes: 1 addition & 1 deletion testsrc/main/mondrian/olap/fun/FunctionTest.java
Expand Up @@ -7142,7 +7142,7 @@ public void testOrderCalc() {
/**
* Verifies that the order function works with a defined member.
* See this forum post for additional information:
* http://forums.pentaho.org/showthread.php?p=179473#post179473
* http://forums.pentaho.com/showthread.php?p=179473#post179473
*/
public void testOrderWithMember() {
assertQueryReturns(
Expand Down

0 comments on commit 1d4b953

Please sign in to comment.