[jboss-cvs] JBossAS SVN: r63688 - in projects/microcontainer/trunk: container and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 27 12:09:15 EDT 2007
Author: adrian at jboss.org
Date: 2007-06-27 12:09:15 -0400 (Wed, 27 Jun 2007)
New Revision: 63688
Modified:
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/container/.classpath
projects/microcontainer/trunk/container/src/main/org/jboss/util/collection/temp/WeakTypeCache.java
projects/microcontainer/trunk/dependency/.classpath
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/DependencyItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CallbackDependencyItem.java
projects/microcontainer/trunk/managed/.classpath
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractDependencyMetaData.java
Log:
Deployer refactoring changes and some fixes to make eclipse classpaths consistent
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/build/pom.xml 2007-06-27 16:09:15 UTC (rev 63688)
@@ -170,6 +170,11 @@
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss-container</artifactId>
<version>${project.version}</version>
</dependency>
@@ -192,6 +197,79 @@
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${project.version}</version>
</dependency>
Modified: projects/microcontainer/trunk/container/.classpath
===================================================================
--- projects/microcontainer/trunk/container/.classpath 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/container/.classpath 2007-06-27 16:09:15 UTC (rev 63688)
@@ -10,7 +10,7 @@
<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/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.4-SNAPSHOT/jboss-test-1.0.4-SNAPSHOT.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.4-SNAPSHOT/jboss-test-1.0.4-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.0.2/activation-1.0.2.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/util/collection/temp/WeakTypeCache.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/util/collection/temp/WeakTypeCache.java 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/util/collection/temp/WeakTypeCache.java 2007-06-27 16:09:15 UTC (rev 63688)
@@ -25,6 +25,7 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
import java.util.Map;
import java.util.WeakHashMap;
@@ -65,6 +66,8 @@
return getTypeVariable((TypeVariable) type);
else if (type instanceof GenericArrayType)
return getGenericArrayType((GenericArrayType) type);
+ else if (type instanceof WildcardType)
+ return getWildcardType((WildcardType) type);
else
throw new UnsupportedOperationException("Unknown type: " + type + " class=" + type.getClass());
}
@@ -146,6 +149,18 @@
}
/**
+ * Get the information for a wildcard type
+ *
+ * @param type the paremeterized type
+ * @return the info
+ */
+ private T getWildcardType(WildcardType type)
+ {
+ // TODO JBMICROCONT-131 improve this
+ return get(type.getUpperBounds()[0]);
+ }
+
+ /**
* Get the information for a type variable
*
* @param type the type variable
Modified: projects/microcontainer/trunk/dependency/.classpath
===================================================================
--- projects/microcontainer/trunk/dependency/.classpath 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/dependency/.classpath 2007-06-27 16:09:15 UTC (rev 63688)
@@ -6,7 +6,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.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/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.4-SNAPSHOT/jboss-test-1.0.4-SNAPSHOT.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.4-SNAPSHOT/jboss-test-1.0.4-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA-sources.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/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2007-06-27 16:09:15 UTC (rev 63688)
@@ -86,10 +86,8 @@
/**
* Create an abstract controller
- *
- * @throws Exception for any error
*/
- public AbstractController() throws Exception
+ public AbstractController()
{
addState(ControllerState.NOT_INSTALLED, null);
addState(ControllerState.PRE_INSTALL, null);
@@ -184,6 +182,9 @@
lockWrite();
try
{
+ if (states.contains(state))
+ return;
+
if (before == null)
{
states.add(state);
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java 2007-06-27 16:09:15 UTC (rev 63688)
@@ -226,4 +226,11 @@
this.resolved = resolved;
flushJBossObjectCache();
}
+
+ public String toHumanReadableString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append("Depends on '").append(getIDependOn());
+ return builder.toString();
+ }
}
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/DependencyItem.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/DependencyItem.java 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/DependencyItem.java 2007-06-27 16:09:15 UTC (rev 63688)
@@ -79,4 +79,11 @@
* @return true if proceed with unresolving, false otherwise
*/
boolean unresolved(Controller controller);
+
+ /**
+ * Return a human readable version of the dependency
+ *
+ * @return the string
+ */
+ String toHumanReadableString();
}
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2007-06-27 16:09:15 UTC (rev 63688)
@@ -182,5 +182,13 @@
{
buffer.append(getName()).append(" demands ").append(demand);
}
+
+ @Override
+ public String toHumanReadableString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append("Demands '").append(getDemand());
+ return builder.toString();
+ }
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CallbackDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CallbackDependencyItem.java 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CallbackDependencyItem.java 2007-06-27 16:09:15 UTC (rev 63688)
@@ -138,4 +138,11 @@
super.toString(buffer);
buffer.append(" cardinality=" + cardinality);
}
+
+ @Override
+ public String toHumanReadableString()
+ {
+ // TODO toHumanReadableString
+ return super.toString();
+ }
}
Modified: projects/microcontainer/trunk/managed/.classpath
===================================================================
--- projects/microcontainer/trunk/managed/.classpath 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/managed/.classpath 2007-06-27 16:09:15 UTC (rev 63688)
@@ -8,7 +8,7 @@
<classpathentry kind="src" path="/jboss-container"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.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/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.4-SNAPSHOT/jboss-test-1.0.4-SNAPSHOT.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.4-SNAPSHOT/jboss-test-1.0.4-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractDependencyMetaData.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractDependencyMetaData.java 2007-06-27 16:00:12 UTC (rev 63687)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractDependencyMetaData.java 2007-06-27 16:09:15 UTC (rev 63688)
@@ -26,7 +26,6 @@
import org.jboss.dependency.plugins.AbstractDependencyItem;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyItem;
-import org.jboss.osgi.plugins.dependency.OSGiServiceReferenceContext;
import org.jboss.osgi.spi.dependency.ServiceControllerContext;
import org.jboss.osgi.spi.metadata.DependencyMetaData;
import org.jboss.osgi.spi.metadata.ServiceMetaDataVisitor;
More information about the jboss-cvs-commits
mailing list