Author: richard.opalka(a)jboss.com Date: 2010-10-13 10:19:06 -0400 (Wed, 13 Oct 2010) New Revision: 13113 Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParserFactory.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java Log: removing obsolete & deprecated code Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2010-10-13 13:33:31 UTC (rev 13112) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2010-10-13 14:19:06 UTC (rev 13113) @@ -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.metadata.j2ee.serviceref; - -import org.w3c.dom.Element; - -/** - * The metdata data from service-ref element in web.xml, ejb-jar.xml, and - * application-client.xml. - * - * @author Thomas.Diesler(a)jboss.org - */ -public interface ServiceRefMetaDataParser -{ - public void importStandardXml(Element root, UnifiedServiceRefMetaData sref); - - public void importJBossXml(Element root, UnifiedServiceRefMetaData sref); - - public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref); - - public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref); - - public void importStandardXml(Element root, UnifiedHandlerMetaData href); -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParserFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParserFactory.java 2010-10-13 13:33:31 UTC (rev 13112) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParserFactory.java 2010-10-13 14:19:06 UTC (rev 13113) @@ -1,31 +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.metadata.j2ee.serviceref; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 02-Aug-2007 - */ -public interface ServiceRefMetaDataParserFactory -{ - ServiceRefMetaDataParser getServiceRefMetaDataParser(); -} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2010-10-13 13:33:31 UTC (rev 13112) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2010-10-13 14:19:06 UTC (rev 13113) @@ -28,10 +28,7 @@ import javax.xml.namespace.QName; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.serviceref.ServiceRefElement; -import org.w3c.dom.Element; /** * The unified metdata data for a handler element @@ -134,13 +131,6 @@ portNames.add(value); } - public void importStandardXml(Element root) - { - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class); - factory.getServiceRefMetaDataParser().importStandardXml(root, this); - } - public String toString() { StringBuilder str = new StringBuilder(); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2010-10-13 13:33:31 UTC (rev 13112) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2010-10-13 14:19:06 UTC (rev 13113) @@ -26,10 +26,7 @@ import javax.xml.namespace.QName; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.serviceref.ServiceRefElement; -import org.w3c.dom.Element; /** The metdata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml. * @@ -254,20 +251,6 @@ this.configName = configName; } - public void importStandardXml(Element root) - { - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class); - factory.getServiceRefMetaDataParser().importStandardXml(root, this); - } - - public void importJBossXml(Element root) - { - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class); - factory.getServiceRefMetaDataParser().importJBossXml(root, this); - } - public boolean matches(String seiName, QName portName) { if (seiName == null && portName == null) 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-10-13 13:33:31 UTC (rev 13112) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-10-13 14:19:06 UTC (rev 13113) @@ -41,13 +41,10 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; 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.util.URLLoaderAdapter; -import org.w3c.dom.Element; /** * The metdata data from service-ref element in web.xml, ejb-jar.xml, and @@ -492,24 +489,6 @@ return this.injectionTargets; } - @Override - @Deprecated - public void importStandardXml(Element root) - { - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class); - factory.getServiceRefMetaDataParser().importStandardXml(root, this); - } - - @Override - @Deprecated - public void importJBossXml(Element root) - { - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class); - factory.getServiceRefMetaDataParser().importJBossXml(root, this); - } - private void writeObject(ObjectOutputStream out) throws IOException { out.defaultWriteObject(); Modified: 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-10-13 13:33:31 UTC (rev 13112) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2010-10-13 14:19:06 UTC (rev 13113) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.serviceref; -import org.w3c.dom.Element; import java.io.Serializable; import java.util.List; @@ -47,11 +46,5 @@ public abstract List<String[]> getInjectionTargets(); - @Deprecated - public abstract void importStandardXml(Element element); - - @Deprecated - public abstract void importJBossXml(Element element); - public abstract void merge(ServiceRefMetaData targetRef); }