Author: jsdelfino
Date: Sun Jul 20 18:01:26 2008
New Revision: 678332
URL: http://svn.apache.org/viewvc?rev=678332&view=rev
Log:
Minor code clean up. Fixed the visibility of some of the util classes and
methods.
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java?rev=678332&r1=678331&r2=678332&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
Sun Jul 20 18:01:26 2008
@@ -68,7 +68,7 @@
}
// locates the stub
- public EJBHandler(NamingEndpoint namingEndpoint, InterfaceInfo
ejbInterface) {
+ private EJBHandler(NamingEndpoint namingEndpoint, InterfaceInfo
ejbInterface) {
try {
this.ejbStub = EJBStubHelper.lookup(namingEndpoint, ejbInterface);
this.interfaceInfo = ejbInterface;
@@ -194,7 +194,7 @@
* @throws RemoteException
* @throws ServiceBusinessException
*/
- protected Object invokeLocalCORBACall(final ObjectImpl stub, String
methodName, Object[] args)
+ private Object invokeLocalCORBACall(final ObjectImpl stub, String
methodName, Object[] args)
throws RemoteException {
final String operation = getOperation(methodName);
@@ -252,7 +252,7 @@
* @throws RemoteException
* @throws ServiceBusinessException
*/
- protected Object invokeRemoteCORBACall(ObjectImpl stub, String methodName,
Object[] args) throws RemoteException {
+ private Object invokeRemoteCORBACall(ObjectImpl stub, String methodName,
Object[] args) throws RemoteException {
try {
String operation = getOperation(methodName);
@@ -323,7 +323,7 @@
* @param value
* @param type
*/
- protected void writeValue(OutputStream out, Object value, Class type) {
+ private void writeValue(OutputStream out, Object value, Class type) {
org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.writeObject(type, value,
out);
}
@@ -332,7 +332,7 @@
* @param type
* @return
*/
- protected Object readValue(InputStream in, Class type) {
+ private Object readValue(InputStream in, Class type) {
return
org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.readObject(type, in);
}
}
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java?rev=678332&r1=678331&r2=678332&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
Sun Jul 20 18:01:26 2008
@@ -38,7 +38,7 @@
*
* @version $Rev$ $Date$
*/
-public class EJBLocator {
+class EJBLocator {
/*
* Root Context Initial Reference Key ------------
@@ -75,9 +75,9 @@
private ORB orb = null;
private ObjectLocator locator = null;
- boolean managed = true;
+ private boolean managed = true;
- public EJBLocator(boolean managed) {
+ EJBLocator(boolean managed) {
this.managed = managed;
if (!managed) {
String url = AccessController.doPrivileged(new
PrivilegedAction<String>() {
@@ -89,13 +89,13 @@
}
}
- public EJBLocator(String hostName, int port) {
+ EJBLocator(String hostName, int port) {
this.hostName = (hostName == null) ? DEFAULT_HOST : hostName;
this.port = port > 0 ? port : DEFAULT_NAMING_PORT;
this.root = SERVER_ROOT;
}
- public EJBLocator(String hostName, int port, String root) {
+ EJBLocator(String hostName, int port, String root) {
this(hostName, port);
if (ROOTS.contains(root)) {
this.root = root;
@@ -104,7 +104,7 @@
}
}
- public EJBLocator(String corbaName, boolean managed) {
+ EJBLocator(String corbaName, boolean managed) {
this.managed = managed;
if (corbaName.startsWith("corbaname:iiop:")) {
processCorbaURL(corbaName);
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java?rev=678332&r1=678331&r2=678332&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
Sun Jul 20 18:01:26 2008
@@ -40,7 +40,7 @@
*
* @version $Rev$ $Date$
*/
-public final class EJBObjectFactory {
+final class EJBObjectFactory {
private EJBObjectFactory() {
}
@@ -58,7 +58,7 @@
* of the pregenerated EJB stub classes be available in the classpath.
* <p>
*/
- public static Object createStub(NamingEndpoint namingEndpoint,
InterfaceInfo ejbInterface) throws NamingException,
+ static Object createStub(NamingEndpoint namingEndpoint, InterfaceInfo
ejbInterface) throws NamingException,
RemoteException, CreateException {
EJBLocator locator = namingEndpoint.getLocator();
@@ -80,7 +80,7 @@
* @return
* @throws RemoteException
*/
- protected static Object getEJBStub(Object homeObject, InterfaceInfo
ejbInterface) throws RemoteException,
+ private static Object getEJBStub(Object homeObject, InterfaceInfo
ejbInterface) throws RemoteException,
CreateException {
Object stub = null;
@@ -127,7 +127,7 @@
* @return
* @throws RemoteException
*/
- protected static Object createEJBLocalObject(Object homeObject) throws
RemoteException {
+ static private Object createEJBLocalObject(Object homeObject) throws
RemoteException {
Object stub = null;
try {
@@ -153,7 +153,7 @@
* @return
* @throws RemoteException
*/
- protected static Object createEJBObjectFromHome(Object homeObject) throws
RemoteException {
+ private static Object createEJBObjectFromHome(Object homeObject) throws
RemoteException {
Object stub = null;
try {
@@ -180,7 +180,7 @@
* @throws CreateException
* @throws RemoteException
*/
- protected static Object createEJBObject(ObjectImpl ejbHomeObject) throws
CreateException, RemoteException {
+ private static Object createEJBObject(ObjectImpl ejbHomeObject) throws
CreateException, RemoteException {
try {
org.omg.CORBA_2_3.portable.InputStream in = null;
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java?rev=678332&r1=678331&r2=678332&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
Sun Jul 20 18:01:26 2008
@@ -26,7 +26,7 @@
import org.osoa.sca.ServiceRuntimeException;
import org.osoa.sca.ServiceUnavailableException;
-public final class EJBStubHelper {
+final class EJBStubHelper {
private static Object stub;
private static ServiceRuntimeException exception;
@@ -40,11 +40,11 @@
* @return
*/
- public static Object lookup(NamingEndpoint endpoint, InterfaceInfo
ejbInterface) {
+ static Object lookup(NamingEndpoint endpoint, InterfaceInfo ejbInterface) {
return getStub(endpoint, ejbInterface);
}
- public static Object getStub(NamingEndpoint namingEndpoint, InterfaceInfo
ejbInterface) {
+ private static Object getStub(NamingEndpoint namingEndpoint, InterfaceInfo
ejbInterface) {
try {
stub = EJBObjectFactory.createStub(namingEndpoint, ejbInterface);
} catch (NamingException e) {
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java?rev=678332&r1=678331&r2=678332&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
Sun Jul 20 18:01:26 2008
@@ -35,7 +35,7 @@
*
* @version $Rev$ $Date$
*/
-public class InterfaceInfo implements Serializable {
+class InterfaceInfo implements Serializable {
private static final Map<Class, InterfaceInfo> INTERFACES =
Collections.synchronizedMap(new WeakHashMap<Class, InterfaceInfo>());
@@ -45,7 +45,7 @@
private Map<String, MethodInfo> methods = new HashMap<String,
MethodInfo>();
- public InterfaceInfo(final Class iface) {
+ InterfaceInfo(final Class iface) {
super();
if (iface == null) {
throw new IllegalArgumentException("The interface cannot be null");
@@ -71,7 +71,7 @@
}
}
- public static final synchronized InterfaceInfo getInstance(final Class
iface) {
+ static final synchronized InterfaceInfo getInstance(final Class iface) {
InterfaceInfo info = (InterfaceInfo)INTERFACES.get(iface);
if (info == null) {
info = new InterfaceInfo(iface);
@@ -83,21 +83,21 @@
/**
* @return
*/
- public Map<String, MethodInfo> getMethods() {
+ Map<String, MethodInfo> getMethods() {
return methods;
}
/**
* @return
*/
- public MethodInfo getMethod(String name) {
+ MethodInfo getMethod(String name) {
return (MethodInfo)methods.get(name);
}
/**
* @return
*/
- public String getName() {
+ String getName() {
return name;
}
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java?rev=678332&r1=678331&r2=678332&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
Sun Jul 20 18:01:26 2008
@@ -36,7 +36,7 @@
*
* @version $Rev$ $Date$
*/
-public final class JavaReflectionAdapter {
+final class JavaReflectionAdapter {
private static Map<Class, JavaReflectionAdapter> adapters =
Collections.synchronizedMap(new WeakHashMap<Class,
JavaReflectionAdapter>());
@@ -78,7 +78,7 @@
*
* @param clazz
*/
- public static synchronized JavaReflectionAdapter
createJavaReflectionAdapter(Class clazz) {
+ static synchronized JavaReflectionAdapter
createJavaReflectionAdapter(Class clazz) {
JavaReflectionAdapter adapter =
(JavaReflectionAdapter)adapters.get(clazz);
if (adapter == null) {
adapter = new JavaReflectionAdapter(clazz);
@@ -94,7 +94,7 @@
* @return
* @throws NoSuchMethodException
*/
- public Method getMethod(String methodName) throws NoSuchMethodException {
+ Method getMethod(String methodName) throws NoSuchMethodException {
Method method = (Method)methodMap.get(methodName);
if (method == null) {
@@ -108,7 +108,7 @@
*
* @return
*/
- public Map getMethods() {
+ Map getMethods() {
return methodMap;
}
@@ -122,7 +122,7 @@
* @throws InvocationTargetException
* @throws IllegalAccessException
*/
- public Object invoke(Method method, Object object, Object[] args) throws
InvocationTargetException,
+ Object invoke(Method method, Object object, Object[] args) throws
InvocationTargetException,
IllegalAccessException {
Class[] parameterTypes = method.getParameterTypes();
for (int i = 0; i < parameterTypes.length; i++) {
@@ -142,7 +142,7 @@
* @param value
* @return
*/
- public boolean setProperty(Object bean, String propertyName, Object value)
{
+ boolean setProperty(Object bean, String propertyName, Object value) {
try {
PropertyDescriptor propertyDescriptor = new
PropertyDescriptor(propertyName, bean.getClass());
Method writeMethod = propertyDescriptor.getWriteMethod();
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java?rev=678332&r1=678331&r2=678332&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
Sun Jul 20 18:01:26 2008
@@ -28,7 +28,7 @@
*
* @version $Rev$ $Date$
*/
-public class MethodInfo implements Serializable {
+class MethodInfo implements Serializable {
/** Automatically generated javadoc for: serialVersionUID */
private static final long serialVersionUID = -5557260979514687514L;
@@ -59,7 +59,7 @@
signatures.put("V", void.class);
}
- public MethodInfo(Method method) {
+ MethodInfo(Method method) {
this.method = method;
this.name = method.getName();
// this.declaringClass = method.getDeclaringClass().getName();
@@ -77,7 +77,7 @@
IDLName = this.name;
}
- protected MethodInfo(String name, String returnType, String[]
parameterTypes, String[] exceptionTypes) {
+ MethodInfo(String name, String returnType, String[] parameterTypes,
String[] exceptionTypes) {
this.name = name;
this.returnType = returnType;
this.parameterTypes = parameterTypes;
@@ -119,28 +119,28 @@
/**
* @return
*/
- public String getName() {
+ String getName() {
return name;
}
/**
* @return
*/
- public String[] getParameterTypes() {
+ String[] getParameterTypes() {
return parameterTypes;
}
/**
* @return
*/
- public String getReturnType() {
+ String getReturnType() {
return returnType;
}
/**
* @return
*/
- public String[] getExceptionTypes() {
+ String[] getExceptionTypes() {
return exceptionTypes;
}
@@ -169,21 +169,21 @@
/**
* @return Returns the iDLName.
*/
- public String getIDLName() {
+ String getIDLName() {
return IDLName;
}
/**
* @param name The iDLName to set.
*/
- public void setIDLName(String name) {
+ void setIDLName(String name) {
IDLName = name;
}
/**
* @return the method
*/
- public Method getMethod() {
+ Method getMethod() {
return method;
}
}
