[jboss-cvs] JBossAS SVN: r94862 - in projects/jboss-cl/trunk: classloading and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 14 08:46:34 EDT 2009
Author: adrian at jboss.org
Date: 2009-10-14 08:46:33 -0400 (Wed, 14 Oct 2009)
New Revision: 94862
Modified:
projects/jboss-cl/trunk/classloader/.classpath
projects/jboss-cl/trunk/classloader/.project
projects/jboss-cl/trunk/classloading-vfs/.classpath
projects/jboss-cl/trunk/classloading-vfs/.project
projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java
projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/SchemaPrinter.java
projects/jboss-cl/trunk/classloading/.project
projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java
projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/version/Version.java
projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/SchemaPrinter.java
Log:
Fix maven/eclipse and some source code tidyup
Modified: projects/jboss-cl/trunk/classloader/.classpath
===================================================================
--- projects/jboss-cl/trunk/classloader/.classpath 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloader/.classpath 2009-10-14 12:46:33 UTC (rev 94862)
@@ -4,17 +4,5 @@
<classpathentry kind="src" path="src/test/resources" output="target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: projects/jboss-cl/trunk/classloader/.project
===================================================================
--- projects/jboss-cl/trunk/classloader/.project 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloader/.project 2009-10-14 12:46:33 UTC (rev 94862)
@@ -1,13 +1,17 @@
<projectDescription>
- <name>jboss-classloader</name>
+ <name>classloader</name>
<comment>JBoss ClassLoader</comment>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
\ No newline at end of file
Modified: projects/jboss-cl/trunk/classloading/.project
===================================================================
--- projects/jboss-cl/trunk/classloading/.project 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading/.project 2009-10-14 12:46:33 UTC (rev 94862)
@@ -1,24 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-classloading</name>
- <comment>JBoss ClassLoading</comment>
- <projects>
- <project>jboss-classloader</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+ <name>classloading</name>
+ <comment>JBoss ClassLoading</comment>
+ <projects>
+ <project>jboss-classloader</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
</projectDescription>
Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java 2009-10-14 12:46:33 UTC (rev 94862)
@@ -101,6 +101,8 @@
/**
* Get the split package policy
+ *
+ * @return the split package policy
*/
public SplitPackagePolicy getSplitPackagePolicy()
{
@@ -109,6 +111,8 @@
/**
* Set the split package policy
+ *
+ * @param policy the split package policy
*/
public void setSplitPackagePolicy(SplitPackagePolicy policy)
{
Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java 2009-10-14 12:46:33 UTC (rev 94862)
@@ -67,6 +67,9 @@
*/
public abstract class Module extends NameAndVersionSupport
{
+ /** The serialVersionUID - not really serializable */
+ private static final long serialVersionUID = 1L;
+
/** The modules by classloader */
private static Map<ClassLoader, Module> modulesByClassLoader = new ConcurrentHashMap<ClassLoader, Module>();
Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java 2009-10-14 12:46:33 UTC (rev 94862)
@@ -38,6 +38,7 @@
public class RequirementDependencyItem extends AbstractDependencyItem
{
/** The log */
+ @SuppressWarnings("hiding")
private static final Logger log = Logger.getLogger(RequirementDependencyItem.class);
/** The module */
Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/version/Version.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/version/Version.java 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/version/Version.java 2009-10-14 12:46:33 UTC (rev 94862)
@@ -255,7 +255,6 @@
}
@Override
- @SuppressWarnings("unchecked")
public boolean equals(Object object)
{
if (object == this)
Modified: projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/SchemaPrinter.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/SchemaPrinter.java 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/SchemaPrinter.java 2009-10-14 12:46:33 UTC (rev 94862)
@@ -47,7 +47,6 @@
*/
public class SchemaPrinter
{
- @SuppressWarnings("unchecked")
public static String printSchema(SchemaBinding schemaBinding)
{
String nsURI = schemaBinding.getNamespaces().iterator().next();
@@ -157,7 +156,6 @@
builder.append("</complexType>");
}
- @SuppressWarnings("unchecked")
public static void printTypeInfo(StringBuilder builder, int pad, TypeBinding type)
{
ParticleBinding particle = type.getParticle();
@@ -191,7 +189,6 @@
printModel(builder, pad, particle, "choice");
}
- @SuppressWarnings("unchecked")
public static void printModel(StringBuilder builder, int pad, ParticleBinding particle, String prefix)
{
pad(builder, pad);
Modified: projects/jboss-cl/trunk/classloading-vfs/.classpath
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/.classpath 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading-vfs/.classpath 2009-10-14 12:46:33 UTC (rev 94862)
@@ -4,32 +4,6 @@
<classpathentry kind="src" path="src/test/java" output="target/tests-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
- <classpathentry kind="src" path="/jboss-classloader"/>
- <classpathentry kind="src" path="/jboss-classloading"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.CR8/jboss-metatype-2.1.0.CR8.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.CR8/jboss-metatype-2.1.0.CR8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.2.GA/jboss-vfs-2.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.2.GA/jboss-vfs-2.1.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/jboss-cl/trunk/classloading-vfs/.project
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/.project 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading-vfs/.project 2009-10-14 12:46:33 UTC (rev 94862)
@@ -1,5 +1,5 @@
<projectDescription>
- <name>jboss-classloading-vfs</name>
+ <name>classloading-vfs</name>
<comment>JBoss ClassLoading VFS</comment>
<projects>
<project>jboss-classloader</project>
@@ -9,8 +9,12 @@
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
\ No newline at end of file
Modified: projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java 2009-10-14 12:46:33 UTC (rev 94862)
@@ -175,11 +175,6 @@
{
return classname;
}
-
- public String getPackageName()
- {
- return ClassLoaderUtils.getClassPackageName(classname);
- }
public String getResourceName()
{
Modified: projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/SchemaPrinter.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/SchemaPrinter.java 2009-10-14 12:43:35 UTC (rev 94861)
+++ projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/SchemaPrinter.java 2009-10-14 12:46:33 UTC (rev 94862)
@@ -48,7 +48,6 @@
*/
public class SchemaPrinter
{
- @SuppressWarnings("unchecked")
public static String printSchema(SchemaBinding schemaBinding)
{
String nsURI = schemaBinding.getNamespaces().iterator().next();
@@ -164,7 +163,6 @@
builder.append("</complexType>");
}
- @SuppressWarnings("unchecked")
public static void printTypeInfo(StringBuilder builder, int pad, TypeBinding type)
{
ParticleBinding particle = type.getParticle();
@@ -198,7 +196,6 @@
printModel(builder, pad, particle, "choice");
}
- @SuppressWarnings("unchecked")
public static void printModel(StringBuilder builder, int pad, ParticleBinding particle, String prefix)
{
pad(builder, pad);
More information about the jboss-cvs-commits
mailing list