Author: richard.opalka(a)jboss.com
Date: 2010-11-03 03:55:37 -0400 (Wed, 03 Nov 2010)
New Revision: 13204
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java
Log:
[JBWS-3152] refactoring - cleanup service ref SPI
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-11-03
07:52:01 UTC (rev 13203)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-11-03
07:55:37 UTC (rev 13204)
@@ -42,7 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.WritableUnifiedVirtualFile;
-import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefElement;
import org.jboss.wsf.spi.util.URLLoaderAdapter;
/**
@@ -52,7 +52,7 @@
* @author Thomas.Diesler(a)jboss.org
* @author alessio.soldano(a)jboss.com
*/
-public class UnifiedServiceRefMetaData extends ServiceRefMetaData
+public class UnifiedServiceRefMetaData extends ServiceRefElement
{
private static final long serialVersionUID = -926464174132493955L;
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-11-03
07:52:01 UTC (rev 13203)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-11-03
07:55:37 UTC (rev 13204)
@@ -21,10 +21,6 @@
*/
package org.jboss.wsf.spi.serviceref;
-import java.lang.reflect.AnnotatedElement;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
import javax.naming.Referenceable;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
@@ -32,16 +28,9 @@
/**
* Creates a ServiceReferenceable and binds it to JNDI.
*
- * @author Heiko.Braun(a)jboss.com
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public interface ServiceRefBinder
{
- /**
- * @deprecated use {@link #createReferenceable(UnifiedServiceRefMetaData,
ClassLoader)} instead
- */
- @Deprecated
- void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement,
UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException;
- Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRef,
- final ClassLoader loader);
+ Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRef);
}
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java 2010-11-03
07:52:01 UTC (rev 13203)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java 2010-11-03
07:55:37 UTC (rev 13204)
@@ -25,7 +25,6 @@
/**
* @author Thomas.Diesler(a)jboss.com
- * @since 01-Aug-2007
*/
public interface ServiceRefBinderFactory extends SPIView
{
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java 2010-11-03
07:52:01 UTC (rev 13203)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java 2010-11-03
07:55:37 UTC (rev 13204)
@@ -21,38 +21,21 @@
*/
package org.jboss.wsf.spi.serviceref;
-import javax.naming.Context;
-import javax.naming.NamingException;
import javax.naming.Referenceable;
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
/**
* An implementation of this interface handles all service-ref binding concerns.
- *
- * @author Thomas.Diesler(a)jboss.org
+ *
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public interface ServiceRefHandler
{
- enum Type {
+ enum Type
+ {
JAXRPC, JAXWS
};
- /**
- * @deprecated use {@link
#createReferenceable(org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData,
ClassLoader)} instead
- */
- @Deprecated
- void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot,
ClassLoader loader,
- ServiceRefMetaData sref) throws NamingException;
-
- /**
- * Creates JNDI referenceable representing this <b>serviceRef</b>.
- *
- * @param serviceRefUMDM service reference UMDM
- * @param loader class loader
- * @return JNDI referenceable
- */
- Referenceable createReferenceable(UnifiedServiceRefMetaData serviceRefUMDM,
ClassLoader loader);
+ Referenceable createReferenceable(UnifiedServiceRefMetaData serviceRefUMDM);
}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2010-11-03
07:52:01 UTC (rev 13203)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2010-11-03
07:55:37 UTC (rev 13204)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
-package org.jboss.wsf.spi.serviceref;
-
-/**
- * An abstract service-ref meta data object.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-Mar-2007
- */
-public abstract class ServiceRefMetaData extends ServiceRefElement
-{
- public abstract String getServiceRefName();
-
- public abstract void setServiceRefName(String name);
-
- public abstract Object getAnnotatedElement();
-
- public abstract void setAnnotatedElement(Object anElement);
-
- public abstract boolean isProcessed();
-
- public abstract void setProcessed(boolean flag);
-}