[jboss-cvs] JBossAS SVN: r103982 - in projects/scanning/trunk: indexer/src/main/java/org/jboss/scanning/indexer/core and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 14 16:27:29 EDT 2010
Author: alesj
Date: 2010-04-14 16:27:28 -0400 (Wed, 14 Apr 2010)
New Revision: 103982
Modified:
projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/HandleCleanupDeployer.java
projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java
projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java
projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/DeploymentScanningHandleAggregator.java
projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/ScanningPlugin.java
projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/AbstractScanningPlugin.java
projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/ScanningPluginWrapper.java
projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java
Log:
Rename to attachment key, add file name getter.
Modified: projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/HandleCleanupDeployer.java
===================================================================
--- projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/HandleCleanupDeployer.java 2010-04-14 20:22:41 UTC (rev 103981)
+++ projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/HandleCleanupDeployer.java 2010-04-14 20:27:28 UTC (rev 103982)
@@ -51,7 +51,7 @@
{
for (ScanningPlugin plugin : plugins)
{
- Object handle = unit.removeAttachment(plugin.getHandleKey());
+ Object handle = unit.removeAttachment(plugin.getAttachmentKey());
if (handle != null)
plugin.cleanupHandle(handle);
}
Modified: projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java
===================================================================
--- projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java 2010-04-14 20:22:41 UTC (rev 103981)
+++ projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java 2010-04-14 20:27:28 UTC (rev 103982)
@@ -147,7 +147,7 @@
for (Map.Entry<ScanningPlugin, ScanningHandle> entry : handles.entrySet())
{
- File file = new File(directory, entry.getKey().getHandleKey() + Scanner.SUFFIX);
+ File file = new File(directory, entry.getKey().getFileName());
FileOutputStream fos = new FileOutputStream(file);
BufferedOutputStream bos = new BufferedOutputStream(fos);
GZIPOutputStream gos = new GZIPOutputStream(bos);
Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java 2010-04-14 20:22:41 UTC (rev 103981)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java 2010-04-14 20:27:28 UTC (rev 103982)
@@ -106,7 +106,7 @@
{
ScanningHandle handle = plugin.createHandle();
if (handle != VoidScanningHandle.INSTANCE) // ignore helper dummy/void handle
- unit.addAttachment(plugin.getHandleKey(), handle, plugin.getHandleInterface());
+ unit.addAttachment(plugin.getAttachmentKey(), handle, plugin.getHandleInterface());
return handle;
}
}
\ No newline at end of file
Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/DeploymentScanningHandleAggregator.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/DeploymentScanningHandleAggregator.java 2010-04-14 20:22:41 UTC (rev 103981)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/DeploymentScanningHandleAggregator.java 2010-04-14 20:27:28 UTC (rev 103982)
@@ -73,7 +73,7 @@
if (allowModule == false && current.isAttachmentPresent(Module.class))
return;
- U handle = current.getAttachment(plugin.getHandleKey(), plugin.getHandleInterface());
+ U handle = current.getAttachment(plugin.getAttachmentKey(), plugin.getHandleInterface());
if (handle != null)
handles.add(handle);
Modified: projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/ScanningPlugin.java
===================================================================
--- projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/ScanningPlugin.java 2010-04-14 20:22:41 UTC (rev 103981)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/ScanningPlugin.java 2010-04-14 20:27:28 UTC (rev 103982)
@@ -41,8 +41,16 @@
*
* @return the handle's key
*/
- String getHandleKey();
+ String getAttachmentKey();
+ /**
+ * Get handle's file name.
+ * Used to attach handle to jar and/or get pre-indexed.
+ *
+ * @return the handle's file name
+ */
+ String getFileName();
+
/***
* Get recurse filter.
*
Modified: projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/AbstractScanningPlugin.java
===================================================================
--- projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/AbstractScanningPlugin.java 2010-04-14 20:22:41 UTC (rev 103981)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/AbstractScanningPlugin.java 2010-04-14 20:27:28 UTC (rev 103982)
@@ -24,6 +24,7 @@
import org.jboss.classloading.spi.visitor.ResourceContext;
import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.scanning.spi.Scanner;
import org.jboss.scanning.spi.ScanningHandle;
import org.jboss.scanning.spi.ScanningPlugin;
@@ -49,11 +50,16 @@
// by default, do nothing
}
- public String getHandleKey()
+ public String getAttachmentKey()
{
return getHandleInterface().getName();
}
+ public String getFileName()
+ {
+ return getHandleInterface().getSimpleName() + Scanner.SUFFIX;
+ }
+
public boolean accepts(ResourceContext resource)
{
return getFilter().accepts(resource);
Modified: projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/ScanningPluginWrapper.java
===================================================================
--- projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/ScanningPluginWrapper.java 2010-04-14 20:22:41 UTC (rev 103981)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/ScanningPluginWrapper.java 2010-04-14 20:27:28 UTC (rev 103982)
@@ -66,11 +66,16 @@
return delegate.getHandleInterface();
}
- public String getHandleKey()
+ public String getAttachmentKey()
{
- return delegate.getHandleKey();
+ return delegate.getAttachmentKey();
}
+ public String getFileName()
+ {
+ return delegate.getFileName();
+ }
+
public ResourceFilter getRecurseFilter()
{
return delegate.getRecurseFilter();
Modified: projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java
===================================================================
--- projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java 2010-04-14 20:22:41 UTC (rev 103981)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java 2010-04-14 20:27:28 UTC (rev 103982)
@@ -32,6 +32,7 @@
import org.jboss.classloading.spi.visitor.ResourceFilter;
import org.jboss.logging.Logger;
+import org.jboss.scanning.spi.Scanner;
import org.jboss.scanning.spi.ScanningHandle;
import org.jboss.scanning.spi.ScanningPlugin;
@@ -69,10 +70,10 @@
federatedPlugins.add(wrapper);
if (ignoreIndexedHandles == false)
{
- String handleKey = plugin.getHandleKey();
+ String fileName = plugin.getFileName();
for (URL root : roots)
{
- InputStream is = getInputStream(root, PREFIX + handleKey + SUFFIX);
+ InputStream is = getInputStream(root, Scanner.PREFIX + fileName);
if (is != null)
{
ScanningHandle pre = readHandle(is);
More information about the jboss-cvs-commits
mailing list