You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by gt...@apache.org on 2013/08/08 00:42:23 UTC
svn commit: r1511525 - in /river/jtsk/skunk/surrogate: nbproject/
src/org/apache/river/container/ src/org/apache/river/container/classloading/
src/org/apache/river/container/codebase/
src/org/apache/river/container/deployer/ src/org/apache/river/contai...
Author: gtrasuk
Date: Wed Aug 7 22:42:22 2013
New Revision: 1511525
URL: http://svn.apache.org/r1511525
Log:
Switch to commons-vfs2-2.0.
Modified:
river/jtsk/skunk/surrogate/nbproject/project.properties
river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtility.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtilityImpl.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/ProfileConfigReader.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/PropertiesFileReader.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/Utils.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/ClasspathEntry.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/VirtualFileSystemClassLoader.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServer.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServerCodebaseContext.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/CodebaseContext.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/DummyCodebaseHandler.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/core-config.xml
river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/ApplicationEnvironment.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StartupDeployer.java
river/jtsk/skunk/surrogate/src/org/apache/river/container/liaison/VirtualFileSystemConfiguration.java
river/jtsk/skunk/surrogate/test/org/apache/river/container/CommonsVFSTest.java
river/jtsk/skunk/surrogate/test/org/apache/river/container/PropertiesFileReaderTest.java
river/jtsk/skunk/surrogate/test/org/apache/river/container/classloading/VFSClassLoaderTest.java
river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg
Modified: river/jtsk/skunk/surrogate/nbproject/project.properties
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/nbproject/project.properties?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/nbproject/project.properties (original)
+++ river/jtsk/skunk/surrogate/nbproject/project.properties Wed Aug 7 22:42:22 2013
@@ -35,8 +35,8 @@ jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
${libs.ApacheCommonsLogging-1_1_1.classpath}:\
- ${libs.ApacheCommonsVFS-1_0.classpath}:\
${libs.ApacheRiverLib.classpath}:\
+ ${libs.ApacheCommonsVFS-2.0.classpath}:\
${libs.ApacheRiverServices.classpath}:\
${libs.ApacheRiverPlatform.classpath}
# Space-separated list of extra javac options
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtility.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtility.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtility.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtility.java Wed Aug 7 22:42:22 2013
@@ -19,7 +19,7 @@
package org.apache.river.container;
import java.io.IOException;
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
/**
* Utilities for dealing with the files and file systems that the
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtilityImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtilityImpl.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtilityImpl.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/FileUtilityImpl.java Wed Aug 7 22:42:22 2013
@@ -20,10 +20,10 @@ package org.apache.river.container;
import java.io.File;
import java.io.IOException;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.VFS;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.VFS;
/**
*
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/ProfileConfigReader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/ProfileConfigReader.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/ProfileConfigReader.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/ProfileConfigReader.java Wed Aug 7 22:42:22 2013
@@ -27,7 +27,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
import org.apache.river.container.config.ContainerConfig;
import org.xml.sax.SAXException;
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/PropertiesFileReader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/PropertiesFileReader.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/PropertiesFileReader.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/PropertiesFileReader.java Wed Aug 7 22:42:22 2013
@@ -22,9 +22,9 @@ import java.io.InputStream;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileType;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.FileType;
/**
*
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/Utils.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/Utils.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/Utils.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/Utils.java Wed Aug 7 22:42:22 2013
@@ -26,9 +26,9 @@ import java.util.Properties;
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileType;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.FileType;
/**
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/ClasspathEntry.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/ClasspathEntry.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/ClasspathEntry.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/ClasspathEntry.java Wed Aug 7 22:42:22 2013
@@ -19,8 +19,8 @@
package org.apache.river.container.classloading;
import java.util.logging.Logger;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
import org.apache.river.container.MessageNames;
/**
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/VirtualFileSystemClassLoader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/VirtualFileSystemClassLoader.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/VirtualFileSystemClassLoader.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/classloading/VirtualFileSystemClassLoader.java Wed Aug 7 22:42:22 2013
@@ -31,9 +31,9 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.jini.security.Security;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileUtil;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.FileUtil;
import org.apache.river.container.LocalizedRuntimeException;
import org.apache.river.container.MessageNames;
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServer.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServer.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServer.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServer.java Wed Aug 7 22:42:22 2013
@@ -35,7 +35,7 @@ import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
import org.apache.river.container.Init;
import org.apache.river.container.Injected;
import org.apache.river.container.InjectionStyle;
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServerCodebaseContext.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServerCodebaseContext.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServerCodebaseContext.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/ClassServerCodebaseContext.java Wed Aug 7 22:42:22 2013
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
/**
*
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/CodebaseContext.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/CodebaseContext.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/CodebaseContext.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/CodebaseContext.java Wed Aug 7 22:42:22 2013
@@ -18,7 +18,7 @@
package org.apache.river.container.codebase;
import java.net.URL;
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
/**
Context that interfaces with the codebase handling system to make
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/DummyCodebaseHandler.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/DummyCodebaseHandler.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/DummyCodebaseHandler.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/codebase/DummyCodebaseHandler.java Wed Aug 7 22:42:22 2013
@@ -20,7 +20,7 @@ package org.apache.river.container.codeb
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
/**
*
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/core-config.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/core-config.xml?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/core-config.xml (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/core-config.xml Wed Aug 7 22:42:22 2013
@@ -49,7 +49,7 @@
<cfg:classpath id="containerClassLoader" parent="systemClassLoader">
lib/RiverSurrogate.jar
lib/commons-logging-1.1.1.jar
- lib/commons-vfs-1.0.jar
+ lib/commons-vfs2-2.0.jar
lib/jsk-platform.jar
lib/jsk-resources.jar
</cfg:classpath>
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/ApplicationEnvironment.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/ApplicationEnvironment.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/ApplicationEnvironment.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/ApplicationEnvironment.java Wed Aug 7 22:42:22 2013
@@ -18,7 +18,7 @@
package org.apache.river.container.deployer;
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
import org.apache.river.container.classloading.VirtualFileSystemClassLoader;
import org.apache.river.container.codebase.CodebaseContext;
import org.apache.river.container.work.WorkingContext;
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java Wed Aug 7 22:42:22 2013
@@ -39,9 +39,9 @@ import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.jini.security.policy.DynamicPolicyProvider;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileType;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.FileType;
import org.apache.river.container.ConfigurationException;
import org.apache.river.container.Context;
import org.apache.river.container.FileUtility;
@@ -79,7 +79,6 @@ public class StarterServiceDeployer impl
private String myName = null;
@Injected(style = InjectionStyle.BY_TYPE)
private CodebaseHandler codebaseHandler = null;
-
private String config = Strings.STARTER_SERVICE_DEPLOYER_CONFIG;
private ASTconfig configNode = null;
@@ -92,23 +91,19 @@ public class StarterServiceDeployer impl
}
@Injected(style = InjectionStyle.BY_TYPE)
private PropertiesFileReader propertiesFileReader = null;
-
@Injected(style = InjectionStyle.BY_TYPE)
private ArgsParser argsParser = null;
-
@Injected(style = InjectionStyle.BY_TYPE)
WorkManager workManager = null;
-
- @Injected(style=InjectionStyle.BY_TYPE)
- ContextualWorkManager contextualWorkManager=null;
-
+ @Injected(style = InjectionStyle.BY_TYPE)
+ ContextualWorkManager contextualWorkManager = null;
@Injected(style = InjectionStyle.BY_TYPE)
private DynamicPolicyProvider securityPolicy = null;
public void addPlatformCodebaseJars(CodebaseContext codebaseContext) throws IOException {
ASTcodebase codebaseNode = (ASTcodebase) configNode.search(new Class[]{
- ASTconfig.class, ASTclassloader.class, ASTcodebase.class
- }).get(0);
+ ASTconfig.class, ASTclassloader.class, ASTcodebase.class
+ }).get(0);
/*
Register the platform codebase jars with the codebase service.
*/
@@ -143,7 +138,7 @@ public class StarterServiceDeployer impl
Include platform jars from the container's lib directory.
*/
ASTclasspath platformJarSpec = (ASTclasspath) configNode.search(new Class[]{ASTconfig.class,
- ASTclassloader.class, ASTjars.class, ASTclasspath.class}).get(0);
+ ASTclassloader.class, ASTjars.class, ASTclasspath.class}).get(0);
addPlatformJarsToClassloader(platformJarSpec, cl);
addLibDirectoryJarsToClasspath(serviceRoot, cl);
@@ -209,10 +204,9 @@ public class StarterServiceDeployer impl
Launch the service.
*/
log.log(Level.FINE, MessageNames.CALLING_MAIN, new Object[]{
- startClassName, Utils.format(args)
- });
+ startClassName, Utils.format(args)
+ });
Runnable task = new Runnable() {
-
@Override
public void run() {
try {
@@ -235,7 +229,7 @@ public class StarterServiceDeployer impl
throw new LocalizedRuntimeException(MessageNames.BUNDLE_NAME,
MessageNames.CANT_READ_START_PROPERTIES,
new Object[]{Strings.START_PROPERTIES,
- serviceRoot.getName().getBaseName()});
+ serviceRoot.getName().getBaseName()});
}
Properties startProps = propertiesFileReader.getProperties(startProperties);
return startProps;
@@ -245,7 +239,10 @@ public class StarterServiceDeployer impl
/*
Setup the liaison configuration.
*/
+ ClassLoader originalContextCl=Thread.currentThread().getContextClassLoader();
try {
+ System.out.println("Setting context classloader to " + cl);
+ Thread.currentThread().setContextClassLoader(cl);
File workingDir = null;
if (serviceArchive != null) {
workingDir = new File(serviceArchive.getURL().toURI());
@@ -270,19 +267,21 @@ public class StarterServiceDeployer impl
String contextVarName = cfgEntryNode.jjtGetChild(1).toString();
Object contextValue = context.get(contextVarName);
if (contextValue != null) {
- invokeStatic(cl, configName,
- Strings.PUT_SPECIAL_ENTRY,
- new Class[] {String.class, Object.class},
+ invokeStatic(cl, configName,
+ Strings.PUT_SPECIAL_ENTRY,
+ new Class[]{String.class, Object.class},
Strings.DOLLAR + varName, contextValue);
} else {
- log.log(Level.WARNING, MessageNames.MISSING_SPECIAL_VALUE,
- new Object[] {getConfig(), varName, contextVarName});
- }
+ log.log(Level.WARNING, MessageNames.MISSING_SPECIAL_VALUE,
+ new Object[]{getConfig(), varName, contextVarName});
+ }
}
} catch (Exception ex) {
log.log(Level.WARNING, MessageNames.EXCEPTION_THROWN, Utils.stackTrace(ex));
throw new ConfigurationException(ex,
MessageNames.STARTER_SERVICE_DEPLOYER_FAILED_INIT);
+ } finally {
+ Thread.currentThread().setContextClassLoader(originalContextCl);
}
}
@@ -295,8 +294,8 @@ public class StarterServiceDeployer impl
FileObject configFile = fileUtility.getProfileDirectory().resolveFile(config);
InputStream in = configFile.getContent().getInputStream();
configNode = DeployerConfigParser.parseConfig(in);
- log.log(Level.FINE,MessageNames.STARTER_SERVICE_DEPLOYER_INITIALIZED,
- new Object[] {myName} );
+ log.log(Level.FINE, MessageNames.STARTER_SERVICE_DEPLOYER_INITIALIZED,
+ new Object[]{myName});
}
public ServiceLifeCycle deployServiceArchive(FileObject serviceArchive) throws IOException, ClassNotFoundException, NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
@@ -307,7 +306,7 @@ public class StarterServiceDeployer impl
serviceArchive.getFileSystem().getFileSystemManager().createFileSystem(Strings.JAR, serviceArchive));
String serviceName = findServiceName(env.getServiceArchive(), env.getServiceRoot());
env.setServiceName(serviceName);
- ServiceLifeCycle slc=StarterServiceLifeCycleSM.newStarterServiceLifeCycle(env, this);
+ ServiceLifeCycle slc = StarterServiceLifeCycleSM.newStarterServiceLifeCycle(env, this);
return slc;
}
@@ -326,7 +325,7 @@ public class StarterServiceDeployer impl
}
void prepareService(ApplicationEnvironment env) throws IOException, ClassNotFoundException, NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
-
+
CodeSource serviceCodeSource =
new CodeSource(findServiceURL(env.getServiceArchive(), env.getServiceRoot()),
new Certificate[0]);
@@ -334,7 +333,7 @@ public class StarterServiceDeployer impl
new Object[]{env.getServiceName(), serviceCodeSource});
VirtualFileSystemClassLoader cl = createServiceClassloader(env.getServiceRoot(), serviceCodeSource);
env.setClassLoader(cl);
-
+
/*
Create a codebase context.
*/
@@ -355,13 +354,13 @@ public class StarterServiceDeployer impl
Permission[] perms = createPermissionsInClassloader(cl);
grantPermissions(cl, perms);
setupLiaisonConfiguration(env.getServiceArchive(), env.getServiceRoot(), cl);
-
+
/*
* Create a working context (work manager).
*/
env.setWorkingContext(contextualWorkManager.createContext(env.getServiceName()));
}
-
+
void launchService(ApplicationEnvironment env) throws FileSystemException, IOException {
Properties startProps = readStartProperties(env.getServiceRoot());
String argLine = startProps.getProperty(Strings.START_PARAMETERS);
@@ -447,27 +446,27 @@ public class StarterServiceDeployer impl
constructor.setAccessible(true);
return constructor.newInstance(parms, null);
}
-
+
/**
- * Attempt to stop the service in an orderly fashion.
- * Go to the service, see if it implements Administrable, then get the
- * admin proxy and see if it implements DestroyAdmin. If so, call it.
- * @param env
+ * Attempt to stop the service in an orderly fashion. Go to the service, see
+ * if it implements Administrable, then get the admin proxy and see if it
+ * implements DestroyAdmin. If so, call it.
+ *
+ * @param env
*/
- public void stopService(ApplicationEnvironment env) {
+ public void stopService(ApplicationEnvironment env) {
/* Option 1 - Service has a getAdmin() method - it probably implements
* Administrable.
*/
- Object serviceInstance=env.getServiceInstance();
- Method getAdmin=null;
+ Object serviceInstance = env.getServiceInstance();
+ Method getAdmin = null;
try {
- getAdmin=serviceInstance.getClass().getMethod(Strings.GET_ADMIN, new Class[0]);
+ getAdmin = serviceInstance.getClass().getMethod(Strings.GET_ADMIN, new Class[0]);
} catch (Exception ex) {
// Silent catch - leave it null;
}
if (getAdmin != null) {
-
}
-
+
}
}
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StartupDeployer.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StartupDeployer.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StartupDeployer.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StartupDeployer.java Wed Aug 7 22:42:22 2013
@@ -28,8 +28,8 @@ import javax.management.MBeanRegistratio
import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileType;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileType;
import org.apache.river.container.ConfigurationException;
import org.apache.river.container.Context;
import org.apache.river.container.FileUtility;
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/liaison/VirtualFileSystemConfiguration.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/liaison/VirtualFileSystemConfiguration.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/liaison/VirtualFileSystemConfiguration.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/liaison/VirtualFileSystemConfiguration.java Wed Aug 7 22:42:22 2013
@@ -31,10 +31,10 @@ import net.jini.config.Configuration;
import net.jini.config.ConfigurationException;
import net.jini.config.ConfigurationFile;
import net.jini.config.ConfigurationNotFoundException;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.VFS;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.VFS;
/**
*
Modified: river/jtsk/skunk/surrogate/test/org/apache/river/container/CommonsVFSTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/test/org/apache/river/container/CommonsVFSTest.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/test/org/apache/river/container/CommonsVFSTest.java (original)
+++ river/jtsk/skunk/surrogate/test/org/apache/river/container/CommonsVFSTest.java Wed Aug 7 22:42:22 2013
@@ -20,10 +20,10 @@ package org.apache.river.container;
import java.util.List;
import org.junit.Ignore;
import java.io.File;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.VFS;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.VFS;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
Modified: river/jtsk/skunk/surrogate/test/org/apache/river/container/PropertiesFileReaderTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/test/org/apache/river/container/PropertiesFileReaderTest.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/test/org/apache/river/container/PropertiesFileReaderTest.java (original)
+++ river/jtsk/skunk/surrogate/test/org/apache/river/container/PropertiesFileReaderTest.java Wed Aug 7 22:42:22 2013
@@ -19,10 +19,10 @@ package org.apache.river.container;
import java.util.Properties;
import java.io.File;
-import org.apache.commons.vfs.FileSystemManager;
+import org.apache.commons.vfs2.FileSystemManager;
import java.io.IOException;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.VFS;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.VFS;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
Modified: river/jtsk/skunk/surrogate/test/org/apache/river/container/classloading/VFSClassLoaderTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/test/org/apache/river/container/classloading/VFSClassLoaderTest.java?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/test/org/apache/river/container/classloading/VFSClassLoaderTest.java (original)
+++ river/jtsk/skunk/surrogate/test/org/apache/river/container/classloading/VFSClassLoaderTest.java Wed Aug 7 22:42:22 2013
@@ -20,9 +20,9 @@ import org.apache.river.container.classl
import java.net.URL;
import java.io.InputStream;
import java.io.File;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.VFS;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.VFS;
import org.apache.river.container.Bootstrap;
import org.apache.river.container.LocalizedRuntimeException;
import org.apache.river.container.MessageNames;
Modified: river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg?rev=1511525&r1=1511524&r2=1511525&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg (original)
+++ river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg Wed Aug 7 22:42:22 2013
@@ -59,7 +59,7 @@ classloader {
parent systemClassLoader;
jars {
- commons-vfs-1.0.jar,
+ commons-vfs2-2.0.jar,
commons-logging-1.1.1.jar,
jsk-platform.jar,
jsk-lib.jar,