Author: asoldano
Date: 2014-05-19 10:22:07 -0400 (Mon, 19 May 2014)
New Revision: 18674
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/SPIView.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WritableUnifiedVirtualFile.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/management/StackConfigFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java
Log:
Removing few useless / not used anymore interfaces, making URLLoaderAdapter thread-safe,
removing deprecated method in InvocationHandlerFactory
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/SPIView.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/SPIView.java 2014-05-19 12:41:41 UTC (rev
18673)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/SPIView.java 2014-05-19 14:22:07 UTC (rev
18674)
@@ -1,33 +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;
-
-/**
- * Marks a specific subset onto the overall SPI.<br>
- * An SPIView can be passed to the {@link SPIProvider} to get an implementation.
- *
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 18, 2007
- */
-public interface SPIView
-{
-}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2014-05-19 12:41:41
UTC (rev 18673)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2014-05-19 14:22:07
UTC (rev 18674)
@@ -21,14 +21,12 @@
import java.net.URL;
import java.util.Map;
-import org.jboss.wsf.spi.SPIView;
-
/**
* Abstraction to provide AS agnostic remote deployer.
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-public interface Deployer extends SPIView
+public interface Deployer
{
/**
* Deploys specified archive remotely.
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.spi.deployment;
-import org.jboss.wsf.spi.SPIView;
/**
* Creates DeploymentAspectManager's by {@link
org.jboss.wsf.spi.deployment.Deployment.DeploymentType}
@@ -29,7 +28,7 @@
* @author Heiko.Braun(a)jboss.com
* Created: Jul 20, 2007
*/
-public abstract class DeploymentAspectManagerFactory implements SPIView
+public abstract class DeploymentAspectManagerFactory
{
public abstract DeploymentAspectManager getDeploymentAspectManager(DeploymentType
deploymentType);
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,13 +21,12 @@
*/
package org.jboss.wsf.spi.deployment;
-import org.jboss.wsf.spi.SPIView;
/**
* @author Heiko.Braun(a)jboss.com
* Created: Jul 18, 2007
*/
-public abstract class DeploymentModelFactory implements SPIView
+public abstract class DeploymentModelFactory
{
public abstract Deployment newDeployment(String simpleName, ClassLoader
initialLoader);
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,13 +21,12 @@
*/
package org.jboss.wsf.spi.deployment;
-import org.jboss.wsf.spi.SPIView;
/**
* @author Heiko.Braun(a)jboss.com
* Created: Jul 23, 2007
*/
-public abstract class LifecycleHandlerFactory implements SPIView
+public abstract class LifecycleHandlerFactory
{
public abstract LifecycleHandler getLifecycleHandler();
}
Deleted:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WritableUnifiedVirtualFile.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WritableUnifiedVirtualFile.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WritableUnifiedVirtualFile.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -1,41 +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.deployment;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * @author alessio.soldano(a)jboss.com
- * @since 04-Mar-2010
- */
-public interface WritableUnifiedVirtualFile extends UnifiedVirtualFile
-{
- public void writeContent(OutputStream os) throws IOException;
-
- public void writeContent(OutputStream os, NameFilter filter) throws IOException;
-
- public interface NameFilter
- {
- public boolean accept(String fileName);
- }
-}
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.spi.invocation;
-import org.jboss.wsf.spi.SPIView;
/**
* Creates invocation related artefacts.
@@ -29,7 +28,7 @@
* @author Heiko.Braun(a)jboss.com
* Created: Jul 19, 2007
*/
-public abstract class InvocationHandlerFactory implements SPIView
+public abstract class InvocationHandlerFactory
{
public abstract InvocationHandler newInvocationHandler(InvocationType type);
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,16 +21,12 @@
*/
package org.jboss.wsf.spi.invocation;
-import org.jboss.wsf.spi.SPIView;
/**
* @author Heiko.Braun(a)jboss.com
* Created: Jul 23, 2007
*/
-public abstract class RequestHandlerFactory implements SPIView
+public abstract class RequestHandlerFactory
{
- @Deprecated
- public abstract RequestHandler newRequestHandler();
-
public abstract RequestHandler getRequestHandler();
}
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.spi.invocation;
-import org.jboss.wsf.spi.SPIView;
/**
* A container idependent SecurityAdaptorFactory
@@ -31,7 +30,7 @@
*
* @since 10-May-2005
*/
-public abstract class SecurityAdaptorFactory implements SPIView
+public abstract class SecurityAdaptorFactory
{
public abstract SecurityAdaptor newSecurityAdapter();
}
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.spi.management;
-import org.jboss.wsf.spi.SPIView;
/**
* Get the endpoint registry from the kernel
@@ -29,7 +28,7 @@
* @author Thomas.Diesler(a)jboss.com
* @since 20-Apr-2007
*/
-public abstract class EndpointRegistryFactory implements SPIView
+public abstract class EndpointRegistryFactory
{
public abstract EndpointRegistry getEndpointRegistry();
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.spi.management;
-import org.jboss.wsf.spi.SPIView;
/**
* Factory to container independent config
@@ -29,7 +28,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 08-May-2006
*/
-public abstract class ServerConfigFactory implements SPIView
+public abstract class ServerConfigFactory
{
public abstract ServerConfig getServerConfig();
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/StackConfigFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/management/StackConfigFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/management/StackConfigFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.spi.management;
-import org.jboss.wsf.spi.SPIView;
/**
* Factory to stack configuration
@@ -29,7 +28,7 @@
* @author alessio.soldano(a)jboss.com
* @since 25-May-2009
*/
-public abstract class StackConfigFactory implements SPIView
+public abstract class StackConfigFactory
{
public abstract StackConfig getStackConfig();
}
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java 2014-05-19
12:41:41 UTC (rev 18673)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -21,12 +21,11 @@
*/
package org.jboss.wsf.spi.serviceref;
-import org.jboss.wsf.spi.SPIView;
/**
* @author Thomas.Diesler(a)jboss.com
*/
-public interface ServiceRefFactoryFactory extends SPIView
+public interface ServiceRefFactoryFactory
{
ServiceRefFactory newServiceRefFactory();
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java 2014-05-19
12:41:41 UTC (rev 18673)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java 2014-05-19
14:22:07 UTC (rev 18674)
@@ -52,14 +52,15 @@
{
private static final long serialVersionUID = 8263115387770740414L;
- private URL rootURL;
- private URL resourceURL;
- private transient URLClassLoader loader;
+ private final URL rootURL;
+ private final URL resourceURL;
+ private transient volatile URLClassLoader loader;
private static final String jarFileSeparator = "/";
public URLLoaderAdapter(URL rootURL)
{
this.rootURL = rootURL;
+ this.resourceURL = null;
}
private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL)