@Override added
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c6f6e9c8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c6f6e9c8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c6f6e9c8 Branch: refs/heads/master Commit: c6f6e9c81cc0321744718136b6f4c2c225d1c42c Parents: 22855e1 Author: Hayri Cicek <[email protected]> Authored: Sun Sep 16 01:11:20 2018 +0200 Committer: Hayri Cicek <[email protected]> Committed: Sun Sep 16 01:11:20 2018 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/tomee/common/AbstractObjectFactory.java | 1 + .../src/main/java/org/apache/tomee/common/EjbFactory.java | 2 ++ .../src/main/java/org/apache/tomee/common/EnumFactory.java | 1 + .../src/main/java/org/apache/tomee/common/LookupFactory.java | 1 + .../java/org/apache/tomee/common/PersistenceContextFactory.java | 2 ++ .../main/java/org/apache/tomee/common/PersistenceUnitFactory.java | 2 ++ .../src/main/java/org/apache/tomee/common/ResourceFactory.java | 2 ++ .../main/java/org/apache/tomee/common/SystemComponentFactory.java | 1 + .../main/java/org/apache/tomee/common/UserTransactionFactory.java | 1 + .../src/main/java/org/apache/tomee/common/WsFactory.java | 3 +++ .../src/main/java/org/apache/tomee/installer/Installers.java | 3 ++- 11 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java index 723809f..0d70240 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java @@ -34,6 +34,7 @@ import java.util.Hashtable; import java.util.Properties; public abstract class AbstractObjectFactory implements ObjectFactory { + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { final Reference ref = (Reference) object; http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/EjbFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/EjbFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/EjbFactory.java index 7b08e6d..8b1d188 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/EjbFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/EjbFactory.java @@ -34,6 +34,7 @@ import java.io.ObjectOutputStream; import java.util.Hashtable; public class EjbFactory extends AbstractObjectFactory { + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { // ignore non ejb-refs if (!(object instanceof EjbRef)) { @@ -52,6 +53,7 @@ public class EjbFactory extends AbstractObjectFactory { return value; } + @Override protected String buildJndiName(final Reference reference) throws NamingException { final String jndiName;// get and verify deploymentId final String deploymentId = NamingUtil.getProperty(reference, NamingUtil.DEPLOYMENT_ID); http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java index 3fd8314..a70ab32 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java @@ -29,6 +29,7 @@ public class EnumFactory implements ObjectFactory { public static final String ENUM_VALUE = "enumValue"; + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { if (!(object instanceof Reference)) { return null; http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java index 0fe7884..f1ca5ee 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java @@ -30,6 +30,7 @@ import java.util.Hashtable; */ public class LookupFactory implements ObjectFactory { + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { if (!(object instanceof Reference)) { return null; http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java index ac49ad8..3760ce2 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java @@ -29,6 +29,7 @@ import javax.naming.Reference; import java.util.Hashtable; public class PersistenceContextFactory extends AbstractObjectFactory { + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { // ignore non resource-refs if (!(object instanceof ResourceRef)) { @@ -49,6 +50,7 @@ public class PersistenceContextFactory extends AbstractObjectFactory { return value; } + @Override protected String buildJndiName(final Reference reference) throws NamingException { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java index 94e2d77..b9e3559 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java @@ -29,6 +29,7 @@ import javax.naming.Reference; import java.util.Hashtable; public class PersistenceUnitFactory extends AbstractObjectFactory { + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { // ignore non resource-refs if (!(object instanceof ResourceRef)) { @@ -49,6 +50,7 @@ public class PersistenceUnitFactory extends AbstractObjectFactory { return value; } + @Override protected String buildJndiName(final Reference reference) throws NamingException { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java index 3f5b1a5..bf431aa 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java @@ -29,6 +29,7 @@ import static org.apache.tomee.common.NamingUtil.RESOURCE_ID; import static org.apache.tomee.common.NamingUtil.getProperty; public class ResourceFactory extends AbstractObjectFactory { + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { final Reference reference = ((Reference) object); @@ -49,6 +50,7 @@ public class ResourceFactory extends AbstractObjectFactory { return super.getObjectInstance(object, name, context, environment); } + @Override protected String buildJndiName(final Reference reference) throws NamingException { // get and verify interface type String resourceId = getProperty(reference, RESOURCE_ID); http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java index 0445804..5efa7f6 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java @@ -29,6 +29,7 @@ import javax.naming.spi.ObjectFactory; import java.util.Hashtable; public class SystemComponentFactory implements ObjectFactory { + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { final Reference ref = (Reference) object; http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java index 2a8d41f..6f02e6d 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java @@ -29,6 +29,7 @@ import javax.transaction.UserTransaction; import java.util.Hashtable; public class UserTransactionFactory implements ObjectFactory { + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { // get the transaction manager final TransactionManager transactionManager = SystemInstance.get().getComponent(TransactionManager.class); http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java index e3cf9a2..3789b00 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java @@ -37,6 +37,8 @@ import java.util.List; import java.util.Properties; public class WsFactory extends AbstractObjectFactory { + + @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { // ignore non resource-refs if (!(object instanceof ResourceRef)) { @@ -122,6 +124,7 @@ public class WsFactory extends AbstractObjectFactory { return value; } + @Override protected String buildJndiName(final Reference reference) throws NamingException { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/c6f6e9c8/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java index fd54a46..1f2f3cf 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java @@ -147,7 +147,8 @@ public class Installers { this.begin = begin; this.end = end; } - + + @Override public String handleToken(final String token) throws IOException { final String result = begin + token + end; return result;
