Author: tcurdt Date: Sat Mar 10 10:57:50 2007 New Revision: 516767 URL: http://svn.apache.org/viewvc?view=rev&rev=516767 Log: docs, cleanups
Added: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java (with props) Removed: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ClassUtils.java Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationListener.java jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitor.java Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java?view=diff&rev=516767&r1=516766&r2=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java (original) +++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java Sat Mar 10 10:57:50 2007 @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.jci.utils.ClassUtils; +import org.apache.commons.jci.utils.ConversionUtils; /** @@ -63,7 +63,7 @@ final String className; if (pHint.indexOf('.') < 0) { - className = "org.apache.commons.jci.compilers." + ClassUtils.toJavaCasing(pHint) + "JavaCompiler"; + className = "org.apache.commons.jci.compilers." + ConversionUtils.toJavaCasing(pHint) + "JavaCompiler"; } else { className = pHint; } Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java?view=diff&rev=516767&r1=516766&r2=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java (original) +++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java Sat Mar 10 10:57:50 2007 @@ -32,7 +32,7 @@ import org.apache.commons.jci.stores.MemoryResourceStore; import org.apache.commons.jci.stores.ResourceStore; import org.apache.commons.jci.stores.TransactionalResourceStore; -import org.apache.commons.jci.utils.ClassUtils; +import org.apache.commons.jci.utils.ConversionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -93,11 +93,11 @@ for (Iterator it = deleted.iterator(); it.hasNext();) { final File deletedFile = (File) it.next(); - final String resourceName = ClassUtils.getResourceNameFromFileName(ClassUtils.relative(pObserver.getRootDirectory(), deletedFile)); + final String resourceName = ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(), deletedFile)); if (resourceName.endsWith(".java")) { transactionalStore.remove( - ClassUtils.stripExtension(resourceName) + ".class"); + ConversionUtils.stripExtension(resourceName) + ".class"); } else { transactionalStore.remove(resourceName); } @@ -133,7 +133,7 @@ final String[] sourceFiles = new String[compileables.size()]; for (Iterator it = compileables.iterator(); it.hasNext();) { final File file = (File) it.next(); - final String resourceName = ClassUtils.getResourceNameFromFileName(ClassUtils.relative(pObserver.getRootDirectory(), file)); + final String resourceName = ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(), file)); sourceFiles[i] = resourceName; i++; } Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java?view=diff&rev=516767&r1=516766&r2=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java (original) +++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java Sat Mar 10 10:57:50 2007 @@ -30,7 +30,7 @@ import org.apache.commons.jci.stores.MemoryResourceStore; import org.apache.commons.jci.stores.ResourceStore; import org.apache.commons.jci.stores.Transactional; -import org.apache.commons.jci.utils.ClassUtils; +import org.apache.commons.jci.utils.ConversionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -78,7 +78,7 @@ if (deleted.size() > 0) { for (Iterator it = deleted.iterator(); it.hasNext();) { final File file = (File) it.next(); - final String resourceName = ClassUtils.getResourceNameFromFileName(ClassUtils.relative(pObserver.getRootDirectory(), file)); + final String resourceName = ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(), file)); store.remove(resourceName); } reload = true; @@ -91,7 +91,7 @@ try { is = new FileInputStream(file); final byte[] bytes = IOUtils.toByteArray(is); - final String resourceName = ClassUtils.getResourceNameFromFileName(ClassUtils.relative(pObserver.getRootDirectory(), file)); + final String resourceName = ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(), file)); store.write(resourceName, bytes); } catch(final Exception e) { log.error("could not load " + file, e); @@ -108,7 +108,7 @@ try { is = new FileInputStream(file); final byte[] bytes = IOUtils.toByteArray(is); - final String resourceName = ClassUtils.getResourceNameFromFileName(ClassUtils.relative(pObserver.getRootDirectory(), file)); + final String resourceName = ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(), file)); store.write(resourceName, bytes); } catch(final Exception e) { log.error("could not load " + file, e); Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java?view=diff&rev=516767&r1=516766&r2=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java (original) +++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java Sat Mar 10 10:57:50 2007 @@ -16,7 +16,7 @@ */ package org.apache.commons.jci.stores; -import org.apache.commons.jci.utils.ClassUtils; +import org.apache.commons.jci.utils.ConversionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +40,7 @@ if (stores != null) { for (int i = 0; i < stores.length; i++) { final ResourceStore store = stores[i]; - final byte[] clazzBytes = store.read(ClassUtils.convertClassToResourcePath(name)); + final byte[] clazzBytes = store.read(ConversionUtils.convertClassToResourcePath(name)); if (clazzBytes != null) { log.debug(getId() + " found class: " + name + " (" + clazzBytes.length + " bytes)"); return defineClass(name, clazzBytes, 0, clazzBytes.length); Added: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java?view=auto&rev=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java (added) +++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java Sat Mar 10 10:57:50 2007 @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.commons.jci.utils; + +import java.io.File; + +/** + * + * @author tcurdt + */ +public final class ConversionUtils { + + /** + * Please do not use - internal + * org/my/Class.xxx -> org.my.Class + */ + public static String convertResourceToClassName( final String pResourceName ) { + return ConversionUtils.stripExtension(pResourceName).replace('/', '.'); + } + + /** + * Please do not use - internal + * org.my.Class -> org/my/Class.class + */ + public static String convertClassToResourcePath( final String pName ) { + return pName.replace('.', '/') + ".class"; + } + + /** + * Please do not use - internal + * org/my/Class.xxx -> org/my/Class + */ + public static String stripExtension( final String pResourceName ) { + final int i = pResourceName.lastIndexOf('.'); + final String withoutExtension = pResourceName.substring(0, i); + return withoutExtension; + } + + public static String toJavaCasing(final String pName) { + final char[] name = pName.toLowerCase().toCharArray(); + name[0] = Character.toUpperCase(name[0]); + return new String(name); + } + + public static String clazzName( final File base, final File file ) { + final int rootLength = base.getAbsolutePath().length(); + final String absFileName = file.getAbsolutePath(); + final int p = absFileName.lastIndexOf('.'); + final String relFileName = absFileName.substring(rootLength + 1, p); + final String clazzName = relFileName.replace(File.separatorChar, '.'); + return clazzName; + } + + public static String relative( final File base, final File file ) { + final int rootLength = base.getAbsolutePath().length(); + final String absFileName = file.getAbsolutePath(); + final String relFileName = absFileName.substring(rootLength + 1); + return relFileName; + } + + /** + * a/b/c.java -> a/b/c.java + * a\b\c.java -> a/b/c.java + * @param pFileName + * @return + */ + public static String getResourceNameFromFileName( final String pFileName ) { + if ('/' == File.separatorChar) { + return pFileName; + } + + return pFileName.replace(File.separatorChar, '/'); + } + +} Propchange: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Author HeadURL Id Propchange: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java?view=diff&rev=516767&r1=516766&r2=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java (original) +++ jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java Sat Mar 10 10:57:50 2007 @@ -30,7 +30,7 @@ import org.apache.commons.jci.problems.CompilationProblemHandler; import org.apache.commons.jci.readers.ResourceReader; import org.apache.commons.jci.stores.ResourceStore; -import org.apache.commons.jci.utils.ClassUtils; +import org.apache.commons.jci.utils.ConversionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -93,7 +93,7 @@ log.debug("compiling " + resourcePath + " (" + data.length + ")"); - pStore.write(ClassUtils.stripExtension(resourcePath) + ".class", data); + pStore.write(ConversionUtils.stripExtension(resourcePath) + ".class", data); } Modified: jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java?view=diff&rev=516767&r1=516766&r2=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java (original) +++ jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java Sat Mar 10 10:57:50 2007 @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.jci.listeners; import java.io.File; @@ -24,6 +25,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +/** + * + * @author tcurdt + */ public abstract class AbstractFilesystemAlterationListener implements FilesystemAlterationListener { private final Log log = LogFactory.getLog(AbstractFilesystemAlterationListener.class); Modified: jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationListener.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationListener.java?view=diff&rev=516767&r1=516766&r2=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationListener.java (original) +++ jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationListener.java Sat Mar 10 10:57:50 2007 @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.jci.monitor; import java.io.File; Modified: jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitor.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitor.java?view=diff&rev=516767&r1=516766&r2=516767 ============================================================================== --- jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitor.java (original) +++ jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitor.java Sat Mar 10 10:57:50 2007 @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.jci.monitor; import java.io.File; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]