You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2007/12/18 01:24:26 UTC
svn commit: r605052 - in /openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-jee/src/main/java/org/apache/openejb/jee/
container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ con...
Author: jlaskowski
Date: Mon Dec 17 16:24:24 2007
New Revision: 605052
URL: http://svn.apache.org/viewvc?rev=605052&view=rev
Log:
Import and unused code fixes
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodTransaction.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatefulBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatelessBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StringAdapter.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JpaJaxbUtil.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DepPatternType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceBindingType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/JaxbWls.java
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java
openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Mon Dec 17 16:24:24 2007
@@ -175,8 +175,6 @@
if (appServer == null) {
system.setComponent(ApplicationServer.class, new org.apache.openejb.core.ServerFederation());
}
-
-
}
private void setConfiguration(OpenEjbConfiguration config) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java Mon Dec 17 16:24:24 2007
@@ -17,7 +17,6 @@
package org.apache.openejb.assembler.classic;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.util.Messages;
import org.apache.openejb.util.SafeToolkit;
import org.apache.openejb.util.proxy.ProxyFactory;
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java Mon Dec 17 16:24:24 2007
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.openejb.jee;
import javax.xml.bind.annotation.XmlAccessType;
@@ -28,7 +27,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-
/**
* The activation-configType defines information about the
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java Mon Dec 17 16:24:24 2007
@@ -24,7 +24,6 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.ArrayList;
@@ -105,7 +104,7 @@
}
public Map<String,List<MethodTransaction>> getMethodTransactions(String ejbName) {
- Map<String,List<MethodTransaction>> methods = new LinkedHashMap();
+ Map<String,List<MethodTransaction>> methods = new LinkedHashMap<String,List<MethodTransaction>>();
for (ContainerTransaction transaction : getContainerTransaction()) {
for (Method method : transaction.getMethod()) {
@@ -113,7 +112,7 @@
String methodName = method.getMethodName();
List<MethodTransaction> list = methods.get(methodName);
if (list == null){
- list = new ArrayList();
+ list = new ArrayList<MethodTransaction>();
methods.put(methodName, list);
}
list.add(new MethodTransaction(transaction.getTransAttribute(), method));
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java Mon Dec 17 16:24:24 2007
@@ -17,8 +17,6 @@
*/
package org.apache.openejb.jee;
-import java.util.List;
-
/**
* @version $Revision$ $Date$
*/
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java Mon Dec 17 16:24:24 2007
@@ -108,7 +108,7 @@
public Interceptor() {
}
- public Interceptor(Class interceptorClass) {
+ public Interceptor(Class<?> interceptorClass) {
this.interceptorClass = interceptorClass.getName();
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java Mon Dec 17 16:24:24 2007
@@ -48,7 +48,7 @@
public class JaxbJavaee {
public static final ThreadLocal<Set<String>> currentPublicId = new ThreadLocal<Set<String>>();
- private static Map<Class,JAXBContext> jaxbContexts = new HashMap<Class,JAXBContext>();
+ private static Map<Class<?>,JAXBContext> jaxbContexts = new HashMap<Class<?>,JAXBContext>();
public static <T>String marshal(Class<T> type, Object object) throws JAXBException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodTransaction.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodTransaction.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodTransaction.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodTransaction.java Mon Dec 17 16:24:24 2007
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.jee;
-import java.util.List;
-
/**
* @version $Rev$ $Date$
*/
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java Mon Dec 17 16:24:24 2007
@@ -315,7 +315,7 @@
this.home = home;
}
- public void setHomeAndRemote(Class home, Class remote) {
+ public void setHomeAndRemote(Class<?> home, Class<?> remote) {
this.remote = remote.getName();
this.home = home.getName();
}
@@ -325,7 +325,7 @@
this.localHome = localHome;
}
- public void setHomeAndLocal(Class localHome, Class local) {
+ public void setHomeAndLocal(Class<?> localHome, Class<?> local) {
this.local = local.getName();
this.localHome = localHome.getName();
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatefulBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatefulBean.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatefulBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatefulBean.java Mon Dec 17 16:24:24 2007
@@ -26,11 +26,11 @@
super(ejbName, ejbClass, SessionType.STATEFUL);
}
- public StatefulBean(Class ejbClass) {
+ public StatefulBean(Class<?> ejbClass) {
this(ejbClass.getSimpleName(), ejbClass.getName());
}
- public StatefulBean(String name, Class ejbClass) {
+ public StatefulBean(String name, Class<?> ejbClass) {
this(name, ejbClass.getName());
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatelessBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatelessBean.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatelessBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StatelessBean.java Mon Dec 17 16:24:24 2007
@@ -25,15 +25,15 @@
public class StatelessBean extends SessionBean {
public StatelessBean(String ejbName, String ejbClass) {
super(ejbName, ejbClass, SessionType.STATELESS);
- postActivate = Collections.EMPTY_LIST;
- prePassivate = Collections.EMPTY_LIST;
+ postActivate = Collections.emptyList();
+ prePassivate = Collections.emptyList();
}
- public StatelessBean(Class ejbClass) {
+ public StatelessBean(Class<?> ejbClass) {
this(ejbClass.getSimpleName(), ejbClass.getName());
}
- public StatelessBean(String name, Class ejbClass) {
+ public StatelessBean(String name, Class<?> ejbClass) {
this(name, ejbClass.getName());
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StringAdapter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StringAdapter.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StringAdapter.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/StringAdapter.java Mon Dec 17 16:24:24 2007
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.jee;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-
/**
* @version $Rev$ $Date$
*/
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JpaJaxbUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JpaJaxbUtil.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JpaJaxbUtil.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JpaJaxbUtil.java Mon Dec 17 16:24:24 2007
@@ -54,7 +54,6 @@
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setNamespaceAware(true);
factory.setValidating(false);
- SAXParser parser = factory.newSAXParser();
JAXBContext ctx = JAXBContext.newInstance(type);
Unmarshaller unmarshaller = ctx.createUnmarshaller();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java Mon Dec 17 16:24:24 2007
@@ -20,7 +20,6 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlAnyElement;
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DepPatternType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DepPatternType.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DepPatternType.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DepPatternType.java Mon Dec 17 16:24:24 2007
@@ -19,7 +19,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlElement;
/**
* <p>Java class for patternType complex type.
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java Mon Dec 17 16:24:24 2007
@@ -17,7 +17,6 @@
package org.apache.openejb.jee.oejb2;
import javax.xml.bind.JAXBElement;
-import java.lang.*;
import java.util.List;
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java Mon Dec 17 16:24:24 2007
@@ -39,9 +39,9 @@
*/
public class JaxbOpenejbJar2 {
- private static final Map<Class,JAXBContext> contexts = new HashMap<Class,JAXBContext>();
+ private static final Map<Class<?>,JAXBContext> contexts = new HashMap<Class<?>,JAXBContext>();
- private static JAXBContext getContext(Class type) throws JAXBException {
+ private static JAXBContext getContext(Class<?> type) throws JAXBException {
JAXBContext jaxbContext = contexts.get(type);
if (jaxbContext == null) {
jaxbContext = JAXBContext.newInstance(type);
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java Mon Dec 17 16:24:24 2007
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Collections;
-import java.lang.*;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -113,16 +112,16 @@
@XmlTransient
public List<String> getJndiName() {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
@XmlTransient
public List<String> getLocalJndiName() {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
public List<Jndi> getJndi() {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java Mon Dec 17 16:24:24 2007
@@ -32,8 +32,7 @@
*/
public class NamespaceFilter extends XMLFilterImpl {
- static Map<String, String> ns = new HashMap();
- private String previousNs;
+ static Map<String, String> ns = new HashMap<String, String>();
static {
ns.put("abstract-naming-entry", "http://geronimo.apache.org/xml/ns/naming-1.2");
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceBindingType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceBindingType.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceBindingType.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceBindingType.java Mon Dec 17 16:24:24 2007
@@ -20,7 +20,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
import java.util.ArrayList;
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java Mon Dec 17 16:24:24 2007
@@ -52,7 +52,7 @@
}
public Map<String,EjbDeployment> getDeploymentsById(){
- Map<String,EjbDeployment> map = new LinkedHashMap();
+ Map<String,EjbDeployment> map = new LinkedHashMap<String,EjbDeployment>();
for (EjbDeployment deployment : getEjbDeployment()) {
map.put(deployment.getDeploymentId(), deployment);
}
@@ -60,7 +60,7 @@
}
public Map<String,EjbDeployment> getDeploymentsByEjbName(){
- Map<String,EjbDeployment> map = new LinkedHashMap();
+ Map<String,EjbDeployment> map = new LinkedHashMap<String,EjbDeployment>();
for (EjbDeployment deployment : getEjbDeployment()) {
map.put(deployment.getEjbName(), deployment);
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/JaxbWls.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/JaxbWls.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/JaxbWls.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/JaxbWls.java Mon Dec 17 16:24:24 2007
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.jee.wls;
-import org.apache.openejb.jee.JaxbJavaee;
import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -49,7 +48,7 @@
public class JaxbWls {
public static final ThreadLocal<Set<String>> currentPublicId = new ThreadLocal<Set<String>>();
- private static Map<Class, JAXBContext> jaxbContexts = new HashMap<Class,JAXBContext>();
+ private static Map<Class<?>, JAXBContext> jaxbContexts = new HashMap<Class<?>,JAXBContext>();
public static <T>String marshal(Class<T> type, Object object) throws JAXBException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java Mon Dec 17 16:24:24 2007
@@ -137,7 +137,7 @@
}
}
- private java.lang.String readContent(InputStream in) throws IOException {
+ private String readContent(InputStream in) throws IOException {
StringBuffer sb = new StringBuffer();
in = new BufferedInputStream(in);
int i = in.read();
@@ -145,7 +145,7 @@
sb.append((char) i);
i = in.read();
}
- java.lang.String content = sb.toString();
+ String content = sb.toString();
return content;
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java Mon Dec 17 16:24:24 2007
@@ -43,7 +43,7 @@
Unmarshaller unmarshaller = ctx.createUnmarshaller();
InputStream in = this.getClass().getClassLoader().getResourceAsStream("openejb-jar.xml");
- java.lang.String expected = readContent(in);
+ String expected = readContent(in);
unmarshaller.setEventHandler(new TestValidationEventHandler());
Object object = unmarshaller.unmarshal(new ByteArrayInputStream(expected.getBytes()));
Modified: openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java?rev=605052&r1=605051&r2=605052&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java (original)
+++ openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java Mon Dec 17 16:24:24 2007
@@ -17,9 +17,7 @@
package org.apache.openejb.server.derbynet;
import org.apache.derby.drda.NetworkServerControl;
-import org.apache.log4j.Category;
import org.apache.log4j.Priority;
-import org.apache.log4j.Logger;
import org.apache.openejb.server.SelfManaging;
import org.apache.openejb.server.ServerService;
import org.apache.openejb.server.ServiceException;