Author: rmannibucau
Date: Mon Aug 22 18:22:09 2011
New Revision: 1160357
URL: http://svn.apache.org/viewvc?rev=1160357&view=rev
Log:
removing useless thing about remoteclient and valdiator
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PropertyType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1160357&r1=1160356&r2=1160357&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Mon Aug 22 18:22:09 2011
@@ -3675,15 +3675,18 @@ public class AnnotationDeployer implemen
try {
return cls.getMethod("lookup", null);
} catch (NoSuchMethodException e) {
- logger.error("lookup method is not available for " +
cls.getName()
+ if (!cls.equals(Resource.class)) {
+ logger.error("lookup method is not available for " +
cls.getName()
+ ". You probably have an old API in the classpath."
- + "Tomcat is known to have an old annotation-api.jar,
maybe you should replace it.");
+ + "Tomcat is known to have an old annotations-api.jar,
maybe you should replace it.");
+ }
return null;
}
}
private static String getLookupName(Resource resource) {
String value = "";
+ // TODO: how could it work????
Method lookupMethod = getLookupMethod(Resource.class);
if (lookupMethod != null) {
try {
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PropertyType.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PropertyType.java?rev=1160357&r1=1160356&r2=1160357&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PropertyType.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PropertyType.java
Mon Aug 22 18:22:09 2011
@@ -7,6 +7,7 @@ import javax.xml.bind.annotation.XmlType
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.io.Serializable;
/**
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java?rev=1160357&r1=1160356&r2=1160357&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
Mon Aug 22 18:22:09 2011
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.jee.bval;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.JAXBElement;
Modified:
openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java?rev=1160357&r1=1160356&r2=1160357&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
(original)
+++
openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
Mon Aug 22 18:22:09 2011
@@ -18,22 +18,33 @@ package org.apache.openejb.client;
import org.omg.CORBA.ORB;
+import javax.naming.AuthenticationException;
+import javax.naming.Binding;
+import javax.naming.CompoundName;
+import javax.naming.ConfigurationException;
+import javax.naming.Context;
+import javax.naming.InvalidNameException;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameNotFoundException;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.OperationNotSupportedException;
+import javax.naming.Reference;
+import javax.naming.ServiceUnavailableException;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.NamingManager;
+import javax.sql.DataSource;
+import java.lang.reflect.Constructor;
+import java.net.ConnectException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.ConnectException;
import java.rmi.RemoteException;
-import java.util.Hashtable;
-import java.util.Properties;
import java.util.ArrayList;
+import java.util.Hashtable;
import java.util.List;
-import java.lang.reflect.Constructor;
-import javax.naming.*;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.NamingManager;
-import javax.sql.DataSource;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import java.util.Properties;
/**
* @version $Rev$ $Date$
@@ -42,8 +53,6 @@ public class JNDIContext implements Init
public static final String DEFAULT_PROVIDER_URL = "ejbd://localhost:4201";
- private static ValidatorFactory DEFAULT_VALIDATOR_FACTORY;
-
private String tail = "/";
private ServerMetaData server;
private ClientMetaData client;
@@ -246,13 +255,6 @@ public class JNDIContext implements Init
String type = (String) res.getResult();
value = System.getProperty("Resource/" + type);
if (value == null) {
- if (Validator.class.getName().equals(type)) {
- return getValidatorFactory().getValidator();
- } else {
- if (ValidatorFactory.class.getName().equals(type)) {
- return getValidatorFactory();
- }
- }
return null;
}
return parseEntry(prop, value);
@@ -286,17 +288,6 @@ public class JNDIContext implements Init
}
}
- private ValidatorFactory getValidatorFactory() {
- if (DEFAULT_VALIDATOR_FACTORY == null) {
- synchronized (this) {
- if (DEFAULT_VALIDATOR_FACTORY == null) {
- DEFAULT_VALIDATOR_FACTORY =
Validation.buildDefaultValidatorFactory();
- }
- }
- }
- return DEFAULT_VALIDATOR_FACTORY;
- }
-
private Object parseEntry(String name, String value) throws
NamingException {
try {
URI uri = new URI(value);
Modified:
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?rev=1160357&r1=1160356&r2=1160357&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
(original)
+++
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
Mon Aug 22 18:22:09 2011
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import javax.jms.ConnectionFactory;
@@ -43,6 +44,9 @@ import org.apache.openejb.BeanContext;
import org.apache.openejb.Injection;
import org.apache.openejb.ProxyInfo;
import static org.apache.openejb.server.ejbd.ClientObjectFactory.convert;
+
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ValidationInfo;
import org.apache.openejb.client.CallbackMetaData;
import org.apache.openejb.client.DataSourceMetaData;
import org.apache.openejb.client.EJBMetaDataImpl;
