Skip to content

Commit

Permalink
Fixes code formatting issues. Sets the build number to 1.0.1.500 for …
Browse files Browse the repository at this point in the history
…a tentative release.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@500 c6a108a4-781c-0410-a6c6-c2d559e19af0
  • Loading branch information
lucboudreau committed Feb 6, 2012
1 parent af107f8 commit c879232
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 16 deletions.
4 changes: 4 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ Among other notable changes, this version introduces support for JDBC 4.1.
- Fixes an issue with SAP BW where the XMLA driver would scan
through all the available databases/catalogs/schemas, causing
access control exceptions.
- Added the ability to pass server specific properties as part
of the XMLA's PropertyList payload.
- The XmlaDriver now exposes a public constructor to prevent
errors in Sun's JDBC implementation.

# Olap4j 1.0.0

Expand Down
2 changes: 1 addition & 1 deletion RELEASE_CHECKLIST.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

Pay close attention to the Ant targets named compileJdk1* and ensure that each
JVM compilation phase has compiled the files it needed to. The JDK 1.5 should compile
about 800+ files. The JDK 1.6 must compile the JDBC 4.0 classes (2 files)
about 700+ files. The JDK 1.6 must compile the JDBC 4.0 classes (2 files)
and Java 7 should compile the JDBC 4.1 driver (1 file).

Check the Javadoc warnings, and make sure that the only warnings are related to
Expand Down
4 changes: 2 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
# so that projects such as mondrian can run on the very latest; we switch for a
# specific revision number near to a release. Change 'xxx' the latest subversion
# change number; and put the same number in 'project.revision.minor'.)
project.revision=1.0.1-SNAPSHOT
project.revision=1.0.1.500
#project.revision=1.0.0.xxx

project.revision.major=1
project.revision.minor=0001494
project.revision.minor=00010500

ivy.artifact.id=olap4j
ivy.artifact.group=org.olap4j
Expand Down
6 changes: 3 additions & 3 deletions src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class XmlaOlap4jCatalog implements Catalog, Named {
private final String name;
final DeferredNamedListImpl<XmlaOlap4jSchema> schemas;
private final XmlaOlap4jDatabase database;
private List<String> roles;
private List<String> roles;

XmlaOlap4jCatalog(
XmlaOlap4jDatabaseMetaData olap4jDatabaseMetaData,
Expand Down Expand Up @@ -153,9 +153,9 @@ public NamedList<Schema> getSchemas() throws OlapException {
public String getName() {
return name;
}

protected List<String> getAvailableRoles() {
return roles;
return roles;
}

public OlapDatabaseMetaData getMetaData() {
Expand Down
2 changes: 1 addition & 1 deletion src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ String makeConnectionPropertyList() {
StringBuilder buf = new StringBuilder();
for (String prop : databaseProperties.keySet()) {
if (prop.startsWith(
XmlaOlap4jDriver.Property.CACHE.name()))
XmlaOlap4jDriver.Property.CACHE.name()))
{
// Skip over the pass-through properties for the cache.
continue;
Expand Down
16 changes: 8 additions & 8 deletions src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@
* {@link org.olap4j.driver.xmla.XmlaOlap4jConnection#getAvailableRoleNames}
* </td></tr>
* <tr><td>User</td> <td>User name to use when establishing a
* connection to the server. The credentials are passed
* using the HTTP Basic authentication protocol,
* but are also sent as part of the SOAP Security
* headers.
* connection to the server. The credentials are
* passed using the HTTP Basic authentication
* protocol, but are also sent as part of the SOAP
* Security headers.
* </td></tr>
* <tr><td>Password</td> <td>Password to use when establishing a
* connection to the server. The credentials are passed
* using the HTTP Basic authentication protocol,
* but are also sent as part of the SOAP Security
* headers.
* connection to the server. The credentials are
* passed using the HTTP Basic authentication
* protocol, but are also sent as part of the SOAP
* Security headers.
* </td></tr>
* </table>
*
Expand Down
2 changes: 1 addition & 1 deletion testsrc/org/olap4j/XmlaConnectionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public void testPropertyList() throws Exception {
final String oldValue = XmlaTester.getProxyClassName();
try {
XmlaTester.setProxyClassName(
PropertyListTestProxy.class.getName());
PropertyListTestProxy.class.getName());

OlapConnection connection =
tester.getWrapper().unwrap(
Expand Down

0 comments on commit c879232

Please sign in to comment.