vitalif
/
openesb-components
mirror of https://github.com/vitalif/openesb-components
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix build errors

master
Vitaliy Filippov 2015-11-09 14:56:52 +03:00
parent 867690ee9d
commit 7b1022549f
14 changed files with 104 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
global-common/m2.ant
View File

@ -70,6 +70,8 @@
<!-- default ant-junit version if caller does not supply: -->
<available file="${maven.repo.local}/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"
property="ant-junit-version" value="1.6.5" />
<available file="${maven.repo.local}/ant/ant-junit/1.9.6/ant-junit-1.9.6.jar"
property="ant-junit-version" value="1.9.6" />
<fail unless="ant-junit-version">
PLEASE SUPPLY ant-junit-version

2
ojc-core/build-common/ojc-common/pom.xml
View File

@ -599,7 +599,7 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
<!-- this sets the versions for https://hulp.dev.java.net/i18n ant task: -->
<I18NTASK_CLASS>net.java.hulp.i18n.buildtools.I18NTask</I18NTASK_CLASS>
<I18N_XML_TASK_CLASS>net.java.hulp.i18n.buildtools.I18nXmlTask</I18N_XML_TASK_CLASS>
<I18NTASK_VERSION>2.1-SNAPSHOT</I18NTASK_VERSION>
<I18NTASK_VERSION>2.2</I18NTASK_VERSION>
<I18NTASK_JAR>${maven.repo.local}/net/java/hulp/i18ntask/net.java.hulp.i18ntask/${I18NTASK_VERSION}/net.java.hulp.i18ntask-${I18NTASK_VERSION}.jar</I18NTASK_JAR>
</properties>

22
ojc-core/compileconf/pom.xml
View File

@ -848,9 +848,25 @@
<repositories>
<!-- we currently only pick up wsdl4j version 1.6.2 from here. RT 8/20/07. -->
<repository>
<id>cropwiki m2repo</id>
<name>cropwiki maven2 repository</name>
<url>http://cropwiki.irri.org/m2repo</url>
<!--<id>cropwiki m2repo</id>-->
<id>build openesb</id>
<!--<name>cropwiki maven2 repository</name>-->
<name>build openesb</name>
<!--<url>http://cropwiki.irri.org/m2repo</url>-->
<url>http://build.open-esb.net:8081/nexus/content/repositories/openesb-release</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>build openesb2</id>
<name>build openesb2</name>
<url>http://build.open-esb.net:8081/nexus/content/groups/openESBMain</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>

106
ojc-core/component-common/axiondb/external/src/jxl/format/PaperSize.java vendored
View File

@ -92,7 +92,7 @@ public final class PaperSize
/** US Letter 8.5 x 11" */
public static final PaperSize LETTER = new PaperSize(1);
/** Letter small 8.5" × 11" */
/** Letter small 8.5" Ч 11" */
public static final PaperSize LETTER_SMALL = new PaperSize(2);
/** Tabloid 11" x 17" */
@ -167,168 +167,168 @@ public final class PaperSize
/** E 34" x 44" */
public static final PaperSize E = new PaperSize(26);
/** Envelope DL 110mm × 220mm */
/** Envelope DL 110mm Ч 220mm */
public static final PaperSize ENVELOPE_DL = new PaperSize(27);
/** Envelope C5 162mm × 229mm */
/** Envelope C5 162mm Ч 229mm */
public static final PaperSize ENVELOPE_C5 = new PaperSize(28);
/** Envelope C3 324mm × 458mm */
/** Envelope C3 324mm Ч 458mm */
public static final PaperSize ENVELOPE_C3 = new PaperSize(29);
/** Envelope C4 229mm × 324mm */
/** Envelope C4 229mm Ч 324mm */
public static final PaperSize ENVELOPE_C4 = new PaperSize(30);
/** Envelope C6 114mm × 162mm */
/** Envelope C6 114mm Ч 162mm */
public static final PaperSize ENVELOPE_C6 = new PaperSize(31);
/** Envelope C6/C5 114mm × 229mm */
/** Envelope C6/C5 114mm Ч 229mm */
public static final PaperSize ENVELOPE_C6_C5 = new PaperSize(32);
/** B4 (ISO) 250mm × 353mm */
/** B4 (ISO) 250mm Ч 353mm */
public static final PaperSize B4_ISO = new PaperSize(33);
/** B5 (ISO) 176mm × 250mm */
/** B5 (ISO) 176mm Ч 250mm */
public static final PaperSize B5_ISO = new PaperSize(34);
/** B6 (ISO) 125mm × 176mm */
/** B6 (ISO) 125mm Ч 176mm */
public static final PaperSize B6_ISO = new PaperSize(35);
/** Envelope Italy 110mm × 230mm */
/** Envelope Italy 110mm Ч 230mm */
public static final PaperSize ENVELOPE_ITALY = new PaperSize(36);
/** Envelope Monarch 3 7/8" × 7.5" */
/** Envelope Monarch 3 7/8" Ч 7.5" */
public static final PaperSize ENVELOPE_MONARCH = new PaperSize(37);
/** 6.75 Envelope 3 5/8" × 6.5" */
/** 6.75 Envelope 3 5/8" Ч 6.5" */
public static final PaperSize ENVELOPE_6_75 = new PaperSize(38);
/** US Standard Fanfold 14 7/8" × 11" */
/** US Standard Fanfold 14 7/8" Ч 11" */
public static final PaperSize US_FANFOLD = new PaperSize(39);
/** German Std. Fanfold 8.5" × 12" */
/** German Std. Fanfold 8.5" Ч 12" */
public static final PaperSize GERMAN_FANFOLD = new PaperSize(40);
/** German Legal Fanfold 8.5" × 13" */
/** German Legal Fanfold 8.5" Ч 13" */
public static final PaperSize GERMAN_LEGAL_FANFOLD = new PaperSize(41);
/** B4 (ISO) 250mm × 353mm */
/** B4 (ISO) 250mm Ч 353mm */
public static final PaperSize B4_ISO_2 = new PaperSize(42);
/** Japanese Postcard 100mm × 148mm */
/** Japanese Postcard 100mm Ч 148mm */
public static final PaperSize JAPANESE_POSTCARD = new PaperSize(43);
/** 9×11 9" × 11" */
/** 9Ч11 9" Ч 11" */
public static final PaperSize SIZE_9x11 = new PaperSize(44);
/** 10×11 10" × 11" */
/** 10Ч11 10" Ч 11" */
public static final PaperSize SIZE_10x11 = new PaperSize(45);
/** 15×11 15" × 11" */
/** 15Ч11 15" Ч 11" */
public static final PaperSize SIZE_15x11 = new PaperSize(46);
/** Envelope Invite 220mm × 220mm */
/** Envelope Invite 220mm Ч 220mm */
public static final PaperSize ENVELOPE_INVITE = new PaperSize(47);
/* 48 & 49 Undefined */
/** Letter Extra 9.5" × 12" */
/** Letter Extra 9.5" Ч 12" */
public static final PaperSize LETTER_EXTRA = new PaperSize(50);
/** Legal Extra 9.5" × 15" */
/** Legal Extra 9.5" Ч 15" */
public static final PaperSize LEGAL_EXTRA = new PaperSize(51);
/** Tabloid Extra 11 11/16" × 18" */
/** Tabloid Extra 11 11/16" Ч 18" */
public static final PaperSize TABLOID_EXTRA = new PaperSize(52);
/** A4 Extra 235mm × 322mm */
/** A4 Extra 235mm Ч 322mm */
public static final PaperSize A4_EXTRA = new PaperSize(53);
/** Letter Transverse 8.5" × 11" */
/** Letter Transverse 8.5" Ч 11" */
public static final PaperSize LETTER_TRANSVERSE = new PaperSize(54);
/** A4 Transverse 210mm × 297mm */
/** A4 Transverse 210mm Ч 297mm */
public static final PaperSize A4_TRANSVERSE = new PaperSize(55);
/** Letter Extra Transv. 9.5" × 12" */
/** Letter Extra Transv. 9.5" Ч 12" */
public static final PaperSize LETTER_EXTRA_TRANSVERSE = new PaperSize(56);
/** Super A/A4 227mm × 356mm */
/** Super A/A4 227mm Ч 356mm */
public static final PaperSize SUPER_A_A4 = new PaperSize(57);
/** Super B/A3 305mm × 487mm */
/** Super B/A3 305mm Ч 487mm */
public static final PaperSize SUPER_B_A3 = new PaperSize(58);
/** Letter Plus 8.5" x 12 11/16" */
public static final PaperSize LETTER_PLUS = new PaperSize(59);
/** A4 Plus 210mm × 330mm */
/** A4 Plus 210mm Ч 330mm */
public static final PaperSize A4_PLUS = new PaperSize(60);
/** A5 Transverse 148mm × 210mm */
/** A5 Transverse 148mm Ч 210mm */
public static final PaperSize A5_TRANSVERSE = new PaperSize(61);
/** B5 (JIS) Transverse 182mm × 257mm */
/** B5 (JIS) Transverse 182mm Ч 257mm */
public static final PaperSize B5_TRANSVERSE = new PaperSize(62);
/** A3 Extra 322mm × 445mm */
/** A3 Extra 322mm Ч 445mm */
public static final PaperSize A3_EXTRA = new PaperSize(63);
/** A5 Extra 174mm × 235mm */
/** A5 Extra 174mm Ч 235mm */
public static final PaperSize A5_EXTRA = new PaperSize(64);
/** B5 (ISO) Extra 201mm × 276mm */
/** B5 (ISO) Extra 201mm Ч 276mm */
public static final PaperSize B5_EXTRA = new PaperSize(65);
/** A2 420mm × 594mm */
/** A2 420mm Ч 594mm */
public static final PaperSize A2 = new PaperSize(66);
/** A3 Transverse 297mm × 420mm */
/** A3 Transverse 297mm Ч 420mm */
public static final PaperSize A3_TRANSVERSE = new PaperSize(67);
/** A3 Extra Transverse 322mm × 445mm */
/** A3 Extra Transverse 322mm Ч 445mm */
public static final PaperSize A3_EXTRA_TRANSVERSE = new PaperSize(68);
/** Dbl. Japanese Postcard 200mm × 148mm */
/** Dbl. Japanese Postcard 200mm Ч 148mm */
public static final PaperSize DOUBLE_JAPANESE_POSTCARD = new PaperSize(69);
/** A6 105mm × 148mm */
/** A6 105mm Ч 148mm */
public static final PaperSize A6 = new PaperSize(70);
/* 71 - 74 undefined */
/** Letter Rotated 11" × 8.5" */
/** Letter Rotated 11" Ч 8.5" */
public static final PaperSize LETTER_ROTATED = new PaperSize(75);
/** A3 Rotated 420mm × 297mm */
/** A3 Rotated 420mm Ч 297mm */
public static final PaperSize A3_ROTATED = new PaperSize(76);
/** A4 Rotated 297mm × 210mm */
/** A4 Rotated 297mm Ч 210mm */
public static final PaperSize A4_ROTATED = new PaperSize(77);
/** A5 Rotated 210mm × 148mm */
/** A5 Rotated 210mm Ч 148mm */
public static final PaperSize A5_ROTATED = new PaperSize(78);
/** B4 (JIS) Rotated 364mm × 257mm */
/** B4 (JIS) Rotated 364mm Ч 257mm */
public static final PaperSize B4_ROTATED = new PaperSize(79);
/** B5 (JIS) Rotated 257mm × 182mm */
/** B5 (JIS) Rotated 257mm Ч 182mm */
public static final PaperSize B5_ROTATED = new PaperSize(80);
/** Japanese Postcard Rot. 148mm × 100mm */
/** Japanese Postcard Rot. 148mm Ч 100mm */
public static final PaperSize JAPANESE_POSTCARD_ROTATED = new PaperSize(81);
/** Dbl. Jap. Postcard Rot. 148mm × 200mm */
/** Dbl. Jap. Postcard Rot. 148mm Ч 200mm */
public static final PaperSize DOUBLE_JAPANESE_POSTCARD_ROTATED = new PaperSize(82);
/** A6 Rotated 148mm × 105mm */
/** A6 Rotated 148mm Ч 105mm */
public static final PaperSize A6_ROTATED = new PaperSize(83);
/* 84 - 87 undefined */
/** B6 (JIS) 128mm × 182mm */
/** B6 (JIS) 128mm Ч 182mm */
public static final PaperSize B6 = new PaperSize(88);
/** B6 (JIS) Rotated 182mm × 128mm */
/** B6 (JIS) Rotated 182mm Ч 128mm */
public static final PaperSize B6_ROTATED = new PaperSize(89);
}

8
ojc-core/component-common/axiondb/external/src/jxl/write/NumberFormat.java vendored
View File

@ -48,23 +48,23 @@ public class NumberFormat extends NumberFormatRecord implements DisplayFormat
* Constant format string for the Euro currency symbol where it precedes
* the format
*/
public static final String CURRENCY_EURO_PREFIX = "[$€-2]";
public static final String CURRENCY_EURO_PREFIX = "[$Ђ-2]";
/**
* Constant format string for the Euro currency symbol where it precedes
* the format
*/
public static final String CURRENCY_EURO_SUFFIX = "[$€-1]";
public static final String CURRENCY_EURO_SUFFIX = "[$Ђ-1]";
/**
* Constant format string for the UK pound sign
*/
public static final String CURRENCY_POUND = "£";
public static final String CURRENCY_POUND = "Ј";
/**
* Constant format string for the Japanese Yen sign
*/
public static final String CURRENCY_JAPANESE_YEN = "[$¥-411]";
public static final String CURRENCY_JAPANESE_YEN = "[$Ґ-411]";
/**
* Constant format string for the US Dollar sign

14
ojc-core/component-common/axiondb/src/org/axiondb/engine/commands/AxionQueryPlanner.java
View File

@ -88,7 +88,7 @@ import org.axiondb.util.ValuePool;
/**
* Query Planner used in select and sub-select Query. I use Rule-based analysis and
* decision-making – rules expressing proven, efficient statement execution methods
* decision-making – rules expressing proven, efficient statement execution methods
* determine how operations and their attributes are built and combined.
* <p>
* One of the important components is the Query Optimizer. Its goal, for every SQL
@ -106,15 +106,15 @@ import org.axiondb.util.ValuePool;
* the operation. In Axion in most cases these trees are represented as RowIterators.
* <p>
* Some of the operators that may be present in the tree are:
* <li>Restrict – reduces the number of output rows by eliminating those that fail to
* <li>Restrict – reduces the number of output rows by eliminating those that fail to
* satisfy some condition applied to the input. Restrict operators appear in the tree from
* WHERE clauses and JOINs. example: FilteringRowIterator
* <li>Join – combines two input tables into a single output table that contains some
* <li>Join – combines two input tables into a single output table that contains some
* combination of rows from the inputs. Joins appear in the tree from the use of FROM
* clauses and from JOIN clauses. example: NestedLoopJoinRowIterator.
* <li>Sort – changes the ordering of rows in an input table to produce an output table
* <li>Sort – changes the ordering of rows in an input table to produce an output table
* in the desired order. example: SortedRowIterator
* <li>Table – represents a Table scan or an Index scan, reading data from a given table
* <li>Table – represents a Table scan or an Index scan, reading data from a given table
* by either its default index (table scan) or a specific index (index scan). Leaf nodes
* of the tree are always references to database tables.
* <p>
@ -196,8 +196,8 @@ import org.axiondb.util.ValuePool;
* right subtree.
* <li>No other scan on that index has already been set.
* <p>
* When there is an index defined on the left subtree’s table instead of on the right, the
* optimizer swaps the subtrees to make an ANL join possible. When neither subtree’s table
* When there is an index defined on the left subtree’s table instead of on the right, the
* optimizer swaps the subtrees to make an ANL join possible. When neither subtree’s table
* has an index defined on the join column, the optimizer creats a dynamic index on one of
* the subtree.
* <p>

4
ojc-core/component-common/axiondb/src/org/axiondb/engine/rowiterators/IndexNestedLoopJoinedRowIterator.java
View File

@ -55,8 +55,8 @@ import org.axiondb.RowIterator;
* right subtree.
* <li>No other scan on that index has already been set.
* <p>
* When there is an index defined on the left subtree’s table instead of on the right, the
* optimizer swaps the subtrees to make an ANL join possible. When neither subtree’s table
* When there is an index defined on the left subtree’s table instead of on the right, the
* optimizer swaps the subtrees to make an ANL join possible. When neither subtree’s table
* has an index defined on the join column, the optimizer creats a dynamic index on one of
* the subtree.
*

2
ojc-core/component-common/component-toolkit/pom.xml
View File

@ -83,7 +83,7 @@
<dependency>
<groupId>net.java.hulp.i18ntask</groupId>
<artifactId>net.java.hulp.i18ntask</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>

2
ojc-core/component-common/crl/pom.xml
View File

@ -85,7 +85,7 @@
<dependency>
<groupId>net.java.hulp.i18ntask</groupId>
<artifactId>net.java.hulp.i18ntask</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>

6
ojc-core/component-common/jamsel/pom.xml
View File

@ -68,5 +68,11 @@
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

2
ojc-core/component-common/pom.xml
View File

@ -46,7 +46,7 @@
</build>
<modules>
<!-- components: -->
<module>axiondb</module>
<!--<module>axiondb</module>-->
<module>bpelmodel</module>
<module>test-util</module>
<module>common-util</module>

1
ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/JDBCClusterManager.java
View File

@ -509,6 +509,7 @@ public class JDBCClusterManager {
int rowsUpdated = ps.executeUpdate();
recordInserted = true;
} catch (final Exception e) {
mLogger.log(Level.WARNING, e.getLocalizedMessage());
mLogger.log(Level.INFO, mMessages.getString("DBBC-R10903.JCM_RECORD_LOCKED", new Object[]{getInstanceName()}));
recordInserted = false;
}finally{

1
ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/JDBCNormalizer.java
View File

@ -1625,6 +1625,7 @@ public class JDBCNormalizer {
int rowsUpdated = ps.executeUpdate();
recordInserted = true;
} catch (final Exception e) {
mLogger.log(Level.WARNING, e.getLocalizedMessage());
mLogger.log(Level.INFO, mMessages.getString(
"DBBC-R01127.JDBCN_RECORD_LOCKED",
new Object[]{endpoint.getInstanceName()}));

5
ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/model/metadata/DBMetaData.java
View File

@ -84,6 +84,11 @@ class DriverShim implements Driver {
return this.driver.getMinorVersion();
}
//@Override
public Logger getParentLogger() {
return null;
}
//@Override
public DriverPropertyInfo[] getPropertyInfo(final String u, final Properties p) throws SQLException {
return this.driver.getPropertyInfo(u, p);