[jboss-svn-commits] JBL Code SVN: r29810 - in labs/jbosstm/trunk: ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 26 10:22:32 EDT 2009
Author: jhalliday
Date: 2009-10-26 10:22:32 -0400 (Mon, 26 Oct 2009)
New Revision: 29810
Removed:
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Environment.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/recovery/
Modified:
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORB.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java
Log:
Remove (hopefully) obsolete recovery code and orb portability env bits that become unused as a result. JBTM-628
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORB.java 2009-10-26 13:21:17 UTC (rev 29809)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORB.java 2009-10-26 14:22:32 UTC (rev 29810)
@@ -36,7 +36,6 @@
import com.arjuna.orbportability.logging.opLogger;
import com.arjuna.orbportability.internal.utils.*;
-//import com.arjuna.orbportability.internal.common.LocalSetup;
import com.arjuna.orbportability.logging.*;
import com.arjuna.common.util.logging.VisibilityLevel;
@@ -361,8 +360,6 @@
protected ORB (String orbName)
{
_orbName = orbName;
-
- //addAttribute(new LocalSetup());
}
private void loadProperties (Properties p)
Deleted: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Environment.java 2009-10-26 13:21:17 UTC (rev 29809)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Environment.java 2009-10-26 14:22:32 UTC (rev 29810)
@@ -1,65 +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) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Environment.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.orbportability.common;
-
-import com.arjuna.orbportability.Services;
-
-import java.util.Hashtable;
-
-/**
- * Various property variables which can be set to
- * achieve different effects.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Environment.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-/*
- * These names had better be unique!
- */
-
-public class Environment
-{
-
-public static final String CORBA_DIAGNOSTICS = "com.arjuna.orbportability.corbaDiagnostics";
-public static final String INITIAL_REFERENCES_ROOT = "com.arjuna.orbportability.initialReferencesRoot";
-public static final String INITIAL_REFERENCES_FILE = "com.arjuna.orbportability.initialReferencesFile";
-public static final String FILE_DIR = "com.arjuna.orbportability.fileDir";
-public static final String RESOLVE_SERVICE = "com.arjuna.orbportability.resolveService";
-public static final String EVENT_HANDLER = "com.arjuna.orbportability.eventHandler";
-public static final String ORB_IMPLEMENTATION = "com.arjuna.orbportability.orbImplementation";
-public static final String OA_IMPLEMENTATION = "com.arjuna.orbportability.oaImplementation";
-public static final String PROPERTIES_FILE = "com.arjuna.orbportability.propertiesFile";
-public static final String BIND_MECHANISM= "com.arjuna.orbportability.bindMechanism";
-public static final String DEFAULT_ORB_CONFIGURATION = "com.arjuna.orbportability.defaultConfigurationFilename";
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java 2009-10-26 13:21:17 UTC (rev 29809)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java 2009-10-26 14:22:32 UTC (rev 29810)
@@ -44,15 +44,6 @@
*/
public class opPropertyManager
{
- /**
- * @deprecated use the bean instead.
- * @return
- */
- public static PropertyManager getPropertyManager()
- {
- return PropertyManagerFactory.getPropertyManagerForModule("orbportability", Environment.PROPERTIES_FILE);
- }
-
public static OrbPortabilityEnvironmentBean getOrbPortabilityEnvironmentBean()
{
return BeanPopulator.getSingletonInstance(OrbPortabilityEnvironmentBean.class);
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java 2009-10-26 13:21:17 UTC (rev 29809)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java 2009-10-26 14:22:32 UTC (rev 29810)
@@ -187,8 +187,6 @@
}
}
- System.out.println(bean.getClass()+" "+field.getName());
-
Object replacementValue = null;
if(java.util.Map.class.isAssignableFrom(field.getType())) {
@@ -204,8 +202,6 @@
replacementValue = lines;
}
- System.out.println(replacementValue.getClass().getName()+": "+replacementValue);
-
Object valueFromBean = getter.invoke(bean, new Object[] {});
if(!valueFromBean.equals(replacementValue)) {
More information about the jboss-svn-commits
mailing list