You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/11/19 03:12:29 UTC
svn commit: r1543287 [3/9] - in
/tomee/tomee/trunk/container/openejb-core/src:
main/java/javax/xml/ws/wsaddressing/ main/java/org/apache/openejb/
main/java/org/apache/openejb/assembler/
main/java/org/apache/openejb/assembler/classic/ main/java/org/apac...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java Tue Nov 19 02:12:21 2013
@@ -20,7 +20,6 @@ import org.apache.openejb.jee.Beans;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.Webservices;
import org.apache.openejb.jee.oejb3.OpenejbJar;
-import org.apache.openejb.loader.SystemInstance;
import org.apache.xbean.finder.IAnnotationFinder;
import java.io.File;
@@ -128,7 +127,7 @@ public class EjbModule extends Module im
}
public String getJarLocation() {
- return (id.getLocation() != null) ? id.getLocation().getAbsolutePath() : null;
+ return id.getLocation() != null ? id.getLocation().getAbsolutePath() : null;
}
public void setJarLocation(String jarLocation) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java Tue Nov 19 02:12:21 2013
@@ -50,7 +50,7 @@ public class FinderFactory {
private static FinderFactory get() {
FinderFactory factory = SystemInstance.get().getComponent(FinderFactory.class);
- return (factory != null)? factory: FinderFactory.factory;
+ return factory != null ? factory: FinderFactory.factory;
}
public static IAnnotationFinder createFinder(DeploymentModule module) throws Exception {
@@ -163,8 +163,8 @@ public class FinderFactory {
private static boolean enableFindSubclasses() {
return SystemInstance.get().getOptions().get(FORCE_LINK, false)
- || (!SystemInstance.get().getOptions().get(SKIP_LINK, false)
- && (isTomEE() || (isJaxRsInstalled() && SystemInstance.get().getOptions().get(TOMEE_JAXRS_DEPLOY_UNDECLARED_PROP, false))));
+ || !SystemInstance.get().getOptions().get(SKIP_LINK, false)
+ && (isTomEE() || isJaxRsInstalled() && SystemInstance.get().getOptions().get(TOMEE_JAXRS_DEPLOY_UNDECLARED_PROP, false));
}
public static boolean isTomEE() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java Tue Nov 19 02:12:21 2013
@@ -18,14 +18,14 @@ package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EjbRef;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.MessageDestinationRef;
import org.apache.openejb.jee.PersistenceContextRef;
import org.apache.openejb.jee.PersistenceUnitRef;
-import org.apache.openejb.jee.ResourceRef;
import org.apache.openejb.jee.ResourceEnvRef;
+import org.apache.openejb.jee.ResourceRef;
import org.apache.openejb.jee.ServiceRef;
-import org.apache.openejb.jee.EjbRef;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java Tue Nov 19 02:12:21 2013
@@ -16,25 +16,24 @@
*/
package org.apache.openejb.config;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.openejb.jee.ManagedBean;
-import org.apache.openejb.jee.SessionBean;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Messages;
-import org.apache.openejb.util.Logger;
-import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.oejb3.OpenejbJar;
-import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.EntityBean;
+import org.apache.openejb.jee.ManagedBean;
import org.apache.openejb.jee.PersistenceType;
+import org.apache.openejb.jee.oejb3.EjbDeployment;
+import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
import org.apache.openejb.util.StringTemplate;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
public class InitEjbDeployments implements DynamicDeployer {
public static Messages messages = new Messages("org.apache.openejb.util.resources");
public static Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Tue Nov 19 02:12:21 2013
@@ -162,7 +162,7 @@ public class JndiEncInfoBuilder {
} else {
final EjbResolver.Scope scope = ejbResolver.getScope(deploymentId);
- info.externalReference = (scope != EAR && scope != EJBJAR);
+ info.externalReference = scope != EAR && scope != EJBJAR;
if (ref.getRefType() == EjbReference.Type.UNKNOWN) {
EnterpriseBeanInfo otherBean = ejbResolver.getEnterpriseBeanInfo(deploymentId);
@@ -270,7 +270,7 @@ public class JndiEncInfoBuilder {
info.persistenceUnitName = contextRef.getPersistenceUnitName();
info.unitId = contextRef.getMappedName();
info.location = buildLocationInfo(contextRef);
- info.extended = (contextRef.getPersistenceContextType() == PersistenceContextType.EXTENDED);
+ info.extended = contextRef.getPersistenceContextType() == PersistenceContextType.EXTENDED;
final List<Property> persistenceProperty = contextRef.getPersistenceProperty();
for (Property property : persistenceProperty) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LegacyProcessor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LegacyProcessor.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LegacyProcessor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LegacyProcessor.java Tue Nov 19 02:12:21 2013
@@ -17,17 +17,18 @@
package org.apache.openejb.config;
-import javax.ejb.SessionSynchronization;
-import javax.ejb.SessionContext;
-import javax.ejb.MessageDrivenContext;
-
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.EnterpriseBean;
-import org.apache.openejb.jee.LifecycleCallback;
-import org.apache.openejb.jee.SessionBean;
import org.apache.openejb.jee.InjectionTarget;
-import org.apache.openejb.jee.ResourceEnvRef;
+import org.apache.openejb.jee.LifecycleCallback;
import org.apache.openejb.jee.MessageDrivenBean;
+import org.apache.openejb.jee.ResourceEnvRef;
+import org.apache.openejb.jee.SessionBean;
+
+import javax.ejb.MessageDrivenContext;
+import javax.ejb.SessionContext;
+import javax.ejb.SessionSynchronization;
+
import static org.apache.openejb.jee.SessionType.STATEFUL;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LinkBuiltInTypes.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LinkBuiltInTypes.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LinkBuiltInTypes.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LinkBuiltInTypes.java Tue Nov 19 02:12:21 2013
@@ -21,7 +21,6 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.JndiConsumer;
import org.apache.openejb.jee.JndiReference;
-import org.apache.openejb.jee.ResourceRef;
import javax.ejb.EJBContext;
import javax.ejb.EntityContext;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MappedNameBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MappedNameBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MappedNameBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MappedNameBuilder.java Tue Nov 19 02:12:21 2013
@@ -18,10 +18,10 @@
package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.Jndi;
import org.apache.openejb.jee.oejb3.OpenejbJar;
-import org.apache.openejb.jee.EnterpriseBean;
import java.util.Map;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java Tue Nov 19 02:12:21 2013
@@ -525,11 +525,11 @@ public class NewLoaderLogic {
}
if (time < 1000) {
- logger.debug("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + (time / urls.size()) + " milliseconds per url.");
+ logger.debug("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url.");
} else if (time < 4000 || urls.size() < 3) {
- logger.info("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + (time / urls.size()) + " milliseconds per url.");
+ logger.info("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url.");
} else if (time < 10000) {
- logger.warning("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + (time / urls.size()) + " milliseconds per url.");
+ logger.warning("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url.");
logger.warning("Consider adjusting your " +
DeploymentFilterable.CLASSPATH_EXCLUDE +
" and " +
@@ -540,7 +540,7 @@ public class NewLoaderLogic {
include +
"'");
} else {
- logger.fatal("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + (time / urls.size()) + " milliseconds per url. TOO LONG!");
+ logger.fatal("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url. TOO LONG!");
logger.fatal("ADJUST THE EXCLUDE/INCLUDE!!!. Current settings: " +
DeploymentFilterable.CLASSPATH_EXCLUDE +
"='" +
@@ -582,7 +582,7 @@ public class NewLoaderLogic {
@Override
public boolean accept(final String name) {
return super.accept(name)
- || (name.endsWith(".jar") && name.substring(0, name.length() - ".jar".length()).equals(simplePrefix));
+ || name.endsWith(".jar") && name.substring(0, name.length() - ".jar".length()).equals(simplePrefix);
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java Tue Nov 19 02:12:21 2013
@@ -100,7 +100,7 @@ public class OpenEjb2Conversion implemen
}
if (altDD instanceof URL) {
try {
- altDD = JaxbOpenejbJar2.unmarshal(OpenejbJarType.class, IO.read(((URL) altDD)), false);
+ altDD = JaxbOpenejbJar2.unmarshal(OpenejbJarType.class, IO.read((URL) altDD), false);
} catch (Exception e) {
// todo warn about not being able to parse sun descriptor
}
@@ -367,19 +367,19 @@ public class OpenEjb2Conversion implemen
final EntityData leftEntityData = entities.get(moduleId + "#" + leftEjbName);
final EjbRelationshipRoleType.CmrField cmrField = leftRole.getCmrField();
- final String leftFieldName = (null != cmrField ? cmrField.getCmrFieldName() : null);
+ final String leftFieldName = null != cmrField ? cmrField.getCmrFieldName() : null;
RelationField field;
if (leftRole.isForeignKeyColumnOnSource()) {
- field = (null != leftFieldName && null != leftEntityData ? leftEntityData.relations.get(leftFieldName) : null);
+ field = null != leftFieldName && null != leftEntityData ? leftEntityData.relations.get(leftFieldName) : null;
// todo warn field not found
if (field == null) {
continue;
}
} else {
- final RelationField other = (null != leftFieldName && null != leftEntityData ? leftEntityData.relations.get(leftFieldName) : null);
+ final RelationField other = null != leftFieldName && null != leftEntityData ? leftEntityData.relations.get(leftFieldName) : null;
// todo warn field not found
if (other == null) {
continue;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java Tue Nov 19 02:12:21 2013
@@ -20,7 +20,6 @@ import org.apache.openejb.OpenEJBExcepti
import org.apache.openejb.jee.Connector;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.JAXBContextFactory;
-import org.apache.openejb.jee.JaxbJavaee;
import org.apache.openejb.jee.jpa.EntityMappings;
import org.apache.openejb.jee.jpa.JpaJaxbUtil;
import org.apache.openejb.jee.jpa.unit.Persistence;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java Tue Nov 19 02:12:21 2013
@@ -76,7 +76,7 @@ public class PersistenceContextAnnFactor
String name = persistenceContext.name();
if (name == null || name.equals("")) {
- name = (member == null) ? null : member.getDeclaringClass().getName() + "/" + member.getName();
+ name = member == null ? null : member.getDeclaringClass().getName() + "/" + member.getName();
}
AsmPersistenceContext asmPersistenceContext = contexts.get(name);
@@ -259,9 +259,9 @@ public class PersistenceContextAnnFactor
public void visit(String n, Object v) {
if ("name".equals(n)) {
- name = (v == null ? null : v.toString());
+ name = v == null ? null : v.toString();
} else if ("value".equals(n)) {
- value = (v == null ? null : v.toString());
+ value = v == null ? null : v.toString();
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/QuickContextXmlParser.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/QuickContextXmlParser.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/QuickContextXmlParser.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/QuickContextXmlParser.java Tue Nov 19 02:12:21 2013
@@ -27,15 +27,9 @@ import org.xml.sax.helpers.DefaultHandle
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.File;
-import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
import java.util.LinkedHashSet;
-import java.util.Locale;
import java.util.Set;
import java.util.StringTokenizer;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Tue Nov 19 02:12:21 2013
@@ -76,7 +76,7 @@ public class RemoteServer {
this.tries = tries;
this.verbose = verbose;
home = getHome();
- tomcat = (home != null) && (new File(new File(home, "bin"), "catalina.sh").exists());
+ tomcat = home != null && new File(new File(home, "bin"), "catalina.sh").exists();
shutdownPort = options.get(SERVER_SHUTDOWN_PORT, tomcat ? 8005 : 4200);
command = options.get(SERVER_SHUTDOWN_COMMAND, "SHUTDOWN");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReportValidationResults.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReportValidationResults.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReportValidationResults.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReportValidationResults.java Tue Nov 19 02:12:21 2013
@@ -16,14 +16,15 @@
*/
package org.apache.openejb.config;
-import static org.apache.openejb.util.Join.join;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.util.Logger;
import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
-import java.util.List;
import java.util.Arrays;
+import java.util.List;
+
+import static org.apache.openejb.util.Join.join;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.config;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
/**
* This is a completely fake annotation and is only a placeholder for the real annotation
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java Tue Nov 19 02:12:21 2013
@@ -19,7 +19,6 @@ package org.apache.openejb.config;
import org.apache.openejb.jee.ApplicationClient;
import org.apache.openejb.jee.CmpField;
import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.EjbReference;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.EntityBean;
import org.apache.openejb.jee.JndiReference;
@@ -80,8 +79,6 @@ import org.apache.openejb.jee.sun.Webser
import org.apache.openejb.jee.sun.WsdlPort;
import org.apache.openejb.loader.IO;
-import javax.ejb.Local;
-import javax.ejb.Remote;
import javax.xml.namespace.QName;
import java.io.ByteArrayInputStream;
import java.net.URL;
@@ -256,7 +253,7 @@ public class SunConversion implements Dy
}
if (altDD instanceof URL) {
try {
- altDD = JaxbSun.unmarshal(SunApplication.class, IO.read(((URL)altDD)));
+ altDD = JaxbSun.unmarshal(SunApplication.class, IO.read((URL)altDD));
} catch (Exception e) {
// todo warn about not being able to parse sun descriptor
}
@@ -278,7 +275,7 @@ public class SunConversion implements Dy
}
if (altDD instanceof URL) {
try {
- altDD = JaxbSun.unmarshal(SunApplicationClient.class, IO.read(((URL)altDD)));
+ altDD = JaxbSun.unmarshal(SunApplicationClient.class, IO.read((URL)altDD));
} catch (Exception e) {
// todo warn about not being able to parse sun descriptor
}
@@ -300,7 +297,7 @@ public class SunConversion implements Dy
}
if (altDD instanceof URL) {
try {
- altDD = JaxbSun.unmarshal(SunWebApp.class, IO.read(((URL)altDD)));
+ altDD = JaxbSun.unmarshal(SunWebApp.class, IO.read((URL)altDD));
} catch (Exception e) {
e.printStackTrace();
// todo warn about not being able to parse sun descriptor
@@ -323,7 +320,7 @@ public class SunConversion implements Dy
}
if (altDD instanceof URL) {
try {
- altDD = JaxbSun.unmarshal(SunEjbJar.class, IO.read(((URL)altDD)));
+ altDD = JaxbSun.unmarshal(SunEjbJar.class, IO.read((URL)altDD));
} catch (Exception e) {
e.printStackTrace();
// todo warn about not being able to parse sun descriptor
@@ -346,7 +343,7 @@ public class SunConversion implements Dy
}
if (altDD instanceof URL) {
try {
- altDD = JaxbSun.unmarshal(SunCmpMappings.class, IO.read(((URL)altDD)));
+ altDD = JaxbSun.unmarshal(SunCmpMappings.class, IO.read((URL)altDD));
} catch (Exception e) {
e.printStackTrace();
// todo warn about not being able to parse sun descriptor
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java Tue Nov 19 02:12:21 2013
@@ -21,7 +21,6 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.monitoring.JMXDeployer;
import org.apache.openejb.assembler.util.UserEjb;
import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.Interceptor;
import org.apache.openejb.jee.InterceptorBinding;
import org.apache.openejb.jee.SingletonBean;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,6 @@
*/
package org.apache.openejb.config;
-import static org.apache.openejb.util.JarExtractor.delete;
-
-import java.util.Properties;
-import java.io.File;
-import java.io.IOException;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -40,6 +31,14 @@ import org.apache.openejb.cli.SystemExit
import org.apache.openejb.util.Messages;
import org.apache.openejb.util.OpenEjbVersion;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import static org.apache.openejb.util.JarExtractor.delete;
+
/**
* UnDeploy EJB beans
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationContext.java Tue Nov 19 02:12:21 2013
@@ -108,7 +108,7 @@ public class ValidationContext implement
}
public String getName() {
- return (module == null) ? name : module.getModuleId();
+ return module == null ? name : module.getModuleId();
}
public String getModuleType() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java Tue Nov 19 02:12:21 2013
@@ -69,7 +69,7 @@ public class WebModule extends Module im
public WebModule(final WebApp webApp, String contextRoot, final ClassLoader classLoader, final String jarLocation, final String moduleId) {
this.webApp = webApp;
- final File file = (jarLocation == null) ? null : new File(jarLocation);
+ final File file = jarLocation == null ? null : new File(jarLocation);
this.id = new ID(null, webApp, moduleId, file, null, this);
this.validation = new ValidationContext(this);
@@ -105,7 +105,7 @@ public class WebModule extends Module im
@Override
public String getJarLocation() {
- return (id.getLocation() != null) ? id.getLocation().getAbsolutePath() : null;
+ return id.getLocation() != null ? id.getLocation().getAbsolutePath() : null;
}
@Override
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java Tue Nov 19 02:12:21 2013
@@ -49,7 +49,7 @@ public class WlsConversion implements Dy
}
if (altDD instanceof URL) {
try {
- altDD = JaxbWls.unmarshal(type, IO.read(((URL)altDD)));
+ altDD = JaxbWls.unmarshal(type, IO.read((URL)altDD));
} catch (Exception e) {
e.printStackTrace();
// todo warn about not being able to parse sun descriptor
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java Tue Nov 19 02:12:21 2013
@@ -26,7 +26,7 @@ public class ID {
public ID(String namespace, String name) {
if (name == null) throw new IllegalArgumentException("name cannot be null");
- this.namespace = (namespace != null) ? namespace.toLowerCase() : null;
+ this.namespace = namespace != null ? namespace.toLowerCase() : null;
this.name = name.toLowerCase();
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java Tue Nov 19 02:12:21 2013
@@ -16,14 +16,6 @@
*/
package org.apache.openejb.config.rules;
-import static org.apache.openejb.util.Join.join;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.jee.AssemblyDescriptor;
import org.apache.openejb.jee.ContainerTransaction;
@@ -33,6 +25,14 @@ import org.apache.openejb.jee.Intercepto
import org.apache.openejb.jee.Method;
import org.apache.openejb.jee.MethodPermission;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.apache.openejb.util.Join.join;
+
/**
* @version $Rev$ $Date$
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java Tue Nov 19 02:12:21 2013
@@ -16,23 +16,6 @@
*/
package org.apache.openejb.config.rules;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.ejb.AfterBegin;
-import javax.ejb.AfterCompletion;
-import javax.ejb.BeforeCompletion;
-import javax.ejb.Init;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remove;
-import javax.ejb.SessionSynchronization;
-import javax.ejb.Timeout;
-import javax.interceptor.InvocationContext;
-
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.jee.AroundInvoke;
@@ -49,10 +32,23 @@ import org.apache.openejb.jee.Session;
import org.apache.openejb.jee.SessionBean;
import org.apache.openejb.jee.SessionType;
import org.apache.openejb.jee.Timer;
-import org.apache.openejb.jee.TimerConsumer;
import org.apache.openejb.util.Join;
import org.apache.xbean.finder.ClassFinder;
+import javax.ejb.AfterBegin;
+import javax.ejb.AfterCompletion;
+import javax.ejb.BeforeCompletion;
+import javax.ejb.Init;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remove;
+import javax.ejb.SessionSynchronization;
+import javax.interceptor.InvocationContext;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @version $Rev$ $Date$
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java Tue Nov 19 02:12:21 2013
@@ -27,7 +27,6 @@ import org.apache.openejb.util.LinkResol
import org.apache.openejb.util.References;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java Tue Nov 19 02:12:21 2013
@@ -20,14 +20,16 @@ import org.apache.openejb.config.AppModu
import org.apache.openejb.config.DeploymentModule;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.config.WebModule;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
import org.apache.xbean.finder.ResourceFinder;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import static org.apache.openejb.util.CollectionsUtil.safe;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java Tue Nov 19 02:12:21 2013
@@ -24,13 +24,13 @@ import org.apache.openejb.jee.RemoteBean
import org.apache.openejb.jee.SessionBean;
import org.apache.openejb.jee.SessionType;
-import javax.ejb.EJBLocalObject;
-import javax.ejb.EJBObject;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
import java.lang.reflect.Method;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class CheckMethods extends ValidationBase {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckUserTransactionRefs.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckUserTransactionRefs.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckUserTransactionRefs.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckUserTransactionRefs.java Tue Nov 19 02:12:21 2013
@@ -19,11 +19,11 @@ package org.apache.openejb.config.rules;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.ResourceEnvRef;
-import org.apache.openejb.jee.ResourceRef;
-import static org.apache.openejb.jee.TransactionType.CONTAINER;
import java.util.Collection;
+import static org.apache.openejb.jee.TransactionType.CONTAINER;
+
/**
* Excerpt from EJB 3.0 Core spec, chapter <b>16.12. UserTransaction Interface</b>:
* <p>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.config.rules;
-import java.lang.reflect.Method;
-
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ClientModule;
@@ -33,6 +31,8 @@ import org.apache.openejb.util.Classes;
import org.apache.openejb.util.Join;
import org.apache.openejb.util.SafeToolkit;
+import java.lang.reflect.Method;
+
/**
* @version $Rev$ $Date$
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AdditionalDeployments.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AdditionalDeployments.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AdditionalDeployments.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AdditionalDeployments.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.config.sys;
-import java.util.ArrayList;
-import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java Tue Nov 19 02:12:21 2013
@@ -20,7 +20,6 @@ import org.apache.openejb.loader.IO;
import org.apache.openejb.util.SuperProperties;
import javax.xml.bind.annotation.adapters.XmlAdapter;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.Properties;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Service.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Service.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Service.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Service.java Tue Nov 19 02:12:21 2013
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,8 @@
*/
package org.apache.openejb.config.sys;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
+import org.apache.openejb.util.SuperProperties;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -26,8 +25,9 @@ import javax.xml.bind.annotation.XmlRoot
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.openejb.util.SuperProperties;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java Tue Nov 19 02:12:21 2013
@@ -18,11 +18,7 @@ package org.apache.openejb.config.sys;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "tomee")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,18 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.typed.util.Builders;
+import org.apache.openejb.config.typed.util.DurationAdapter;
import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "ActiveMQResourceAdapter")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/BmpEntityContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/BmpEntityContainerBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/BmpEntityContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/BmpEntityContainerBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,14 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.Container;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "BmpEntityContainer")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/CmpEntityContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/CmpEntityContainerBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/CmpEntityContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/CmpEntityContainerBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,14 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.Container;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CmpEntityContainer")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,18 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.typed.util.Builders;
+import org.apache.openejb.config.typed.util.DurationAdapter;
import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "DataSource")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/InitialContextBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/InitialContextBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/InitialContextBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/InitialContextBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.JndiProvider;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "InitialContext")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JavaMailSessionBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JavaMailSessionBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JavaMailSessionBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JavaMailSessionBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "JavaMailSession")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,18 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.typed.util.Builders;
+import org.apache.openejb.config.typed.util.DurationAdapter;
import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "JmsConnectionFactory")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ManagedContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ManagedContainerBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ManagedContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ManagedContainerBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.Container;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "ManagedContainer")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/MessageDrivenContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/MessageDrivenContainerBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/MessageDrivenContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/MessageDrivenContainerBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,14 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.Container;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "MessageDrivenContainer")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ORBBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ORBBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ORBBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ORBBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "ORB")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ProxyFactoryBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ProxyFactoryBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ProxyFactoryBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ProxyFactoryBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.ProxyFactory;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "ProxyFactory")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/QueueBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/QueueBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/QueueBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/QueueBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,14 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "Queue")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SecurityServiceBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SecurityServiceBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SecurityServiceBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SecurityServiceBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,14 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.SecurityService;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "SecurityService")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,18 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
+import org.apache.openejb.config.sys.Container;
+import org.apache.openejb.config.typed.util.Builders;
+import org.apache.openejb.config.typed.util.DurationAdapter;
import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "SingletonContainer")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,18 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
+import org.apache.openejb.config.sys.Container;
+import org.apache.openejb.config.typed.util.Builders;
+import org.apache.openejb.config.typed.util.DurationAdapter;
import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "StatefulContainer")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,18 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
+import org.apache.openejb.config.sys.Container;
+import org.apache.openejb.config.typed.util.Builders;
+import org.apache.openejb.config.typed.util.DurationAdapter;
import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "StatelessContainer")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TopicBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TopicBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TopicBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TopicBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,14 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
-import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.typed.util.Builders;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "Topic")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,18 @@
*/
package org.apache.openejb.config.typed;
-import org.apache.openejb.config.typed.util.*;
-import org.apache.openejb.config.sys.*;
-import javax.xml.bind.annotation.*;
+import org.apache.openejb.config.sys.TransactionManager;
+import org.apache.openejb.config.typed.util.Builders;
+import org.apache.openejb.config.typed.util.DurationAdapter;
import org.apache.openejb.util.Duration;
-import java.util.*;
-import java.util.concurrent.*;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "TransactionManager")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java Tue Nov 19 02:12:21 2013
@@ -48,7 +48,7 @@ public class ConnectorReference extends
Object connection = mngedConFactory.createConnectionFactory(conMngr);
return connection;
} catch (javax.resource.ResourceException re) {
- throw (javax.naming.NamingException) (new javax.naming.NamingException("Could not create ConnectionFactory from " + mngedConFactory.getClass()).initCause(re));
+ throw (javax.naming.NamingException) new NamingException("Could not create ConnectionFactory from " + mngedConFactory.getClass()).initCause(re);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/JndiFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/JndiFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/JndiFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/JndiFactory.java Tue Nov 19 02:12:21 2013
@@ -18,12 +18,10 @@
package org.apache.openejb.core;
-import java.util.Map;
+import org.apache.openejb.SystemException;
import javax.naming.Context;
-
-import org.apache.openejb.core.ivm.naming.NamingException;
-import org.apache.openejb.SystemException;
+import java.util.Map;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/OrbFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/OrbFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/OrbFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/OrbFactory.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.core;
-import org.omg.CORBA.ORB;
import org.apache.openejb.loader.SystemInstance;
+import org.omg.CORBA.ORB;
public class OrbFactory {
public ORB create() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java Tue Nov 19 02:12:21 2013
@@ -17,15 +17,14 @@
package org.apache.openejb.core;
import org.apache.openejb.ProxyInfo;
-
import org.apache.openejb.core.ivm.IntraVmServer;
import org.apache.openejb.spi.ApplicationServer;
-import javax.ejb.Handle;
+import javax.ejb.EJBHome;
import javax.ejb.EJBMetaData;
-import javax.ejb.HomeHandle;
import javax.ejb.EJBObject;
-import javax.ejb.EJBHome;
+import javax.ejb.Handle;
+import javax.ejb.HomeHandle;
public class ServerFederation implements ApplicationServer {
private static final IntraVmServer localServer = new IntraVmServer();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/SimpleTransactionSynchronizationRegistry.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/SimpleTransactionSynchronizationRegistry.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/SimpleTransactionSynchronizationRegistry.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/SimpleTransactionSynchronizationRegistry.java Tue Nov 19 02:12:21 2013
@@ -16,14 +16,14 @@
*/
package org.apache.openejb.core;
-import java.util.Map;
-import java.util.HashMap;
import javax.transaction.Status;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
-import javax.transaction.Transaction;
+import java.util.HashMap;
+import java.util.Map;
public class SimpleTransactionSynchronizationRegistry implements TransactionSynchronizationRegistry {
private final TransactionManager transactionManager;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java Tue Nov 19 02:12:21 2013
@@ -103,7 +103,7 @@ public class TempClassLoader extends URL
* 2. Since this class loader uses Class.forName to load classes starting with java, javax or sun, it cannot load javax.faces.FacesServlet
* 3. Result is , AnnotationDeployer throws a ClassNotFoundException
*/
- if (this.skip(name) || (name.startsWith("javax.faces.") && URLClassLoaderFirst.shouldSkipJsf(getParent(), name))) {
+ if (this.skip(name) || name.startsWith("javax.faces.") && URLClassLoaderFirst.shouldSkipJsf(getParent(), name)) {
return Class.forName(name, resolve, PARENT_LOADER);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java Tue Nov 19 02:12:21 2013
@@ -16,16 +16,16 @@
*/
package org.apache.openejb.core;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.openejb.BeanContext;
import org.apache.openejb.core.transaction.TransactionPolicy;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
+
public class ThreadContext {
private static final Logger log = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
private static final ThreadLocal<ThreadContext> threadStorage = new ThreadLocal<ThreadContext>();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionSynchronizationRegistryWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionSynchronizationRegistryWrapper.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionSynchronizationRegistryWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionSynchronizationRegistryWrapper.java Tue Nov 19 02:12:21 2013
@@ -18,8 +18,8 @@ package org.apache.openejb.core;
import org.apache.openejb.loader.SystemInstance;
-import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.Synchronization;
+import javax.transaction.TransactionSynchronizationRegistry;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java Tue Nov 19 02:12:21 2013
@@ -22,7 +22,6 @@ import org.apache.openejb.InjectionProce
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.cdi.ConstructorInjectionBean;
import org.apache.webbeans.component.InjectionTargetBean;
-import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.config.WebBeansContext;
import javax.enterprise.context.Dependent;
@@ -38,7 +37,6 @@ import javax.servlet.ServletContextListe
import javax.servlet.ServletRequestAttributeListener;
import javax.servlet.ServletRequestListener;
import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionListener;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,11 @@
*/
package org.apache.openejb.core.cmp;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
+import org.apache.openejb.OpenEJBException;
import javax.ejb.EJBException;
-
-import org.apache.openejb.OpenEJBException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
public abstract class AbstractKeyGenerator implements KeyGenerator {
public static boolean isValidPkField(Field field) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java Tue Nov 19 02:12:21 2013
@@ -16,14 +16,14 @@
*/
package org.apache.openejb.core.cmp;
+import org.apache.openejb.OpenEJBException;
+
+import javax.ejb.EJBException;
+import javax.ejb.EntityBean;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.ejb.EJBException;
-import javax.ejb.EntityBean;
-
-import org.apache.openejb.OpenEJBException;
public class ComplexKeyGenerator extends AbstractKeyGenerator {
protected final List<PkField> fields;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.core.cmp;
-import org.apache.openejb.RpcContainer;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.RpcContainer;
import org.apache.openejb.core.entity.EntityEjbHomeHandler;
import org.apache.openejb.util.proxy.ProxyManager;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.cmp;
-import java.lang.reflect.Field;
-import javax.ejb.EntityBean;
-
import org.apache.openejb.OpenEJBException;
+import javax.ejb.EntityBean;
+import java.lang.reflect.Field;
+
public class SimpleKeyGenerator extends AbstractKeyGenerator {
private final Field pkField;