[jboss-svn-commits] JBL Code SVN: r26502 - in labs/jbosstm/trunk: ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 13 06:55:49 EDT 2009
Author: jhalliday
Date: 2009-05-13 06:55:49 -0400 (Wed, 13 May 2009)
New Revision: 26502
Removed:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/orbix2000/
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/hporb/
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/orbix2000/
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/hporb_1_0.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/hporb_1_2.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/orbix2000_1_2.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/orbix2000_2_0.java
Modified:
labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextPropagationManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryInit.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/StatusChecker.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/config/idl-compiler-definitions.xml
labs/jbosstm/trunk/ArjunaJTS/orbportability/orbspecific.xml
labs/jbosstm/trunk/ArjunaJTS/trailmap/docs/JBossTS_ORBPortability.xml
labs/jbosstm/trunk/qa/tests/build-jts.xml
Log:
Removed obsolete orbix2000 and hporb files. JBTM-538
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2009-05-13 10:55:49 UTC (rev 26502)
@@ -60,14 +60,6 @@
<!-- Files that need word substitutions -->
- <property
- name="com.hp.mw.orbportability.orbspecific.orbix.classpath"
- value="../lib/jts.jar:../../common/lib/common.jar:../../orbportability/lib/orbportability.jar:../../orbportability/lib/ext/orbportability-ant.jar:../../arjuna/lib/arjuna.jar:../../txoj/lib/txoj.jar"/>
-
- <property
- name="com.hp.mw.orbportability.orbspecific.hporb.classpath"
- value="../lib/jts.jar:../../common/lib/common.jar:../../orbportability/lib/orbportability.jar:../../orbportability/lib/ext/orbportability-ant.jar:../../arjuna/lib/arjuna.jar:../../txoj/lib/txoj.jar"/>
-
<property name="com.hp.mwlabs.ts.jacorb.lib" location="../jacorb/lib"/>
<path id="com.hp.mwlabs.ts.jacorb.classpath">
<fileset dir="${com.hp.mwlabs.ts.jacorb.lib}" includes="*.jar"/>
@@ -189,7 +181,7 @@
<target name="com.hp.mwlabs.ts.jtax.tests.run" depends="com.hp.mwlabs.ts.jtax.tests.compile" if="com.hp.mwlabs.ts.jtax.tests.compile">
<mkdir dir="${com.hp.mwlabs.ts.jtax.reports.dest}"/>
-
+
<junit printsummary="yes">
<formatter type="plain"/>
<classpath>
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextPropagationManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextPropagationManager.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextPropagationManager.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
* of individual contributors.
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -78,22 +78,6 @@
switch (orbType)
{
- case ORBType.ORBIX2000:
- {
- if (interposition)
- System.setProperty("org.omg.PortableInterceptor.ORBInitializerClass.com.arjuna.ats.jts.orbspecific.orbix2000.interceptors.interposition.InterpositionORBInitializerImpl", "com.arjuna.ats.jts.orbspecific.orbix2000.interceptors.interposition.InterpositionORBInitializerImpl");
- else
- System.setProperty("org.omg.PortableInterceptor.ORBInitializerClass.com.arjuna.ats.jts.orbspecific.orbix2000.interceptors.context.ContextORBInitializerImpl", "com.arjuna.ats.jts.orbspecific.orbix2000.interceptors.context.ContextORBInitializerImpl");
- }
- break;
- case ORBType.HPORB:
- {
- if (interposition)
- System.setProperty("org.omg.PortableInterceptor.ORBInitializerClass.com.arjuna.ats.jts.orbspecific.hporb.interceptors.interposition.InterpositionORBInitializerImpl", "com.arjuna.ats.jts.orbspecific.hporb.interceptors.interposition.InterpositionORBInitializerImpl");
- else
- System.setProperty("org.omg.PortableInterceptor.ORBInitializerClass.com.arjuna.ats.jts.orbspecific.hporb.interceptors.context.ContextORBInitializerImpl", "com.arjuna.ats.jts.orbspecific.hporb.interceptors.context.ContextORBInitializerImpl");
- }
- break;
case ORBType.JAVAIDL:
{
if (interposition)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -138,15 +138,6 @@
{
switch (orbType)
{
- case ORBType.ORBIX2000:
- {
- theClassName = "com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit";
- recoveryService = (RecoveryServiceInit) Thread.currentThread().getContextClassLoader().loadClass(theClassName).newInstance();
- recoveryService.startRCservice();
-
- result = true;
- }
- break;
case ORBType.JACORB:
{
theClassName = "com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit";
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryInit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryInit.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryInit.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -101,12 +101,6 @@
switch (orbType)
{
- case ORBType.ORBIX2000:
- {
- InitClassName = "com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRecoveryInit";
- recoveryCoordinatorInitialiser = Thread.currentThread().getContextClassLoader().loadClass(InitClassName).newInstance();
- }
- break;
case ORBType.JACORB:
{
InitClassName = "com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRecoveryInit";
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/StatusChecker.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/StatusChecker.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/StatusChecker.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
* of individual contributors.
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -68,10 +68,10 @@
* created it - assuming the transaction still exists.
*
*
- * (relies on the fact (true for 2.1) that any ArjunaFactory can be used to
+ * (relies on the fact (true for 2.1) that any ArjunaFactory can be used to
* find the status of any transaction.
*
- * Singleton class
+ * Singleton class
*
* @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_1 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_1] - StatusChecker.getStatus( {0} ) - current status = {1}
* @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_2 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_2] - StatusChecker.getStatus( {0} ) - stored status = {1}
@@ -84,7 +84,7 @@
* @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_9 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_9] - BAD_PARAM exception on trying to contact original process
* @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_10 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_10] - NoTransaction exception on trying to contact original process
* @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_11 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_11] - CORBA exception on trying to contact original process "
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12] - Exception on trying to contact original process
+ * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12] - Exception on trying to contact original process
* @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_13 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_13] - StatusChecker.getStatus({0}) - no factory, process previously dead
* @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_14 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_14] - no known contactitem for {0}
* @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_15 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_15] - surprise item in StatusChecker list for {0}, {1}
@@ -92,14 +92,14 @@
public class StatusChecker
{
- /* the interface of this class is intended to allow for possible
+ /* the interface of this class is intended to allow for possible
* future extension to do statuschecking by other (non-corba) means
*
* On the other hand, there is some nasty interlinking between bits of this
- * class - some redesign into separate classes would make things easier to
+ * class - some redesign into separate classes would make things easier to
* follow.
*/
-
+
// lookup the relevant factory according to the uid of the FactoryContactItem
private Hashtable _itemFromUid;
@@ -108,7 +108,7 @@
/**
* create a static singleton to do the work for the static methods
*/
-static
+static
{
_checker = new StatusChecker();
}
@@ -122,8 +122,8 @@
{
if (jtsLogger.logger.isDebugEnabled())
{
- jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"StatusChecker.get_status("+transactionUid+", "+itemUid+")");
}
@@ -140,8 +140,8 @@
{
if (jtsLogger.logger.isDebugEnabled())
{
- jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"StatusChecker.get_current_status("+transactionUid+", "+itemUid+")");
}
@@ -173,11 +173,11 @@
{
if (jtsLogger.logger.isDebugEnabled())
{
- jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"StatusChecker.checkOriginalStatus("+transactionUid+", "+itemUid+", "+checkTheObjectStore+")");
}
-
+
FactoryContactItem item = getItem(itemUid);
if (item != null)
@@ -201,11 +201,11 @@
{
if (jtsLogger.logger.isDebugEnabled())
{
- jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"StatusChecker.getStatus("+transactionUid+", "+item+", "+checkTheObjectStore+")");
}
-
+
ArjunaFactory factory = item.getFactory();
if (factory != null)
@@ -221,9 +221,9 @@
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_1",
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_1",
new Object[]{transactionUid, Utility.stringStatus(otsStatus)});
}
@@ -241,9 +241,9 @@
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_2",
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_2",
new Object[]{transactionUid, Utility.stringStatus(otsStatus)});
}
@@ -269,30 +269,30 @@
*/
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_3", new Object[] {transactionUid});
-
+
otsStatus = Status.StatusUnknown;
}
break;
}
}
-
+
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_4",
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_4",
new Object[]{transactionUid, Utility.stringStatus(otsStatus)});
}
-
+
item.markAsAlive();
} catch ( NO_IMPLEMENT ex_noimp) {
// the original application has died
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_5",
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_5",
new Object[]{transactionUid});
}
@@ -302,20 +302,19 @@
// addresses are valid
} catch ( TRANSIENT ex_trans) {
- if (ORBInfo.getOrbEnumValue() == ORBType.ORBIX2000 ||
- ORBInfo.getOrbEnumValue() == ORBType.JACORB)
+ if (ORBInfo.getOrbEnumValue() == ORBType.JACORB)
{
// the original application has (probably) died
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_6",
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_6",
new Object[]{transactionUid});
}
originalDead = true;
}
-
+
} catch ( COMM_FAILURE ex_comm) {
/*
* Probably the original application has died, but only just - do
@@ -323,12 +322,12 @@
*/
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_7",
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_7",
new Object[]{transactionUid});
}
-
+
} catch ( OBJECT_NOT_EXIST ex_noobj) {
// the original process must have gone away, and another one
// come up in the same place
@@ -336,19 +335,19 @@
originalDead = true;
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_8",
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_8",
new Object[]{transactionUid});
}
-
+
} catch ( BAD_PARAM ex_badparam) {
jtsLogger.loggerI18N.warn(" com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_9");
// the transactionUid is invalid !
} catch ( NoTransaction ex_notran) {
jtsLogger.loggerI18N.warn(" com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_10");
// the transactionUid is invalid !
- // no transaction
+ // no transaction
} catch ( SystemException ex_corba ) {
// why did this happen ?
jtsLogger.loggerI18N.warn(" com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_11", ex_corba);
@@ -356,14 +355,14 @@
// this really shouldn't happen
jtsLogger.loggerI18N.warn(" com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12", ex_other);
}
-
+
if (originalDead)
{
item.markAsDead();
// use Inactive as an indication that the parent process
// has gone
-
+
throw new Inactive();
}
else
@@ -376,9 +375,9 @@
// factory in item is null - process already dead
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_13",
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_13",
new Object[]{transactionUid});
}
@@ -430,11 +429,11 @@
/**
- * find the IOR for the ArjunaFactory whose FactoryContactItem was saved with
+ * find the IOR for the ArjunaFactory whose FactoryContactItem was saved with
* this uid. It is possible this Uid was created after the last scan, so if
* it isn't in the hashtable, look for real directly.
*/
-
+
private FactoryContactItem getItem (Uid uid)
{
FactoryContactItem theItem = null;
@@ -444,9 +443,9 @@
theItem = getNewItem(uid);
if (theItem == null) {
-
- // if it's still null, either something has gone wrong
- // - how did it get in the recoverycoordkey when the
+
+ // if it's still null, either something has gone wrong
+ // - how did it get in the recoverycoordkey when the
// factory was unknown
// or it's very old and been fully deleted
@@ -478,7 +477,7 @@
// enter in the uid hashtable
_itemFromUid.put(uid,item);
}
- return item;
+ return item;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -164,77 +164,59 @@
static
{
- String className = null;
+ String className = null;
try
{
- Thread.currentThread().getContextClassLoader().loadClass("com.iona.corba.art.artimpl.ORBImpl");
+ Thread.currentThread().getContextClassLoader().loadClass("org.jacorb.orb.ORB");
- className = _versionPackage+".orbix2000_2_0";
+ className = _versionPackage+".jacorb_2_0";
}
- catch (ClassNotFoundException oe)
+ catch (ClassNotFoundException je)
{
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("com.hp.mw.hporb.ORB");
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass("com.sun.corba.se.internal.Interceptors.PIORB");
- className = _versionPackage+".hporb_1_2";
- }
- catch (ClassNotFoundException he)
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("org.jacorb.orb.ORB");
+ className = _versionPackage+".javaidl_1_4";
+ }
+ catch (ClassNotFoundException joe)
+ {
+ if (opLogger.loggerI18N.isFatalEnabled())
+ {
+ opLogger.loggerI18N.fatal( "com.arjuna.orbportability.ORBInfo.unsupportedorb" );
+ }
- className = _versionPackage+".jacorb_2_0";
- }
- catch (ClassNotFoundException je)
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("com.sun.corba.se.internal.Interceptors.PIORB");
-
- className = _versionPackage+".javaidl_1_4";
- }
- catch (ClassNotFoundException joe)
- {
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.ORBInfo.unsupportedorb" );
- }
-
ExceptionInInitializerError exceptionInInitializerError =
new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.ORBInfo.unsupportedorb"));
exceptionInInitializerError.initCause(joe);
throw exceptionInInitializerError;
- }
- }
- }
- }
+ }
+ }
- try
- {
- Class c = Thread.currentThread().getContextClassLoader().loadClass(className);
+ try
+ {
+ Class c = Thread.currentThread().getContextClassLoader().loadClass(className);
- _theData = (ORBData) c.newInstance();
+ _theData = (ORBData) c.newInstance();
_xml = new SimpleXMLParser(_theData.getORBdata() );
- }
- catch (Exception e)
- {
+ }
+ catch (Exception e)
+ {
if (opLogger.loggerI18N.isFatalEnabled())
{
opLogger.loggerI18N.fatal( "com.arjuna.orbportability.ORBInfo.creationfailed",
- new Object[] { e } );
+ new Object[] { e } );
}
- ExceptionInInitializerError exceptionInInitializerError = new ExceptionInInitializerError(
- MessageFormat.format(opLogger.logMesg.getString("com.arjuna.orbportability.ORBInfo.creationfailed"),
- new Object[] { e } ));
- exceptionInInitializerError.initCause(e);
- throw exceptionInInitializerError;
- }
+ ExceptionInInitializerError exceptionInInitializerError = new ExceptionInInitializerError(
+ MessageFormat.format(opLogger.logMesg.getString("com.arjuna.orbportability.ORBInfo.creationfailed"),
+ new Object[] { e } ));
+ exceptionInInitializerError.initCause(e);
+ throw exceptionInInitializerError;
+ }
}
}
Deleted: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/hporb_1_0.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/hporb_1_0.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/hporb_1_0.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: hporb_1_0.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.orbportability.internal.orbspecific.versions;
-
-import com.arjuna.orbportability.ORBData;
-import com.arjuna.orbportability.ORBType;
-
-public class hporb_1_0 implements ORBData
-{
- public String getORBdata()
- {
- return "<orb-data><name>" + ORBType.hporb +"</name><version><major>1</major><minor>0</minor></version><corba-version><major>2</major><minor>4</minor></corba-version></orb-data>";
- }
-}
Deleted: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/hporb_1_2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/hporb_1_2.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/hporb_1_2.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: hporb_1_2.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.orbportability.internal.orbspecific.versions;
-
-import com.arjuna.orbportability.ORBData;
-import com.arjuna.orbportability.ORBType;
-
-public class hporb_1_2 implements ORBData
-{
- public String getORBdata()
- {
- return "<orb-data><name>" + ORBType.hporb +"</name><version><major>1</major><minor>2</minor></version><corba-version><major>2</major><minor>4</minor></corba-version></orb-data>";
- }
-}
Deleted: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/orbix2000_1_2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/orbix2000_1_2.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/orbix2000_1_2.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: orbix2000_1_2.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.orbportability.internal.orbspecific.versions;
-
-import com.arjuna.orbportability.*;
-
-public class orbix2000_1_2 implements ORBData
-{
- public String getORBdata()
- {
- return "<orb-data><name>" + ORBType.orbix2000 +"</name><version><major>1</major><minor>2</minor></version><corba-version><major>2</major><minor>3</minor></corba-version></orb-data>";
- }
-}
Deleted: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/orbix2000_2_0.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/orbix2000_2_0.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/versions/orbix2000_2_0.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: orbix2000_2_0.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.orbportability.internal.orbspecific.versions;
-
-import com.arjuna.orbportability.*;
-
-public class orbix2000_2_0 implements ORBData
-{
- public String getORBdata()
- {
- return "<orb-data><name>" + ORBType.orbix2000 +"</name><version><major>2</major><minor>0</minor></version><corba-version><major>2</major><minor>4</minor></corba-version></orb-data>";
- }
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -130,84 +130,66 @@
* @message com.arjuna.orbportability.oa.core.OA.caughtexception OA ORB specific class creation failed with: {0}
*/
private final void initialise ()
+{
+ String className = opPropertyManager.propertyManager.getProperty(com.arjuna.orbportability.common.Environment.OA_IMPLEMENTATION);
+
+ if (className == null)
{
- String className = opPropertyManager.propertyManager.getProperty(com.arjuna.orbportability.common.Environment.OA_IMPLEMENTATION);
- if (className == null)
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("com.iona.corba.art.artimpl.ORBImpl");
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass("org.jacorb.orb.ORB");
- className = "com.arjuna.orbportability.internal.orbspecific.orbix2000.oa.implementations.orbix2000_2_0";
- }
- catch (ClassNotFoundException oe)
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("com.hp.mw.hporb.ORB");
+ className = "com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations.jacorb_2_0";
+ }
+ catch (ClassNotFoundException ce)
+ {
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass("com.sun.corba.se.internal.corba.ORB");
- className = "com.arjuna.orbportability.internal.orbspecific.hporb.oa.implementations.hporb_1_2";
- }
- catch (ClassNotFoundException he)
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("org.jacorb.orb.ORB");
-
- className = "com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations.jacorb_2_0";
- }
- catch (ClassNotFoundException ce)
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("com.sun.corba.se.internal.corba.ORB");
-
- className = "com.arjuna.orbportability.internal.orbspecific.javaidl.oa.implementations.javaidl_1_4";
- }
- catch (ClassNotFoundException je)
- {
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.nosupportedorb" );
- }
+ className = "com.arjuna.orbportability.internal.orbspecific.javaidl.oa.implementations.javaidl_1_4";
+ }
+ catch (ClassNotFoundException je)
+ {
+ if (opLogger.loggerI18N.isFatalEnabled())
+ {
+ opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.nosupportedorb" );
+ }
ExceptionInInitializerError exceptionInInitializerError =
new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.oa.core.OA.nosupportedorb") );
exceptionInInitializerError.initCause(je);
throw exceptionInInitializerError;
- }
- }
- }
- }
+ }
+ }
+ }
- }
+ if (opLogger.logger.isDebugEnabled())
+ {
+ opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "OA.initialise() - using OA Implementation "+className);
+ }
- if (opLogger.logger.isDebugEnabled())
+ try
+ {
+ Class c = Thread.currentThread().getContextClassLoader().loadClass(className);
+
+ _theOA = (POAImple) c.newInstance();
+ }
+ catch (Exception e)
+ {
+ if (opLogger.loggerI18N.isFatalEnabled())
{
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA.initialise() - using OA Implementation "+className);
+ opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.caughtexception",
+ new Object[] { e } );
}
- try
- {
- Class c = Thread.currentThread().getContextClassLoader().loadClass(className);
-
- _theOA = (POAImple) c.newInstance();
- }
- catch (Exception e)
- {
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.caughtexception",
- new Object[] { e } );
- }
-
ExceptionInInitializerError exceptionInInitializerError =
new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.oa.core.OA.caughtexception") );
exceptionInInitializerError.initCause(e);
throw exceptionInInitializerError;
- }
}
+}
private com.arjuna.orbportability.orb.core.ORB _theORB;
private com.arjuna.orbportability.oa.core.POAImple _theOA;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java 2009-05-13 10:55:49 UTC (rev 26502)
@@ -114,63 +114,41 @@
String className = opPropertyManager.propertyManager.getProperty(com.arjuna.orbportability.common.Environment.ORB_IMPLEMENTATION);
- if (className == null)
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("com.iona.corba.art.artimpl.ORBImpl");
+ if (className == null)
+ {
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass("org.jacorb.orb.ORB");
- className = "com.arjuna.orbportability.internal.orbspecific.orbix2000.orb.implementations.orbix2000_2_0";
- }
- catch (ClassNotFoundException oe)
- {
- // oe.printStackTrace();
+ className = "com.arjuna.orbportability.internal.orbspecific.jacorb.orb.implementations.jacorb_2_0";
+ }
+ catch (ClassNotFoundException ce)
+ {
+ // ce.printStackTrace();
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("com.hp.mw.hporb.ORB");
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass("com.sun.corba.se.internal.corba.ORB");
- className = "com.arjuna.orbportability.internal.orbspecific.hporb.orb.implementations.hporb_1_2";
- }
- catch (ClassNotFoundException he)
- {
- // he.printStackTrace();
+ className = "com.arjuna.orbportability.internal.orbspecific.javaidl.orb.implementations.javaidl_1_4";
+ }
+ catch (ClassNotFoundException je)
+ {
+ // je.printStackTrace();
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("org.jacorb.orb.ORB");
+ if (opLogger.loggerI18N.isFatalEnabled())
+ {
+ opLogger.loggerI18N.fatal( "com.arjuna.orbportability.orb.core.ORB.unsupportedorb" );
+ }
- className = "com.arjuna.orbportability.internal.orbspecific.jacorb.orb.implementations.jacorb_2_0";
- }
- catch (ClassNotFoundException ce)
- {
- // ce.printStackTrace();
+ ExceptionInInitializerError exceptionInInitializerError =
+ new ExceptionInInitializerError(opLogger.logMesg.getString("com.arjuna.orbportability.orb.core.ORB.unsupportedorb"));
+ exceptionInInitializerError.initCause(je);
+ throw exceptionInInitializerError;
+ }
+ }
+ }
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass("com.sun.corba.se.internal.corba.ORB");
-
- className = "com.arjuna.orbportability.internal.orbspecific.javaidl.orb.implementations.javaidl_1_4";
- }
- catch (ClassNotFoundException je)
- {
- // je.printStackTrace();
-
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.orb.core.ORB.unsupportedorb" );
- }
-
- ExceptionInInitializerError exceptionInInitializerError =
- new ExceptionInInitializerError(opLogger.logMesg.getString("com.arjuna.orbportability.orb.core.ORB.unsupportedorb"));
- exceptionInInitializerError.initCause(je);
- throw exceptionInInitializerError;
- }
- }
- }
- }
- }
-
if (opLogger.logger.isDebugEnabled())
{
opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/config/idl-compiler-definitions.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/config/idl-compiler-definitions.xml 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/config/idl-compiler-definitions.xml 2009-05-13 10:55:49 UTC (rev 26502)
@@ -1,8 +1,8 @@
<!--
JBoss, Home of Professional Open Source
Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a full listing
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
of individual contributors.
This copyrighted material is made available to anyone wishing to use,
modify, copy, or redistribute it subject to the terms and conditions
@@ -15,7 +15,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-
+
(C) 2005-2006,
@author JBoss Inc.
-->
@@ -79,56 +79,4 @@
</orb>
- <orb name="Orbix2000">
-
- <in-parameters>
- <param name="destdir" required="false"/>
- <param name="include" required="false" delimiter=";"/>
- <param name="package" required="false"/>
- <param name="mapping" required="false" delimiter=";"/>
- <param name="filename" required="true"/>
- </in-parameters>
-
- <idl-executable>idl</idl-executable>
-
- <out-parameters>
- <param>-DORB_OTS_SUPPORT</param>
- <param>-DORB_CURRENT_SUPPORT</param>
- <param>-jbase=-P${package}</param>
- <param foreach="mapping">-jbase=-P${mapping}</param>
- <param>-jbase=-O${destdir}</param>
- <param>-jpoa=-P${package}</param>
- <param foreach="mapping">-jpoa=-P${mapping}</param>
- <param>-jpoa=-O${destdir}</param>
- <param foreach="include">-I${include}</param>
- <param>${filename}</param>
- </out-parameters>
-
- </orb>
-
- <orb name="HP-ORB">
-
- <in-parameters>
- <param name="destdir" required="false"/>
- <param name="include" required="false" delimiter=";"/>
- <param name="package" required="false"/>
- <param name="filename" required="true"/>
- <param name="classpath" required="true" delimiter=";" classpath="true"/>
- <param name="mapping" required="false"/>
- </in-parameters>
-
- <idl-executable>java -cp ${classpath} com.hp.mw.hporb.IDLToJava</idl-executable>
-
- <out-parameters>
- <param>${filename}</param>
- <param>-d</param>
- <param>${destdir}</param>
- <param foreach="include">
- <sub-param>-I</sub-param>
- <sub-param>${include}</sub-param>
- </param>
- </out-parameters>
-
- </orb>
-
</idl-compiler-definitions>
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/orbspecific.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/orbspecific.xml 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/orbspecific.xml 2009-05-13 10:55:49 UTC (rev 26502)
@@ -1,8 +1,8 @@
<!--
JBoss, Home of Professional Open Source
Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a full listing
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
of individual contributors.
This copyrighted material is made available to anyone wishing to use,
modify, copy, or redistribute it subject to the terms and conditions
@@ -15,7 +15,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-
+
(C) 2005-2006,
@author JBoss Inc.
-->
@@ -25,8 +25,6 @@
<property name="build.sysclasspath" value="last"/>
<!-- Setup default properties -->
- <property name="com.hp.mw.orbportability.orbspecific.orbix.build" value="no"/>
- <property name="com.hp.mw.orbportability.orbspecific.hporb.build" value="no"/>
<property name="com.hp.mw.orbportability.orbspecific.javaidl.build" value="no"/>
<property name="com.hp.mw.orbportability.orbspecific.jacorb.build" value="yes"/>
@@ -35,8 +33,6 @@
<property name="com.hp.mwlabs.orbportability.orbspecific.default.lib" location="lib/"/>
<property name="com.hp.mwlabs.orbportability.orbspecific.idlsrcdir" location="idl-src/"/>
- <property name="com.hp.mw.orbportability.orbspecific.hporb-home" value="c:/PROGRA~1/hpmw/hporb/"/>
- <property name="com.hp.mw.orbportability.orbspecific.hporb-bootclasspath" value="${java.home}/lib/rt.jar"/>
<property name="com.hp.mw.orbportability.orbspecific.javaidl-home" value="c:/jdk1.4.1_01/"/>
<property name="com.hp.mw.orbportability.orbspecific.javaidl-bootclasspath" value="${java.home}/lib/rt.jar"/>
<property name="com.hp.mw.orbportability.orbspecific.jacorb-home" value="c:/Progra~1/JacORB_2_0/"/>
@@ -45,14 +41,10 @@
</path>
<property name="com.hp.mw.orbportability.orbspecific.jacorb-classpath" refid="com.hp.mw.orbportability.orbspecific.jacorb-classpath"/>
<property name="com.hp.mw.orbportability.orbspecific.jacorb-bootclasspath" value="${java.home}/lib/rt.jar:${java.home}/lib/core.jar:${java.home}/lib/vm.jar:${java.home}/lib/graphics.jar:${java.home}/lib/server.jar"/>
- <property name="com.hp.mw.orbportability.orbspecific.orbix-home" value="c:/PROGRA~1/IONA/"/>
- <property name="com.hp.mw.orbportability.orbspecific.orbix-bootclasspath" value="${java.home}/lib/rt.jar"/>
<property name="com.hp.mw.orbportability.orbspecific.include" value=""/>
<property name="com.hp.mwlabs.classpathbuilderfilename" location="buildsystem.classpath"/>
- <property name="com.hp.mwlabs.orbix.classpathbuilderfilename" location="buildsystem.orbix.classpath"/>
- <property name="com.hp.mwlabs.hporb.classpathbuilderfilename" location="buildsystem.hporb.classpath"/>
<property name="com.hp.mwlabs.javaidl.classpathbuilderfilename" location="buildsystem.javaidl.classpath"/>
<property name="com.hp.mwlabs.jacorb.classpathbuilderfilename" location="buildsystem.jacorb.classpath"/>
@@ -62,7 +54,7 @@
place the generated classes in the given build directory
${com.hp.mw.orbportability.orbspecific.destdir}.
-->
- <target name="com.hp.mwlabs.orbportability.orbspecific.build" depends="com.hp.mwlabs.orbportability.orbspecific.init,com.hp.mwlabs.orbportability.orbspecific.orbix.build,com.hp.mwlabs.orbportability.orbspecific.hporb.build,com.hp.mwlabs.orbportability.orbspecific.javaidl.build,com.hp.mwlabs.orbportability.orbspecific.jacorb.build">
+ <target name="com.hp.mwlabs.orbportability.orbspecific.build" depends="com.hp.mwlabs.orbportability.orbspecific.init,com.hp.mwlabs.orbportability.orbspecific.javaidl.build,com.hp.mwlabs.orbportability.orbspecific.jacorb.build">
</target>
<!--
@@ -73,223 +65,18 @@
com.hp.mw.orbportability.orbspecific.include - IDL Include Directory
com.hp.mw.orbportability.orbspecific.srcdir - PATH to orbspecific package in module to build
-->
- <target name="com.hp.mwlabs.orbportability.orbspecific.orbix.build" depends="com.hp.mwlabs.orbportability.orbspecific.orbix.compile" if="com.hp.mwlabs.orbportability.orbspecific.orbix.build">
- <property name="com.hp.mw.orbportability.orbspecific.lib" value="${com.hp.mwlabs.orbportability.orbspecific.default.lib}"/>
-
- <echo message="Performing Orbix2000 build"/>
-
- <mkdir dir="${com.hp.mw.orbportability.orbspecific.lib}"/>
-
- <jar jarfile="${com.hp.mw.orbportability.orbspecific.lib}/${com.hp.mw.orbportability.orbspecific.modulename}-orbix.jar">
- <fileset dir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}" includes="**/*.class"/>
- <fileset dir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"
- includes="com/arjuna/**/orbspecific/**/*.class"
- excludes="com/arjuna/**/orbspecific/javaidl/**/*.class,com/arjuna/**/orbspecific/hporb/**/*.class,com/arjuna/**/orbspecific/jacorb/**/*.class"/>
- </jar>
-
-
- <classpath-builder filename="${com.hp.mwlabs.orbix.classpathbuilderfilename}" inproperty="build.orbix.classpath" clear="true">
- <classpath>
- <pathelement location="${com.hp.mw.orbportability.orbspecific.lib}/${com.hp.mw.orbportability.orbspecific.modulename}-orbix.jar"/>
- </classpath>
- </classpath-builder>
-
- <classpath-builder filename="${com.hp.mwlabs.classpathbuilderfilename}" inproperty="build.classpath">
- <classpath>
- <pathelement location="${com.hp.mw.orbportability.orbspecific.lib}/${com.hp.mw.orbportability.orbspecific.modulename}-orbix.jar"/>
- </classpath>
- </classpath-builder>
-
- <antcall target="com.hp.mwlabs.orbportability.orbspecific.clean"/>
-
- </target>
-
<target name="com.hp.mwlabs.orbportability.orbspecific.clean">
<delete dir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"/>
<delete dir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"/>
<delete dir="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"/>
<delete file="com.hp.mwlabs.classpathbuilderfilename" quiet="true"/>
- <delete file="com.hp.mwlabs.orbix.classpathbuilderfilename" quiet="true"/>
- <delete file="com.hp.mwlabs.hporb.classpathbuilderfilename" quiet="true"/>
<delete file="com.hp.mwlabs.javaidl.classpathbuilderfilename" quiet="true"/>
<delete file="com.hp.mwlabs.jacorb.classpathbuilderfilename" quiet="true"/>
</target>
- <target name="com.hp.mwlabs.orbportability.orbspecific.orbix.compile" depends="com.hp.mwlabs.orbportability.orbspecific.orbix.idl" if="com.hp.mwlabs.orbportability.orbspecific.orbix.build">
-
- <!-- Compile with debug? -->
- <condition property="com.hp.mwlabs.debug" value="no">
- <equals arg1="${com.hp.mw.debug}" arg2="no"/>
- </condition>
- <property name="com.hp.mwlabs.debug" value="yes"/>
-
- <!-- Compile with deprecation? -->
- <condition property="com.hp.mwlabs.deprecation" value="yes">
- <equals arg1="${com.hp.mw.deprecation}" arg2="yes"/>
- </condition>
- <property name="com.hp.mwlabs.deprecation" value="no"/>
-
- <echo message="Performing Orbix2000 idl compile"/>
-
- <classpath-builder filename="${com.hp.mwlabs.orbix.classpathbuilderfilename};${com.hp.mwlabs.classpathbuilderfilename}" inproperty="build.orbix.classpath"/>
-
- <javac srcdir="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"
- destdir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"
- debug="${com.hp.mwlabs.debug}"
- deprecation="${com.hp.mwlabs.deprecation}"
- bootclasspath="${com.hp.mw.orbportability.orbspecific.orbix-bootclasspath}"
- >
- <classpath>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.orbix.classpath}"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.orbix-home}/orbix_art/1.2/classes/omg.jar"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.orbix-home}/orbix_art/1.2/classes/orbix2000.jar"/>
- <pathelement path="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"/>
- <pathelement path="${build.orbix.classpath}"/>
- </classpath>
- </javac>
-
- <echo message="Performing Orbix2000 orb specific compile"/>
- <javac srcdir="${com.hp.mw.orbportability.orbspecific.srcdir}"
- destdir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"
- includes="**/orbspecific/**/*.java"
- excludes="**/orbspecific/hporb/**/*.java,**/orbspecific/javaidl/**/*.java,**/orbspecific/jacorb/**/*.java"
- debug="${com.hp.mwlabs.debug}"
- bootclasspath="${com.hp.mw.orbportability.orbspecific.orbix-bootclasspath}"
- deprecation="${com.hp.mwlabs.deprecation}">
- <classpath>
- <pathelement path="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.orbix.classpath}"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.orbix-home}/orbix_art/1.2/classes/omg.jar"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.orbix-home}/orbix_art/1.2/classes/orbix2000.jar"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.srcdir}"/>
- <pathelement path="${build.orbix.classpath}"/>
- </classpath>
- </javac>
-
- </target>
-
- <target name="com.hp.mwlabs.orbportability.orbspecific.orbix.idl" if="com.hp.mwlabs.orbportability.orbspecific.orbix.build">
-
- <echo message="Performing Orbix2000 IDL build"/>
-
- <mkdir dir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"/>
- <mkdir dir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"/>
- <mkdir dir="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"/>
-
- <idl-compiler orb="Orbix2000"
- buildlist="${com.hp.mw.orbportability.orbspecific.buildlist}"
- destdir="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"
- parameters="include='${com.hp.mw.orbportability.orbspecific.include};${com.hp.mw.orbportability.orbspecific.orbix-home}/orbix_art/1.2/idl/omg/'"/>
- </target>
-
- <!--
- Required parameters:
-
- com.hp.mw.orbportability.orbspecific.modulename - The name of the module this ORB specific section is part of
- com.hp.mw.orbportability.orbspecific.buildlist - IDL Build List Property
- com.hp.mw.orbportability.orbspecific.include - IDL Include Directory
- com.hp.mw.orbportability.orbspecific.srcdir - PATH to orbspecific package in module to build
- -->
- <target name="com.hp.mwlabs.orbportability.orbspecific.hporb.build" depends="com.hp.mwlabs.orbportability.orbspecific.hporb.compile" if="com.hp.mwlabs.orbportability.orbspecific.hporb.build">
-
- <property name="com.hp.mw.orbportability.orbspecific.lib" value="${com.hp.mwlabs.orbportability.orbspecific.default.lib}"/>
-
- <echo message="Performing HP-ORB build"/>
-
- <mkdir dir="${com.hp.mw.orbportability.orbspecific.lib}"/>
-
- <jar jarfile="${com.hp.mw.orbportability.orbspecific.lib}/${com.hp.mw.orbportability.orbspecific.modulename}-hporb.jar">
- <fileset dir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}" includes="**/*.class"/>
- <fileset dir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"
- includes="com/arjuna/**/orbspecific/**/*.class"
- excludes="com/arjuna/**/orbspecific/javaidl/**/*.class,com/arjuna/**/orbspecific/jacorb/**/*.class,com/arjuna/**/orbspecific/orbix/**/*.class"/>
- </jar>
-
- <classpath-builder filename="${com.hp.mwlabs.hporb.classpathbuilderfilename}" inproperty="build.hporb.classpath" clear="true">
- <classpath>
- <pathelement location="${com.hp.mw.orbportability.orbspecific.lib}/${com.hp.mw.orbportability.orbspecific.modulename}-hporb.jar"/>
- </classpath>
- </classpath-builder>
-
- <classpath-builder filename="${com.hp.mwlabs.classpathbuilderfilename}" inproperty="build.classpath">
- <classpath>
- <pathelement location="${com.hp.mw.orbportability.orbspecific.lib}/${com.hp.mw.orbportability.orbspecific.modulename}-hporb.jar"/>
- </classpath>
- </classpath-builder>
-
- <antcall target="com.hp.mwlabs.orbportability.orbspecific.clean"/>
-
- </target>
-
- <target name="com.hp.mwlabs.orbportability.orbspecific.hporb.compile" depends="com.hp.mwlabs.orbportability.orbspecific.hporb.idl" if="com.hp.mwlabs.orbportability.orbspecific.hporb.build">
-
- <echo message="Performing HP-ORB IDL compile"/>
-
- <classpath-builder filename="${com.hp.mwlabs.hporb.classpathbuilderfilename};${com.hp.mwlabs.classpathbuilderfilename}" inproperty="build.hporb.classpath"/>
-
- <!-- Compile with debug? -->
- <condition property="com.hp.mwlabs.debug" value="no">
- <equals arg1="${com.hp.mw.debug}" arg2="no"/>
- </condition>
- <property name="com.hp.mwlabs.debug" value="yes"/>
-
- <!-- Compile with deprecation? -->
- <condition property="com.hp.mwlabs.deprecation" value="yes">
- <equals arg1="${com.hp.mw.deprecation}" arg2="yes"/>
- </condition>
- <property name="com.hp.mwlabs.deprecation" value="no"/>
-
- <javac srcdir="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"
- destdir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"
- debug="${com.hp.mwlabs.debug}"
- bootclasspath="${com.hp.mw.orbportability.orbspecific.hporb-bootclasspath}"
- deprecation="${com.hp.mwlabs.deprecation}">
- <classpath>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.hporb.classpath}"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.hporb-home}/lib/hporb.jar"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.hporb-home}/lib/common.jar"/>
- <pathelement path="${build.hporb.classpath}"/>
- </classpath>
- </javac>
-
- <echo message="Performing HP-ORB orb specific compile"/>
-
- <javac srcdir="${com.hp.mw.orbportability.orbspecific.srcdir}"
- destdir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"
- includes="**/orbspecific/**/*.java"
- excludes="**/orbspecific/orbix2000/**/*.java,**/orbspecific/jacorb/**/*.java,**/orbspecific/javaidl/**/*.java"
- debug="${com.hp.mwlabs.debug}"
- bootclasspath="${com.hp.mw.orbportability.orbspecific.hporb-bootclasspath}"
- deprecation="${com.hp.mwlabs.deprecation}">
- <classpath>
- <pathelement path="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.hporb.classpath}"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.hporb-home}/lib/hporb.jar"/>
- <pathelement path="${com.hp.mw.orbportability.orbspecific.hporb-home}/lib/common.jar"/>
- <pathelement path="${build.hporb.classpath}"/>
- </classpath>
- </javac>
-
- </target>
-
- <target name="com.hp.mwlabs.orbportability.orbspecific.hporb.idl" if="com.hp.mwlabs.orbportability.orbspecific.hporb.build">
-
- <echo message="Performing HP-ORB IDL build"/>
-
- <mkdir dir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"/>
- <mkdir dir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"/>
- <mkdir dir="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"/>
-
- <idl-compiler orb="HP-ORB"
- buildlist="${com.hp.mw.orbportability.orbspecific.buildlist}"
- destdir="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"
- parameters="include='${com.hp.mw.orbportability.orbspecific.include}',classpath='${com.hp.mw.orbportability.orbspecific.hporb-home}/lib/hporb.jar;${com.hp.mw.orbportability.orbspecific.hporb-home}/lib/ext/xercesImpl.jar;${com.hp.mw.orbportability.orbspecific.hporb-home}/lib/ext/xmlParserAPIs.jar;${com.hp.mw.orbportability.orbspecific.hporb-home}/lib/mw-common.jar'"/>
-
- </target>
-
<target name="com.hp.mwlabs.orbportability.orbspecific.jacorb.build" depends="com.hp.mwlabs.orbportability.orbspecific.jacorb.compile" if="com.hp.mwlabs.orbportability.orbspecific.jacorb.build">
<property name="com.hp.mw.orbportability.orbspecific.lib" value="${com.hp.mwlabs.orbportability.orbspecific.default.lib}"/>
@@ -302,7 +89,7 @@
<fileset dir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}" includes="**/*.class"/>
<fileset dir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"
includes="com/arjuna/**/orbspecific/**/*.class"
- excludes="com/arjuna/**/orbspecific/javaidl/**/*.class,com/arjuna/**/orbspecific/hporb/**/*.class,com/arjuna/**/orbspecific/orbix/**/*.class"/>
+ excludes="com/arjuna/**/orbspecific/javaidl/**/*.class"/>
</jar>
<classpath-builder filename="${com.hp.mwlabs.jacorb.classpathbuilderfilename}" inproperty="build.jacorb.classpath" clear="true">
@@ -355,7 +142,7 @@
<javac srcdir="${com.hp.mw.orbportability.orbspecific.srcdir}"
destdir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"
includes="**/orbspecific/**/*.java"
- excludes="**/orbspecific/orbix2000/**/*.java,**/orbspecific/hporb/**/*.java,**/orbspecific/javaidl/**/*.java"
+ excludes="**/orbspecific/javaidl/**/*.java"
debug="${com.hp.mwlabs.debug}"
bootclasspath="${com.hp.mw.orbportability.orbspecific.jacorb-bootclasspath}"
deprecation="${com.hp.mwlabs.deprecation}">
@@ -395,7 +182,7 @@
<fileset dir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}" includes="**/*.class"/>
<fileset dir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"
includes="com/arjuna/**/orbspecific/**/*.class"
- excludes="com/arjuna/**/orbspecific/jacorb/**/*.class,com/arjuna/**/orbspecific/hporb/**/*.class,com/arjuna/**/orbspecific/orbix/**/*.class"/>
+ excludes="com/arjuna/**/orbspecific/jacorb/**/*.class"/>
</jar>
<classpath-builder filename="${com.hp.mwlabs.javaidl.classpathbuilderfilename}" inproperty="build.javaidl.classpath" clear="true">
@@ -417,24 +204,6 @@
<target name="com.hp.mwlabs.orbportability.orbspecific.init">
- <condition property="com.hp.mwlabs.orbportability.orbspecific.orbix.build">
- <and>
- <equals arg1="${com.hp.mw.orbportability.orbspecific.orbix.build}" arg2="yes"/>
- <not>
- <equals arg1="${java.version}" arg2="1.4.1_01"/>
- </not>
- </and>
- </condition>
-
- <condition property="com.hp.mwlabs.orbportability.orbspecific.hporb.build">
- <and>
- <equals arg1="${com.hp.mw.orbportability.orbspecific.hporb.build}" arg2="yes"/>
- <not>
- <equals arg1="${java.version}" arg2="1.4.1_01"/>
- </not>
- </and>
- </condition>
-
<condition property="com.hp.mwlabs.orbportability.orbspecific.jacorb.build">
<and>
<equals arg1="${com.hp.mw.orbportability.orbspecific.jacorb.build}" arg2="yes"/>
@@ -478,7 +247,7 @@
<echo message="Performing JavaIDL idl compile"/>
- <classpath-builder filename="${com.hp.mwlabs.orbix.classpathbuilderfilename};${com.hp.mwlabs.classpathbuilderfilename}" inproperty="build.javaidl.classpath"/>
+<!-- <classpath-builder filename="${com.hp.mwlabs.orbix.classpathbuilderfilename};${com.hp.mwlabs.classpathbuilderfilename}" inproperty="build.javaidl.classpath"/> -->
<javac srcdir="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"
destdir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"
@@ -497,7 +266,7 @@
<javac srcdir="${com.hp.mw.orbportability.orbspecific.srcdir}"
destdir="${com.hp.mwlabs.orbportability.orbspecific.orbspecificbuilddir}"
includes="**/orbspecific/**/*.java"
- excludes="**/orbspecific/hporb/**/*.java,**/orbspecific/jacorb/**/*.java,**/orbspecific/orbix2000/**/*.java"
+ excludes="**/orbspecific/jacorb/**/*.java"
debug="${com.hp.mwlabs.debug}"
bootclasspath="${com.hp.mw.orbportability.orbspecific.javaidl-bootclasspath}"
deprecation="${com.hp.mwlabs.deprecation}">
Modified: labs/jbosstm/trunk/ArjunaJTS/trailmap/docs/JBossTS_ORBPortability.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/trailmap/docs/JBossTS_ORBPortability.xml 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/ArjunaJTS/trailmap/docs/JBossTS_ORBPortability.xml 2009-05-13 10:55:49 UTC (rev 26502)
@@ -197,14 +197,6 @@
</td>
</tr>
<tr>
- <td>IONA Orbix 2000 v2.0 (obsolete)</td>
- <td>com.arjuna.orbportability.internal.orbspecific.orbix2000.orb.implementations.orbix2000_2_0</td>
- </tr>
- <tr>
- <td>HP-ORB v1.2 (obsolete)</td>
- <td>com.arjuna.orbportability.internal.orbspecific.hporb.orb.implementations.hporb_1_2</td>
- </tr>
- <tr>
<td>JacORB v2.0</td>
<td>com.arjuna.orbportability.internal.orbspecific.jacorb.orb.implementations.jacorb_2_0</td>
</tr>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2009-05-13 10:55:29 UTC (rev 26501)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2009-05-13 10:55:49 UTC (rev 26502)
@@ -90,10 +90,6 @@
<equals arg1="${org.jboss.jbossts.qa.orb.name.short}" arg2="jacorb"/>
</condition>
- <condition property="org.jboss.jbossts.qa.orbix">
- <equals arg1="${org.jboss.jbossts.qa.orb.name.short}" arg2="orbix"/>
- </condition>
-
</target>
<target name="org.jboss.jbossts.qa.clean">
@@ -101,7 +97,7 @@
</target>
<target name="org.jboss.jbossts.qa.idl.compile"
- depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init, org.jboss.jbossts.qa.idl.compile.init, org.jboss.jbossts.qa.idl.orbix.compile, org.jboss.jbossts.qa.idl.jacorb.compile"/>
+ depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init, org.jboss.jbossts.qa.idl.compile.init, org.jboss.jbossts.qa.idl.jacorb.compile"/>
<target name="org.jboss.jbossts.qa.idl.compile.init">
@@ -220,28 +216,6 @@
</target>
- <target name="org.jboss.jbossts.qa.idl.orbix.compile" if="org.jboss.jbossts.qa.orbix">
-
- <taskdef name="idl-compiler" classname="com.hp.mw.orbportability.common.ant.IDLCompiler"
- classpathref="jts.classpath"/>
-
- <idl-compiler orb="${org.jboss.jbossts.qa.orb.name.long}"
- buildlist="${org.jboss.jbossts.qa.jts.idl.buildlist}"
- destdir="${org.jboss.jbossts.qa.build.idl}"
- parameters="include='${org.jboss.jbossts.qa.ts.home}/idl/'"/>
-
- <javac srcdir="${org.jboss.jbossts.qa.build.idl}"
- destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on">
-
- <classpath>
- <path refid="jts.classpath"/>
- </classpath>
-
- </javac>
-
- </target>
-
<target name="org.jboss.jbossts.qa.compile" depends="org.jboss.jbossts.qa.idl.compile">
<javac srcdir="${org.jboss.jbossts.qa.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
More information about the jboss-svn-commits
mailing list