[jboss-cvs] JBossAS SVN: r100255 - in projects/kernel/branches/resolver: .settings and 38 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 2 09:49:51 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-02-02 09:49:47 -0500 (Tue, 02 Feb 2010)
New Revision: 100255
Added:
projects/kernel/branches/resolver/.settings/
projects/kernel/branches/resolver/.settings/org.eclipse.jdt.core.prefs
projects/kernel/branches/resolver/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/aop-mc-int/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/build/.classpath
projects/kernel/branches/resolver/build/.settings/
projects/kernel/branches/resolver/build/.settings/org.eclipse.jdt.core.prefs
projects/kernel/branches/resolver/build/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/dependency/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/DependsOnMeCleanupTestCase.java
projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java
projects/kernel/branches/resolver/guice-int/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/jmx-aop-mc-int/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/jmx-mc-int/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/kernel/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ContextualInjectCleanupTestCase.java
projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java
projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java
projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.java
projects/kernel/branches/resolver/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.xml
projects/kernel/branches/resolver/spring-int/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/weld-int/.settings/org.maven.ide.eclipse.prefs
Removed:
projects/kernel/branches/resolver/.settings/org.eclipse.jdt.core.prefs
projects/kernel/branches/resolver/.settings/org.maven.ide.eclipse.prefs
projects/kernel/branches/resolver/build/.settings/org.eclipse.jdt.core.prefs
projects/kernel/branches/resolver/build/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/kernel/branches/resolver/
projects/kernel/branches/resolver/aop-mc-int/.classpath
projects/kernel/branches/resolver/aop-mc-int/pom.xml
projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java
projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ArrayBinding.java
projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/Aspect.java
projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectBinding.java
projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/DelegatingBeanAspectFactory.java
projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
projects/kernel/branches/resolver/build/.project
projects/kernel/branches/resolver/dependency/.classpath
projects/kernel/branches/resolver/dependency/pom.xml
projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/tracker/AbstractContextRegistry.java
projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java
projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java
projects/kernel/branches/resolver/guice-int/.classpath
projects/kernel/branches/resolver/guice-int/pom.xml
projects/kernel/branches/resolver/jmx-aop-mc-int/.classpath
projects/kernel/branches/resolver/jmx-aop-mc-int/pom.xml
projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerCreateDestroyLifecycleCallback.java
projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java
projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java
projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerStartStopLifecycleCallback.java
projects/kernel/branches/resolver/jmx-mc-int/.classpath
projects/kernel/branches/resolver/jmx-mc-int/pom.xml
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceConfigurator.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceController.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceDeploymentParser.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/CreateDestroyLifecycleAction.java
projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/StartStopLifecycleAction.java
projects/kernel/branches/resolver/kernel/.classpath
projects/kernel/branches/resolver/kernel/pom.xml
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/ContextualInjectionDependencyItem.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/KernelFactory.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AnnotationsAction.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AutowireAction.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/DescribeAction.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/InstantiateAction.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ScopedKernelController.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/event/AbstractEventEmitter.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/LRUPolicyCachingBasicKernelMetaDataRepository.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/TimedPolicyCachingBasicKernelMetaDataRepository.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java
projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java
projects/kernel/branches/resolver/pom.xml
projects/kernel/branches/resolver/spring-int/.classpath
projects/kernel/branches/resolver/spring-int/pom.xml
projects/kernel/branches/resolver/weld-int/.classpath
projects/kernel/branches/resolver/weld-int/pom.xml
Log:
Merged revisions 99452,99454,99486,99683,99855,99939,100006,100039,100041,100066,100073-100075,100083-100084,100090,100119,100160-100162,100164,100214,100247,100252-100253 via svnmerge from
https://svn.jboss.org/repos/jbossas/projects/kernel/trunk
.......
r99452 | kabir.khan at jboss.com | 2010-01-15 11:07:12 +0000 (Fri, 15 Jan 2010) | 1 line
[JBKERNEL-79] Fix OnDemand contexts where dependencies come from a child controller
.......
r99454 | alesj | 2010-01-15 11:21:07 +0000 (Fri, 15 Jan 2010) | 1 line
Simplify a bit.
.......
r99486 | adrian at jboss.org | 2010-01-15 16:24:40 +0000 (Fri, 15 Jan 2010) | 1 line
[JBKERNEL-81] - Upgrade to jbossmx 6.0.0.Beta5
.......
r99683 | alesj | 2010-01-20 22:31:01 +0000 (Wed, 20 Jan 2010) | 1 line
Add new "ignore lifecycle call" test.
.......
r99855 | kabir.khan at jboss.com | 2010-01-24 12:02:52 +0000 (Sun, 24 Jan 2010) | 1 line
[JBKERNEL-82] Clear all dependency items holding a reference to a class
.......
r99939 | alesj | 2010-01-26 15:14:40 +0000 (Tue, 26 Jan 2010) | 1 line
[JBKERNEL-83]; check debug usage --> debugf.
.......
r100006 | kabir.khan at jboss.com | 2010-01-27 18:11:08 +0000 (Wed, 27 Jan 2010) | 2 lines
Change log.warn to debug for the message about not finding the dependsOnMe for an OnDemand context that we are trying to check dependencies for:
.......
r100039 | alesj | 2010-01-28 13:01:38 +0000 (Thu, 28 Jan 2010) | 1 line
[maven-release-plugin] prepare release 2.2.0.Alpha3
.......
r100041 | alesj | 2010-01-28 13:04:10 +0000 (Thu, 28 Jan 2010) | 1 line
[maven-release-plugin] prepare for next development iteration
.......
r100066 | kabir.khan at jboss.com | 2010-01-28 17:44:51 +0000 (Thu, 28 Jan 2010) | 1 line
Get rid of old jboss-dependency.jar in classpath
.......
r100073 | kabir.khan at jboss.com | 2010-01-28 19:21:03 +0000 (Thu, 28 Jan 2010) | 2 lines
[JBKERNEL-85] When checking if an OnDemand context is in use, we should check the current controller and children.
.......
r100074 | kabir.khan at jboss.com | 2010-01-28 19:23:18 +0000 (Thu, 28 Jan 2010) | 1 line
CLeanup
.......
r100075 | kabir.khan at jboss.com | 2010-01-28 19:28:02 +0000 (Thu, 28 Jan 2010) | 1 line
JBKERNEL-85 Use LazySet
.......
r100083 | kabir.khan at jboss.com | 2010-01-28 20:26:13 +0000 (Thu, 28 Jan 2010) | 1 line
[JBKERNEL-84] remove dependsOnMe when a context is installed
.......
r100084 | kabir.khan at jboss.com | 2010-01-28 20:30:50 +0000 (Thu, 28 Jan 2010) | 1 line
[JBKERNEL-84] Avoid IllegalArgumentException in error message for DemandDependencyItem
.......
r100090 | kabir.khan at jboss.com | 2010-01-28 22:19:45 +0000 (Thu, 28 Jan 2010) | 1 line
[JBKERNEL-84] Test that dependsOnMe gets cleared with scoping enabled
.......
r100119 | adrian at jboss.org | 2010-01-29 13:23:27 +0000 (Fri, 29 Jan 2010) | 1 line
Tidyup the eclipse build
.......
r100160 | kabir.khan at jboss.com | 2010-01-30 15:12:33 +0000 (Sat, 30 Jan 2010) | 1 line
[JBKERNEL-86] Clear the injectionValueMetaData in ContextualInjectionDependencyItem
.......
r100161 | kabir.khan at jboss.com | 2010-01-30 15:15:31 +0000 (Sat, 30 Jan 2010) | 1 line
Less verbose logging in clearing dependsOnMe
.......
r100162 | kabir.khan at jboss.com | 2010-01-30 15:22:24 +0000 (Sat, 30 Jan 2010) | 1 line
[maven-release-plugin] prepare release 2.2.0.Alpha4
.......
r100164 | kabir.khan at jboss.com | 2010-01-30 15:23:17 +0000 (Sat, 30 Jan 2010) | 1 line
[maven-release-plugin] prepare for next development iteration
.......
r100214 | kabir.khan at jboss.com | 2010-02-01 16:07:43 +0000 (Mon, 01 Feb 2010) | 1 line
[JBKERNEL-86] Test that ContextualInjectionDependencyItem is cleared
.......
r100247 | kabir.khan at jboss.com | 2010-02-02 12:26:47 +0000 (Tue, 02 Feb 2010) | 1 line
[JBKERNEL-87] Avoid ugly error message when uninstalling ON_DEMAND context with dependencies that need uninstalling
.......
r100252 | kabir.khan at jboss.com | 2010-02-02 13:37:27 +0000 (Tue, 02 Feb 2010) | 1 line
[JBKERNEL-87] Add proper test
.......
r100253 | kabir.khan at jboss.com | 2010-02-02 13:39:30 +0000 (Tue, 02 Feb 2010) | 1 line
cleanup
.......
Property changes on: projects/kernel/branches/resolver
___________________________________________________________________
Name: svnmerge-integrated
- /projects/kernel/trunk:1-99451
+ /projects/kernel/trunk:1-100253
Copied: projects/kernel/branches/resolver/.settings (from rev 100253, projects/kernel/trunk/.settings)
Deleted: projects/kernel/branches/resolver/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/kernel/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-02 13:39:30 UTC (rev 100253)
+++ projects/kernel/branches/resolver/.settings/org.eclipse.jdt.core.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,5 +0,0 @@
-#Fri Jan 29 14:10:35 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Copied: projects/kernel/branches/resolver/.settings/org.eclipse.jdt.core.prefs (from rev 100253, projects/kernel/trunk/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- projects/kernel/branches/resolver/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/kernel/branches/resolver/.settings/org.eclipse.jdt.core.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,5 @@
+#Fri Jan 29 14:10:35 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Deleted: projects/kernel/branches/resolver/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/kernel/trunk/.settings/org.maven.ide.eclipse.prefs 2010-02-02 13:39:30 UTC (rev 100253)
+++ projects/kernel/branches/resolver/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,9 +0,0 @@
-#Fri Jan 29 14:10:26 CET 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
Copied: projects/kernel/branches/resolver/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:26 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/aop-mc-int/.classpath
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/.classpath 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/aop-mc-int/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: projects/kernel/branches/resolver/aop-mc-int/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/aop-mc-int/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/aop-mc-int/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:28 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/aop-mc-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/aop-mc-int/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,693 +1,699 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
- - AOP Integration module.
- - This modules includes 4 different test configurations: weave, no-weave, weave-secure, and no-weave-secure
- - By default, none of the configurations will run. A single test configuration can be called using the
- - appropriate profile:
- - mvn -Ptests-weave-secure install
- -
- - All four surefire test configurations can be run using the property aop.tests.all
- - mvn -Daop.tests.all install
- -
- - Individual tests can be run by activating the appropriate profiles, then specifying the tests to run
- - mvn -Ptests-weave,tests-no-weave-secure -Dtest=TypeDefAopTestCase install
- -->
- <parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-mc-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer AOP MC INT</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/impl.xml</descriptor>
- <descriptor>src/assembly/aspects.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>weave</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>org/jboss/test/microcontainer/asynchronous/test/**</exclude>
- </excludes>
- <useSystemClassLoader>true</useSystemClassLoader>
- <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
- <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
- <systemProperties>
- <property>
- <name>jboss.aop.exclude</name>
- <value>org.jboss.,org.apache.</value>
- </property>
- <property>
- <name>jboss.aop.include</name>
- <value>org.jboss.test.</value>
- </property>
- <property>
- <name>jboss-junit-configuration</name>
- <value>weave</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>target/log</value>
- </property>
- <property>
- <name>jboss.aop.verbose</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>weave-secure</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <reportsDirectory>${project.build.directory}/surefire-reports/weave-secure</reportsDirectory>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>org/jboss/test/microcontainer/asynchronous/test/**</exclude>
- </excludes>
- <useSystemClassLoader>true</useSystemClassLoader>
- <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
- <systemProperties>
- <property>
- <name>jboss.aop.exclude</name>
- <value>org.jboss.,org.apache.</value>
- </property>
- <property>
- <name>jboss.aop.include</name>
- <value>org.jboss.test.</value>
- </property>
- <property>
- <name>jboss-junit-configuration</name>
- <value>weave</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>target/log</value>
- </property>
- <property>
- <name>jboss.mc.secure</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>no-weave</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <reportsDirectory>${project.build.directory}/surefire-reports/no-weave</reportsDirectory>
- <includes>
- <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
- <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
- <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>jboss-junit-configuration</name>
- <value>no_weave</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>target/log</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>no-weave-secure</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <reportsDirectory>${project.build.directory}/surefire-reports/no-weave-secure</reportsDirectory>
- <includes>
- <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
- <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
- <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>jboss-junit-configuration</name>
- <value>no_weave</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>target/log</value>
- </property>
- <property>
- <name>jboss.mc.secure</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <forkMode>always</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <skip>true</skip>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>run-asynchronous-tests</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>test</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <property name="byteman.path" value="${maven.dependency.org.jboss.byteman.byteman.jar.path}" />
- <property name="report.dir" value="${project.build.directory}/surefire-reports" />
- <property name="testOutputDirectory" value="${project.build.testOutputDirectory}" />
-
- <!--ant antfile="${project.build.testOutputDirectory}/build.xml" inheritrefs="true">
- <target name="asynchronous-tests" />
- </ant-->
- </tasks>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-container</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.byteman</groupId>
- <artifactId>byteman</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>tests-weave</id>
- <activation>
- <property>
- <name>aop.tests.all</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>weave</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
- <outputName>surefire-report-weave</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tests-weave-secure</id>
- <activation>
- <property>
- <name>aop.tests.all</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>weave-secure</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/weave-secure</reportsDirectory>
- <outputName>surefire-report-weave-secure</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tests-no-weave</id>
- <activation>
- <property>
- <name>aop.tests.all</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>no-weave</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/no-weave</reportsDirectory>
- <outputName>surefire-report-no-weave</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tests-no-weave-secure</id>
- <activation>
- <property>
- <name>aop.tests.all</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>no-weave-secure</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/no-weave-secure</reportsDirectory>
- <outputName>surefire-report-no-weave-secure</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ant-tests-weave</id>
- <activation>
- <property>
- <name>ant-tests-weave</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>ant-tests-weave</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <property name="plugin_classpath" refid="maven.plugin.classpath" />
- <echo message="plugin classpath: ${plugin_classpath}" />
- <mkdir dir="${project.build.directory}/surefire-reports/ant-weave" />
- <property name="build.testlog" value="${project.build.directory}/log" />
- <mkdir dir="${build.testlog}" />
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log" />
- <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
-
- <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
- <sysproperty key="jboss.aop.include" value="org.jboss.test." />
- <sysproperty key="jboss-junit-configuration" value="weave" />
- <sysproperty key="build.testlog" value="${build.testlog}" />
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
-
- <classpath>
- <path refid="maven.test.classpath" />
- </classpath>
-
- <formatter type="plain" usefile="true" extension=".txt" />
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
-
- <batchtest todir="${project.build.directory}/surefire-reports/ant-weave" haltonerror="false" haltonfailure="false" fork="true">
-
- <fileset dir="${project.build.directory}/test-classes">
- <include name="org/jboss/test/**/*TestCase.class" />
- <exclude name="org/jboss/test/microcontainer/asynchronous/test/**" />
- </fileset>
- </batchtest>
- </junit>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave</reportsDirectory>
- <outputName>surefire-report-ant-weave</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ant-one-test-weave</id>
- <activation>
- <property>
- <name>ant-one-test-weave</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>ant-one-test-weave</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <property name="plugin_classpath" refid="maven.plugin.classpath" />
- <echo message="plugin classpath: ${plugin_classpath}" />
- <mkdir dir="${project.build.directory}/surefire-reports/ant-one-weave" />
- <property name="build.testlog" value="${project.build.directory}/log" />
- <mkdir dir="${build.testlog}" />
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log" />
- <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
-
- <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
- <sysproperty key="jboss.aop.include" value="org.jboss.test." />
- <sysproperty key="jboss-junit-configuration" value="weave" />
- <sysproperty key="build.testlog" value="${build.testlog}" />
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
-
- <classpath>
- <path refid="maven.test.classpath" />
- </classpath>
-
- <formatter type="plain" usefile="true" extension=".txt" />
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
-
- <test todir="${project.build.directory}/surefire-reports/ant-one-weave" name="${test}" haltonerror="false" haltonfailure="false" fork="true" />
-
- </junit>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave</reportsDirectory>
- <outputName>surefire-report-ant-weave</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ant-tests-weave-secure</id>
- <activation>
- <property>
- <name>ant-tests-weave-secure</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>ant-tests-weave-secure</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.directory}/surefire-reports/ant-weave-secure" />
- <property name="build.testlog" value="${project.build.directory}/log" />
- <mkdir dir="${build.testlog}" />
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log" />
- <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
-
- <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
- <sysproperty key="jboss.aop.include" value="org.jboss.test." />
- <sysproperty key="jboss-junit-configuration" value="weave-secure" />
- <sysproperty key="build.testlog" value="${build.testlog}" />
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
- <sysproperty key="jboss.mc.secure" value="true" />
-
- <classpath>
- <path refid="maven.test.classpath" />
- </classpath>
-
- <formatter type="plain" usefile="true" extension=".txt" />
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
-
- <batchtest todir="${project.build.directory}/surefire-reports/ant-weave-secure" haltonerror="false" haltonfailure="false" fork="true">
-
- <fileset dir="${project.build.directory}/test-classes">
- <include name="org/jboss/test/**/*TestCase.class" />
- <exclude name="org/jboss/test/microcontainer/asynchronous/test/**" />
- </fileset>
- </batchtest>
- </junit>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave-secure</reportsDirectory>
- <outputName>surefire-report-ant-weave-secure</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ - AOP Integration module.
+ - This modules includes 4 different test configurations: weave, no-weave, weave-secure, and no-weave-secure
+ - By default, none of the configurations will run. A single test configuration can be called using the
+ - appropriate profile:
+ - mvn -Ptests-weave-secure install
+ -
+ - All four surefire test configurations can be run using the property aop.tests.all
+ - mvn -Daop.tests.all install
+ -
+ - Individual tests can be run by activating the appropriate profiles, then specifying the tests to run
+ - mvn -Ptests-weave,tests-no-weave-secure -Dtest=TypeDefAopTestCase install
+ -->
+ <parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer AOP MC INT</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/impl.xml</descriptor>
+ <descriptor>src/assembly/aspects.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>weave</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ <excludes>
+ <exclude>org/jboss/test/microcontainer/asynchronous/test/**</exclude>
+ </excludes>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
+ <systemProperties>
+ <property>
+ <name>jboss.aop.exclude</name>
+ <value>org.jboss.,org.apache.</value>
+ </property>
+ <property>
+ <name>jboss.aop.include</name>
+ <value>org.jboss.test.</value>
+ </property>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ <property>
+ <name>jboss.aop.verbose</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weave-secure</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave-secure</reportsDirectory>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ <excludes>
+ <exclude>org/jboss/test/microcontainer/asynchronous/test/**</exclude>
+ </excludes>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
+ <systemProperties>
+ <property>
+ <name>jboss.aop.exclude</name>
+ <value>org.jboss.,org.apache.</value>
+ </property>
+ <property>
+ <name>jboss.aop.include</name>
+ <value>org.jboss.test.</value>
+ </property>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ <property>
+ <name>jboss.mc.secure</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
+ <id>no-weave</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports/no-weave</reportsDirectory>
+ <includes>
+ <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
+ <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
+ <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>no_weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
+ <id>no-weave-secure</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports/no-weave-secure</reportsDirectory>
+ <includes>
+ <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
+ <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
+ <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>no_weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ <property>
+ <name>jboss.mc.secure</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <forkMode>always</forkMode>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <skip>true</skip>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>run-asynchronous-tests</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>test</phase>
+ <configuration>
+ <tasks unless="maven.test.skip">
+ <property name="byteman.path" value="${maven.dependency.org.jboss.byteman.byteman.jar.path}" />
+ <property name="report.dir" value="${project.build.directory}/surefire-reports" />
+ <property name="testOutputDirectory" value="${project.build.testOutputDirectory}" />
+
+ <!--ant antfile="${project.build.testOutputDirectory}/build.xml" inheritrefs="true">
+ <target name="asynchronous-tests" />
+ </ant-->
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>tests-weave</id>
+ <activation>
+ <property>
+ <name>aop.tests.all</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>weave</id>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
+ <outputName>surefire-report-weave</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tests-weave-secure</id>
+ <activation>
+ <property>
+ <name>aop.tests.all</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>weave-secure</id>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave-secure</reportsDirectory>
+ <outputName>surefire-report-weave-secure</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tests-no-weave</id>
+ <activation>
+ <property>
+ <name>aop.tests.all</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>no-weave</id>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/no-weave</reportsDirectory>
+ <outputName>surefire-report-no-weave</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tests-no-weave-secure</id>
+ <activation>
+ <property>
+ <name>aop.tests.all</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>no-weave-secure</id>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/no-weave-secure</reportsDirectory>
+ <outputName>surefire-report-no-weave-secure</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ant-tests-weave</id>
+ <activation>
+ <property>
+ <name>ant-tests-weave</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>ant-tests-weave</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <echo message="plugin classpath: ${plugin_classpath}" />
+ <mkdir dir="${project.build.directory}/surefire-reports/ant-weave" />
+ <property name="build.testlog" value="${project.build.directory}/log" />
+ <mkdir dir="${build.testlog}" />
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log" />
+ <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
+ <sysproperty key="jboss.aop.include" value="org.jboss.test." />
+ <sysproperty key="jboss-junit-configuration" value="weave" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
+
+ <classpath>
+ <path refid="maven.test.classpath" />
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension=".txt" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
+
+ <batchtest todir="${project.build.directory}/surefire-reports/ant-weave" haltonerror="false" haltonfailure="false" fork="true">
+
+ <fileset dir="${project.build.directory}/test-classes">
+ <include name="org/jboss/test/**/*TestCase.class" />
+ <exclude name="org/jboss/test/microcontainer/asynchronous/test/**" />
+ </fileset>
+ </batchtest>
+ </junit>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave</reportsDirectory>
+ <outputName>surefire-report-ant-weave</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ant-one-test-weave</id>
+ <activation>
+ <property>
+ <name>ant-one-test-weave</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>ant-one-test-weave</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <echo message="plugin classpath: ${plugin_classpath}" />
+ <mkdir dir="${project.build.directory}/surefire-reports/ant-one-weave" />
+ <property name="build.testlog" value="${project.build.directory}/log" />
+ <mkdir dir="${build.testlog}" />
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log" />
+ <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
+ <sysproperty key="jboss.aop.include" value="org.jboss.test." />
+ <sysproperty key="jboss-junit-configuration" value="weave" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
+
+ <classpath>
+ <path refid="maven.test.classpath" />
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension=".txt" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
+
+ <test todir="${project.build.directory}/surefire-reports/ant-one-weave" name="${test}" haltonerror="false" haltonfailure="false" fork="true" />
+
+ </junit>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave</reportsDirectory>
+ <outputName>surefire-report-ant-weave</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ant-tests-weave-secure</id>
+ <activation>
+ <property>
+ <name>ant-tests-weave-secure</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ant-tests-weave-secure</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.directory}/surefire-reports/ant-weave-secure" />
+ <property name="build.testlog" value="${project.build.directory}/log" />
+ <mkdir dir="${build.testlog}" />
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log" />
+ <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
+ <sysproperty key="jboss.aop.include" value="org.jboss.test." />
+ <sysproperty key="jboss-junit-configuration" value="weave-secure" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
+ <sysproperty key="jboss.mc.secure" value="true" />
+
+ <classpath>
+ <path refid="maven.test.classpath" />
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension=".txt" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
+
+ <batchtest todir="${project.build.directory}/surefire-reports/ant-weave-secure" haltonerror="false" haltonfailure="false" fork="true">
+
+ <fileset dir="${project.build.directory}/test-classes">
+ <include name="org/jboss/test/**/*TestCase.class" />
+ <exclude name="org/jboss/test/microcontainer/asynchronous/test/**" />
+ </fileset>
+ </batchtest>
+ </junit>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave-secure</reportsDirectory>
+ <outputName>surefire-report-ant-weave-secure</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Modified: projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -60,7 +60,7 @@
}
Object mbean = (registerDirectly ? context.getTarget() : new StandardMBean(context.getTarget(), intfClass));
server.registerMBean(mbean, objectName);
- log.debug("Registered MBean " + objectName);
+ log.debugf("Registered MBean %1s", objectName);
}
public void uninstall(ControllerContext context) throws Exception
@@ -69,7 +69,7 @@
JMX jmx = readJmxAnnotation(context);
ObjectName objectName = createObjectName(context, jmx);
- log.debug("Unregistering MBean " + objectName);
+ log.debugf("Unregistering MBean %1s", objectName);
server.unregisterMBean(objectName);
}
Modified: projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ArrayBinding.java
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -116,7 +116,7 @@
InterceptorFactory[] facs = interceptors != null ? interceptors.toArray(new InterceptorFactory[interceptors.size()]) : new InterceptorFactory[0];
org.jboss.aop.array.ArrayBinding binding = new org.jboss.aop.array.ArrayBinding(name, facs, theType);
manager.addArrayBinding(binding);
- log.debug("Bound array binding " + name);
+ log.debugf("Bound array binding %1s", name);
}
public void stop() throws Exception
Modified: projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/Aspect.java
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/Aspect.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/Aspect.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -276,7 +276,7 @@
binding.rebind();
}
- log.debug("Bound aspect " + name + "; deployed:" + definition.isDeployed());
+ log.debugf("Bound aspect %1s; deployed:%2s", name, definition.isDeployed());
}
protected ManagedAspectDefinition getAspectDefinitionNoDependencies()
@@ -306,7 +306,7 @@
public void stop()
{
- log.debug("Unbinding aspect " + name);
+ log.debugf("Unbinding aspect %1s", name);
manager.removeAspectDefinition(name);
if (definition != null)
{
Modified: projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectBinding.java
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectBinding.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectBinding.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -144,7 +144,7 @@
}
}
manager.addBinding(binding);
- log.debug("Bound binding " + name);
+ log.debugf("Bound binding %1s", name);
}
public void stop() throws Exception
Modified: projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/DelegatingBeanAspectFactory.java
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/DelegatingBeanAspectFactory.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/DelegatingBeanAspectFactory.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -120,7 +120,7 @@
{
if (aspectFactory == null)
{
- log.debug("Creating advice " + name);
+ log.debugf("Creating advice %1s", name);
PushedClassLoaderMetaData pcmd = null;
if (((GenericBeanFactory)factory).getClassLoader() == null)
Modified: projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
===================================================================
--- projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -127,7 +127,7 @@
try
{
final ClassLoader loader = getCreatingClassLoader(advisor);
- log.debug("Creating advice " + name + " with loader " + loader);
+ log.debugf("Creating advice %1s with loader %2s", name, loader);
if (factory instanceof ClassLoaderAwareGenericBeanFactory)
{
((ClassLoaderAwareGenericBeanFactory)factory).pushLoader(loader);
Copied: projects/kernel/branches/resolver/build/.classpath (from rev 100253, projects/kernel/trunk/build/.classpath)
===================================================================
--- projects/kernel/branches/resolver/build/.classpath (rev 0)
+++ projects/kernel/branches/resolver/build/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/kernel/branches/resolver/build/.project
===================================================================
--- projects/kernel/branches/resolver/build/.project 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/build/.project 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,11 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>build</name>
+ <name>kernel-dist</name>
<comment></comment>
<projects>
</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.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Copied: projects/kernel/branches/resolver/build/.settings (from rev 100253, projects/kernel/trunk/build/.settings)
Deleted: projects/kernel/branches/resolver/build/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/kernel/trunk/build/.settings/org.eclipse.jdt.core.prefs 2010-02-02 13:39:30 UTC (rev 100253)
+++ projects/kernel/branches/resolver/build/.settings/org.eclipse.jdt.core.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,5 +0,0 @@
-#Fri Jan 29 14:10:39 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Copied: projects/kernel/branches/resolver/build/.settings/org.eclipse.jdt.core.prefs (from rev 100253, projects/kernel/trunk/build/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- projects/kernel/branches/resolver/build/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/kernel/branches/resolver/build/.settings/org.eclipse.jdt.core.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,5 @@
+#Fri Jan 29 14:10:39 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Deleted: projects/kernel/branches/resolver/build/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/kernel/trunk/build/.settings/org.maven.ide.eclipse.prefs 2010-02-02 13:39:30 UTC (rev 100253)
+++ projects/kernel/branches/resolver/build/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,9 +0,0 @@
-#Fri Jan 29 14:10:28 CET 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
Copied: projects/kernel/branches/resolver/build/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/build/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/build/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/build/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:28 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/dependency/.classpath
===================================================================
--- projects/kernel/branches/resolver/dependency/.classpath 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/dependency/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: projects/kernel/branches/resolver/dependency/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/dependency/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/dependency/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/dependency/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:27 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/dependency/pom.xml
===================================================================
--- projects/kernel/branches/resolver/dependency/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/dependency/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,84 +1,84 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-dependency</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Dependency</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Dependency</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/kernel/trunk/dependency</connection>
- <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/kernel/trunk/dependency</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/kernel/trunk/dependency</url>
- </scm>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/spi.xml</descriptor>
- <descriptor>src/assembly/plugins.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/AbstractDependencyTest*</exclude>
- <exclude>**/TestControllerContext*</exclude>
- <exclude>**/TestDelegate*</exclude>
- </excludes>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-dependency</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Dependency</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Dependency</description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/kernel/trunk/dependency</connection>
+ <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/kernel/trunk/dependency</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/kernel/trunk/dependency</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/spi.xml</descriptor>
+ <descriptor>src/assembly/plugins.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/AbstractDependencyTest*</exclude>
+ <exclude>**/TestControllerContext*</exclude>
+ <exclude>**/TestDelegate*</exclude>
+ </excludes>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -911,6 +911,7 @@
*/
protected void enableOnDemand(ControllerContext context, boolean trace) throws Throwable
{
+ Controller controller = null;
lockWrite();
try
{
@@ -1208,6 +1209,7 @@
if (stateModel.isBeforeState(dependent.getState(), whenRequired) == false)
{
uninstallContext(dependent, whenRequired, trace);
+ dependencies.removeDependsOnMe(item);
}
}
}
@@ -1217,6 +1219,51 @@
}
}
}
+
+ Set<DependencyItem> iDependOn = dependencies.getIDependOn(null);
+ if (iDependOn.isEmpty() == false)
+ {
+ for (DependencyItem item : iDependOn)
+ {
+ if (item.isResolved())
+ {
+ ControllerState whenRequired = item.getWhenRequired();
+ if (whenRequired == null || whenRequired.equals(fromState))
+ {
+ if (item.unresolved(this))
+ {
+ try
+ {
+ //FIXME DemandDependencyItems have a null iDependOn
+ if (item.getIDependOn() == null)
+ {
+ log.debug("Null iDependOn for " + item);
+ }
+ else
+ {
+ ControllerContext dependency = getContext(item.getIDependOn(), item.getDependentState());
+ if (dependency != null)
+ {
+ DependencyInfo info = dependency.getDependencyInfo();
+ if (info != null)
+ {
+ info.removeDependsOnMe(item);
+ }
+ }
+ }
+ }
+ catch(RuntimeException e)
+ {
+ if (trace)
+ log.warn("Problem finding dependency for " + item, e);
+ else
+ log.warn("Problem finding dependency for " + item);
+ }
+ }
+ }
+ }
+ }
+ }
}
catch (Throwable error)
{
@@ -1287,52 +1334,70 @@
{
for (DependencyItem item : iDependOn)
{
- if (item.isResolved()) //TODO Is this check necessary
+ Object name = item.getIDependOn();
+ if (name == null)
+ continue;
+
+ ControllerContext other = getContext(name, null);
+ if (other == null)
{
- Object name = item.getIDependOn();
- if (name == null)
- continue;
-
- ControllerContext other = getContext(name, null);
- if (other == null)
- {
- log.warn("Could not find dependency '" + name + "' while uninstalling on demand contexts for " + item);
- continue;
- }
- if (other.getMode() != ControllerMode.ON_DEMAND)
- continue;
-
- DependencyInfo otherDependencies = other.getDependencyInfo();
- if (otherDependencies == null)
- continue;
+ log.debug("Could not find dependency '" + name + "' while uninstalling on demand contexts for " + item);
+ continue;
+ }
+ if (other.getMode() != ControllerMode.ON_DEMAND)
+ continue;
+
+ //Avoid ugly error thrown by uninstallContext(ControllerContext, boolean) if uninstalling an ON_DEMAND context, which triggers uninstall
+ //of contexts dependent on it, which in turn ends up checking the ON_DEMAND context which no longer exists in the original state
+ Set<ControllerContext> fromContexts = other.getController().getContextsByState(other.getState());
+ if (fromContexts.contains(other) == false)
+ {
+ if (trace)
+ log.trace("Could not find ON_DEMAND context " + other.getName() + " in " + other.getState() + " it is probably being uninstalled");
+ continue;
+ }
+
+ DependencyInfo otherDependencies = other.getDependencyInfo();
+ if (otherDependencies == null)
+ continue;
+
+ Set<DependencyItem> dependsOnOther = otherDependencies.getDependsOnMe(null);
+ boolean isRequired = false;
+ for (DependencyItem dependsOnOtherItem : dependsOnOther)
+ {
+ Set<ControllerContext> dependsContexts = CollectionsFactory.createLazySet();
+ getContexts(dependsOnOtherItem.getName(), dependsContexts);
- Set<DependencyItem> dependsOnOther = otherDependencies.getDependsOnMe(null);
- boolean isRequired = false;
- for (DependencyItem dependsOnOtherItem : dependsOnOther)
+ if (!dependsContexts.isEmpty())
{
- ControllerContext dependsContext = getContext(dependsOnOtherItem.getName(), null);
- if (dependsContext == null)
+ for (ControllerContext dependsContext : dependsContexts)
{
- log.warn("Could not find reverse dependency '" + dependsOnOtherItem.getName() + "' while uninstalling on demand contexts for " + item);
- continue;
- }
+ if (dependsContext == null)
+ {
+ log.debug("Could not find reverse dependency '" + dependsOnOtherItem.getName() + "' while uninstalling on demand contexts for " + item);
+ continue;
+ }
- ControllerState requiredState = item.getWhenRequired();
- ControllerState actualState = dependsContext.getState();
-
- if (requiredState.equals(actualState) || stateModel.isBeforeState(requiredState, actualState))
- {
- isRequired = true;
- break;
+ ControllerState requiredState = item.getWhenRequired();
+ ControllerState actualState = dependsContext.getState();
+
+ if (requiredState.equals(actualState) || stateModel.isBeforeState(requiredState, actualState))
+ {
+ isRequired = true;
+ break;
+ }
}
}
- if (!isRequired)
- {
- //For some reason uninstallContext() uninstalls to the state below the passed in one, add one
- ControllerState state = stateModel.getNextState(ControllerMode.ON_DEMAND.getRequiredState());
- uninstallContext(other, state, trace);
- }
+
+ if (isRequired)
+ break;
}
+ if (!isRequired)
+ {
+ //For some reason uninstallContext() uninstalls to the state below the passed in one, add one
+ ControllerState state = stateModel.getNextState(ControllerMode.ON_DEMAND.getRequiredState());
+ uninstallContext(other, state, trace);
+ }
}
}
}
@@ -1343,6 +1408,8 @@
}
}
+
+
/**
* Get all contexts by name,
* check child controllers as well.
@@ -1804,7 +1871,7 @@
}
catch (Throwable ignored)
{
- log.debug("Error unregistering alias: " + alias, ignored);
+ log.debugf(ignored, "Error unregistering alias: %1s", alias);
}
}
@@ -1815,7 +1882,7 @@
}
catch (Throwable ignored)
{
- log.debug("Error unregistering context with name: " + name, ignored);
+ log.debugf(ignored, "Error unregistering context with name: %1s", name);
}
}
}
@@ -1853,7 +1920,7 @@
}
catch (Throwable ignored)
{
- log.debug("Error unregistering alias: " + alias, ignored);
+ log.debugf(ignored, "Error unregistering alias: %1s", alias);
}
}
}
Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/tracker/AbstractContextRegistry.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/tracker/AbstractContextRegistry.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/tracker/AbstractContextRegistry.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -300,7 +300,7 @@
}
else if (classContext.used)
{
- log.debug("Additional matching bean - contextual injection already used for class: " + clazz);
+ log.debugf("Additional matching bean - contextual injection already used for class: %1s", clazz);
}
if (trace)
{
Modified: projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -56,10 +56,12 @@
suite.addTest(CrossContextDependencyBadObjectName2TestCase.suite());
suite.addTest(CrossContextDependencyBadObjectNameTestCase.suite());
suite.addTest(CrossContextDependencyTestCase.suite());
+ suite.addTest(DependsOnMeCleanupTestCase.suite());
suite.addTest(DisabledControllerTestCase.suite());
suite.addTest(ErrorControllerActionTestCase.suite());
suite.addTest(ManualControllerTestCase.suite());
suite.addTest(OnDemandDependencyTestCase.suite());
+ suite.addTest(OnDemandDependencyUninstallTestCase.suite());
suite.addTest(PreconfiguredScopeTestCase.suite());
suite.addTest(RecursiveControllerActionTestCase.suite());
suite.addTest(SelfDependencyTestCase.suite());
Copied: projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/DependsOnMeCleanupTestCase.java (from rev 100253, projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/DependsOnMeCleanupTestCase.java)
===================================================================
--- projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/DependsOnMeCleanupTestCase.java (rev 0)
+++ projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/DependsOnMeCleanupTestCase.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,190 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.dependency.controller.test;
+
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.test.dependency.controller.support.TestDelegate;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class DependsOnMeCleanupTestCase extends AbstractDependencyTest
+{
+ public DependsOnMeCleanupTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(DependsOnMeCleanupTestCase.class);
+ }
+
+ public void testDependsOnMeSimple() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(getDelegate1());
+ assertNoDependsOnMe(context1);
+
+ installContext2();
+ assertDependsOnMe(context1, "Name2");
+ }
+
+ public void testDependsOnMeUninstallDependency() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(getDelegate1());
+ assertNoDependsOnMe(context1);
+
+ installContext2();
+ assertDependsOnMe(context1, "Name2");
+
+ uninstall(context1);
+ assertNoDependsOnMe(context1);
+
+ }
+
+ public void testDependsOnMeReinstallDependency() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(getDelegate1());
+ assertNoDependsOnMe(context1);
+
+ installContext2();
+ assertDependsOnMe(context1, "Name2");
+
+ uninstall(context1);
+ assertNoDependsOnMe(context1);
+
+ context1 = assertInstall(getDelegate1());
+ assertDependsOnMe(context1, "Name2");
+ }
+
+ public void testDependsOnMeChangeDependency() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(getDelegate1());
+ assertNoDependsOnMe(context1);
+
+ installContext2();
+ assertDependsOnMe(context1, "Name2");
+
+ controller.change(context1, ControllerState.START);
+ assertNoDependsOnMe(context1);
+ controller.change(context1, ControllerState.INSTALLED);
+ assertDependsOnMe(context1, "Name2");
+ }
+
+ public void testDependsOnMeUninstallDependent() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(getDelegate1());
+ assertNoDependsOnMe(context1);
+
+ ControllerContext context2 = installContext2();
+ assertDependsOnMe(context1, "Name2");
+
+ uninstall(context2);
+ assertNoDependsOnMe(context1);
+ }
+
+ public void testDependsOnMeReinstallDependent() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(getDelegate1());
+ assertNoDependsOnMe(context1);
+
+ ControllerContext context2 = installContext2();
+ assertDependsOnMe(context1, "Name2");
+
+ uninstall(context2);
+ assertNoDependsOnMe(context1);
+
+ context2 = installContext2();
+ assertDependsOnMe(context1, "Name2");
+ }
+
+ public void testDependsOnMeChangeDependent() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(getDelegate1());
+ assertNoDependsOnMe(context1);
+
+ ControllerContext context2 = installContext2();
+ assertDependsOnMe(context1, "Name2");
+
+ controller.change(context2, ControllerState.PRE_INSTALL);
+ assertNoDependsOnMe(context1);
+ controller.change(context2, ControllerState.DESCRIBED);
+ }
+
+ private ControllerContext installContext2() throws Throwable
+ {
+ TestDelegate delegate2 = getDelegate2();
+ ControllerContext context2 = assertInstall(delegate2);
+ assertNoDependsOnMe(context2);
+ return context2;
+ }
+
+
+ private void assertNoDependsOnMe(ControllerContext context)
+ {
+ if (context.getDependencyInfo() == null)
+ return;
+ assertTrue(context.getDependencyInfo().getDependsOnMe(null) == null || context.getDependencyInfo().getDependsOnMe(null).size() == 0);
+ }
+
+ private void assertDependsOnMe(ControllerContext context, Object...names)
+ {
+ assertNotNull(context.getDependencyInfo());
+ Set<DependencyItem> items = context.getDependencyInfo().getDependsOnMe(null);
+ for (Object name : names)
+ {
+ boolean found = false;
+ for (DependencyItem item : items)
+ {
+ if (item.getName().equals(name))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ fail("Could not find '" + name + "' in dependencies");
+ }
+ }
+
+ protected TestDelegate getDelegate1()
+ {
+ return new TestDelegate("Name1");
+ }
+
+ protected TestDelegate getDelegate2()
+ {
+ TestDelegate result = new TestDelegate("Name2");
+ result.addDependency(new AbstractDependencyItem("Name2", "Name1", ControllerState.DESCRIBED, ControllerState.INSTALLED));
+ return result;
+ }
+
+}
Modified: projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -151,7 +151,7 @@
assertEquals(-1, delegate2.describeUninstallOrder);
}
- public void testChangeDependencyReinstall() throws Throwable
+ public void testOnDemandDependencyReinstall() throws Throwable
{
TestDelegate delegate1 = getDelegate1();
ControllerContext context1 = assertInstall(delegate1, ControllerState.DESCRIBED);
@@ -371,7 +371,6 @@
fail("Should have had a failure");
}
-
/**
* When installing 2 contexts as a result of resolving their dependencies or uninstalling
* 2 contexts as a result of undeploying their dependencies we cannot count on the order the 2 contexts are
Copied: projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java (from rev 100253, projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java)
===================================================================
--- projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java (rev 0)
+++ projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,547 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.dependency.controller.test;
+
+import java.lang.reflect.Field;
+
+import junit.framework.Test;
+
+import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.logging.Logger;
+import org.jboss.logging.LoggerPlugin;
+import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.dependency.controller.support.TestDelegate;
+
+/**
+ * A OnDemandDependencyTestCase.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 100247 $
+ */
+public class OnDemandDependencyUninstallTestCase extends AbstractDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(OnDemandDependencyUninstallTestCase.class);
+ }
+
+ public OnDemandDependencyUninstallTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testNoUglyError() throws Throwable
+ {
+ Field logField = getLoggerField();
+ Logger old = (Logger) logField.get(controller);
+ LoggerDecorator newLogger = new LoggerDecorator(old);
+ try
+ {
+ logField.set(controller, newLogger);
+ TestDelegate delegate1 = getDelegate1();
+ ControllerContext context1 = assertInstall(delegate1, ControllerState.DESCRIBED);
+
+ TestDelegate delegate2 = getDelegate2();
+ ControllerContext context2 = assertInstall(delegate2);
+
+ assertContext(context1);
+
+ assertUninstall(context1);
+
+ assertContext(context2, ControllerState.CONFIGURED);
+ assertNull(context2.getError());
+ assertNull(context1.getError());
+
+ assertFalse(newLogger.warnErrorCalled);
+ }
+ finally
+ {
+ logField.set(controller, old);
+ }
+ }
+
+ private Field getLoggerField()
+ {
+ Class<?> clazz = controller.getClass();
+ Field field = null;
+
+ while (field == null && clazz != null)
+ {
+ try
+ {
+ field = clazz.getDeclaredField("log");
+ field.setAccessible(true);
+ break;
+ }
+ catch (Exception e)
+ {
+ }
+ clazz = clazz.getSuperclass();
+ }
+
+ assertNotNull(field);
+ return field;
+ }
+
+ protected TestDelegate getDelegate1()
+ {
+ TestDelegate result = new TestDelegate("Name1");
+ result.setMode(ControllerMode.ON_DEMAND);
+ return result;
+ }
+
+ protected TestDelegate getDelegate2()
+ {
+ TestDelegate result = new TestDelegate("Name2");
+ result.addDependency(new AbstractDependencyItem("Name2", "Name1", ControllerState.CREATE, ControllerState.INSTALLED));
+ return result;
+ }
+
+ protected TestDelegate getDelegate3()
+ {
+ TestDelegate result = new TestDelegate("Name3");
+ result.addDependency(new AbstractDependencyItem("Name3", "Name1", ControllerState.CREATE, ControllerState.INSTALLED));
+ return result;
+ }
+
+ static class LoggerDecorator extends Logger
+ {
+ Logger delegate;
+ boolean warnErrorCalled;
+
+ protected LoggerDecorator(Logger delegate)
+ {
+ // FIXME LoggerDecorator constructor
+ super(delegate.getName());
+ this.delegate = delegate;
+ }
+
+ /**
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#debug(java.lang.Object, java.lang.Throwable)
+ */
+ public void debug(Object message, Throwable t)
+ {
+ delegate.debug(message, t);
+ }
+
+ /**
+ * @param message
+ * @see org.jboss.logging.Logger#debug(java.lang.Object)
+ */
+ public void debug(Object message)
+ {
+ delegate.debug(message);
+ }
+
+ /**
+ * @param loggerFqcn
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#debug(java.lang.String, java.lang.Object, java.lang.Throwable)
+ */
+ public void debug(String loggerFqcn, Object message, Throwable t)
+ {
+ delegate.debug(loggerFqcn, message, t);
+ }
+
+ /**
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#debugf(java.lang.String, java.lang.Object[])
+ */
+ public void debugf(String format, Object... params)
+ {
+ delegate.debugf(format, params);
+ }
+
+ /**
+ * @param t
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#debugf(java.lang.Throwable, java.lang.String, java.lang.Object[])
+ */
+ public void debugf(Throwable t, String format, Object... params)
+ {
+ delegate.debugf(t, format, params);
+ }
+
+ /**
+ * @param obj
+ * @return
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ public boolean equals(Object obj)
+ {
+ return delegate.equals(obj);
+ }
+
+ /**
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#error(java.lang.Object, java.lang.Throwable)
+ */
+ public void error(Object message, Throwable t)
+ {
+ delegate.error(message, t);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param message
+ * @see org.jboss.logging.Logger#error(java.lang.Object)
+ */
+ public void error(Object message)
+ {
+ delegate.error(message);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param loggerFqcn
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#error(java.lang.String, java.lang.Object, java.lang.Throwable)
+ */
+ public void error(String loggerFqcn, Object message, Throwable t)
+ {
+ delegate.error(loggerFqcn, message, t);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#errorf(java.lang.String, java.lang.Object[])
+ */
+ public void errorf(String format, Object... params)
+ {
+ delegate.errorf(format, params);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param t
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#errorf(java.lang.Throwable, java.lang.String, java.lang.Object[])
+ */
+ public void errorf(Throwable t, String format, Object... params)
+ {
+ delegate.errorf(t, format, params);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#fatal(java.lang.Object, java.lang.Throwable)
+ */
+ public void fatal(Object message, Throwable t)
+ {
+ delegate.fatal(message, t);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param message
+ * @see org.jboss.logging.Logger#fatal(java.lang.Object)
+ */
+ public void fatal(Object message)
+ {
+ delegate.fatal(message);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param loggerFqcn
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#fatal(java.lang.String, java.lang.Object, java.lang.Throwable)
+ */
+ public void fatal(String loggerFqcn, Object message, Throwable t)
+ {
+ delegate.fatal(loggerFqcn, message, t);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#fatalf(java.lang.String, java.lang.Object[])
+ */
+ public void fatalf(String format, Object... params)
+ {
+ delegate.fatalf(format, params);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param t
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#fatalf(java.lang.Throwable, java.lang.String, java.lang.Object[])
+ */
+ public void fatalf(Throwable t, String format, Object... params)
+ {
+ delegate.fatalf(t, format, params);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @return
+ * @see org.jboss.logging.Logger#getLoggerPlugin()
+ */
+ public LoggerPlugin getLoggerPlugin()
+ {
+ return delegate.getLoggerPlugin();
+ }
+
+ /**
+ * @return
+ * @see org.jboss.logging.Logger#getName()
+ */
+ public String getName()
+ {
+ return delegate.getName();
+ }
+
+ /**
+ * @return
+ * @see java.lang.Object#hashCode()
+ */
+ public int hashCode()
+ {
+ return delegate.hashCode();
+ }
+
+ /**
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#info(java.lang.Object, java.lang.Throwable)
+ */
+ public void info(Object message, Throwable t)
+ {
+ delegate.info(message, t);
+ }
+
+ /**
+ * @param message
+ * @see org.jboss.logging.Logger#info(java.lang.Object)
+ */
+ public void info(Object message)
+ {
+ delegate.info(message);
+ }
+
+ /**
+ * @param loggerFqcn
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#info(java.lang.String, java.lang.Object, java.lang.Throwable)
+ */
+ public void info(String loggerFqcn, Object message, Throwable t)
+ {
+ delegate.info(loggerFqcn, message, t);
+ }
+
+ /**
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#infof(java.lang.String, java.lang.Object[])
+ */
+ public void infof(String format, Object... params)
+ {
+ delegate.infof(format, params);
+ }
+
+ /**
+ * @param t
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#infof(java.lang.Throwable, java.lang.String, java.lang.Object[])
+ */
+ public void infof(Throwable t, String format, Object... params)
+ {
+ delegate.infof(t, format, params);
+ }
+
+ /**
+ * @return
+ * @deprecated
+ * @see org.jboss.logging.Logger#isDebugEnabled()
+ */
+ public boolean isDebugEnabled()
+ {
+ return delegate.isDebugEnabled();
+ }
+
+ /**
+ * @return
+ * @deprecated
+ * @see org.jboss.logging.Logger#isInfoEnabled()
+ */
+ public boolean isInfoEnabled()
+ {
+ return delegate.isInfoEnabled();
+ }
+
+ /**
+ * @return
+ * @see org.jboss.logging.Logger#isTraceEnabled()
+ */
+ public boolean isTraceEnabled()
+ {
+ return delegate.isTraceEnabled();
+ }
+
+ /**
+ * @return
+ * @see java.lang.Object#toString()
+ */
+ public String toString()
+ {
+ return delegate.toString();
+ }
+
+ /**
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#trace(java.lang.Object, java.lang.Throwable)
+ */
+ public void trace(Object message, Throwable t)
+ {
+ delegate.trace(message, t);
+ }
+
+ /**
+ * @param message
+ * @see org.jboss.logging.Logger#trace(java.lang.Object)
+ */
+ public void trace(Object message)
+ {
+ delegate.trace(message);
+ }
+
+ /**
+ * @param loggerFqcn
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#trace(java.lang.String, java.lang.Object, java.lang.Throwable)
+ */
+ public void trace(String loggerFqcn, Object message, Throwable t)
+ {
+ delegate.trace(loggerFqcn, message, t);
+ }
+
+ /**
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#tracef(java.lang.String, java.lang.Object[])
+ */
+ public void tracef(String format, Object... params)
+ {
+ delegate.tracef(format, params);
+ }
+
+ /**
+ * @param t
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#tracef(java.lang.Throwable, java.lang.String, java.lang.Object[])
+ */
+ public void tracef(Throwable t, String format, Object... params)
+ {
+ delegate.tracef(t, format, params);
+ }
+
+ /**
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#warn(java.lang.Object, java.lang.Throwable)
+ */
+ public void warn(Object message, Throwable t)
+ {
+ delegate.warn(message, t);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param message
+ * @see org.jboss.logging.Logger#warn(java.lang.Object)
+ */
+ public void warn(Object message)
+ {
+ delegate.warn(message);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param loggerFqcn
+ * @param message
+ * @param t
+ * @see org.jboss.logging.Logger#warn(java.lang.String, java.lang.Object, java.lang.Throwable)
+ */
+ public void warn(String loggerFqcn, Object message, Throwable t)
+ {
+ delegate.warn(loggerFqcn, message, t);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#warnf(java.lang.String, java.lang.Object[])
+ */
+ public void warnf(String format, Object... params)
+ {
+ delegate.warnf(format, params);
+ warnErrorCalled = true;
+ }
+
+ /**
+ * @param t
+ * @param format
+ * @param params
+ * @see org.jboss.logging.Logger#warnf(java.lang.Throwable, java.lang.String, java.lang.Object[])
+ */
+ public void warnf(Throwable t, String format, Object... params)
+ {
+ delegate.warnf(t, format, params);
+ warnErrorCalled = true;
+ }
+
+
+ }
+
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ AbstractTestDelegate delegate = new AbstractTestDelegate(clazz);
+ delegate.enableSecurity = false;
+ return delegate;
+ }
+
+}
Modified: projects/kernel/branches/resolver/guice-int/.classpath
===================================================================
--- projects/kernel/branches/resolver/guice-int/.classpath 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/guice-int/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: projects/kernel/branches/resolver/guice-int/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/guice-int/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/guice-int/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/guice-int/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:28 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/guice-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/guice-int/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/guice-int/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,52 +1,52 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-guice-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Guice Int</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Guice Int</description>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <classifier>aopalliance</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-guice-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Guice Int</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Guice Int</description>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>aopalliance</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: projects/kernel/branches/resolver/jmx-aop-mc-int/.classpath
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/.classpath 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: projects/kernel/branches/resolver/jmx-aop-mc-int/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/jmx-aop-mc-int/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:28 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/jmx-aop-mc-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,134 +1,134 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-jmx-aop-mc-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer AOP/JMX Integration</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer JMX Integration</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <excludes>
- <exclude>org/jboss/test/system/controller/integration/asynchronous/test/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>run-asynchronous-tests</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>test</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <property name="byteman.path" value="${maven.dependency.org.jboss.byteman.byteman.jar.path}" />
- <property name="report.dir" value="${project.build.directory}/surefire-reports" />
- <property name="testOutputDirectory" value="${project.build.testOutputDirectory}" />
-
- <ant antfile="${project.build.testOutputDirectory}/build.xml" inheritrefs="true">
- <target name="asynchronous-tests" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.mx</groupId>
- <artifactId>jboss-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-mc-int</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.byteman</groupId>
- <artifactId>byteman</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-jmx-aop-mc-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer AOP/JMX Integration</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer JMX Integration</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <excludes>
+ <exclude>org/jboss/test/system/controller/integration/asynchronous/test/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>run-asynchronous-tests</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>test</phase>
+ <configuration>
+ <tasks unless="maven.test.skip">
+ <property name="byteman.path" value="${maven.dependency.org.jboss.byteman.byteman.jar.path}" />
+ <property name="report.dir" value="${project.build.directory}/surefire-reports" />
+ <property name="testOutputDirectory" value="${project.build.testOutputDirectory}" />
+
+ <ant antfile="${project.build.testOutputDirectory}/build.xml" inheritrefs="true">
+ <target name="asynchronous-tests" />
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerCreateDestroyLifecycleCallback.java
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerCreateDestroyLifecycleCallback.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerCreateDestroyLifecycleCallback.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -82,7 +82,7 @@
}
catch(Exception e)
{
- log.debug("Error destroying mbean", e);
+ log.debugf(e, "Error destroying mbean");
}
}
}
\ No newline at end of file
Modified: projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -111,7 +111,7 @@
}
catch (Throwable t)
{
- log.debug("Unable to get classloader from " + context + " " + t);
+ log.debugf("Unable to get classloader from %1s" + context + " %2s", context, t);
}
if (cl == null)
cl = Thread.currentThread().getContextClassLoader();
@@ -151,11 +151,11 @@
}
catch (Exception t)
{
- log.debug("Error unregistering mbean", t);
+ log.debugf(t, "Error unregistering mbean");
}
throw e;
}
- log.debug("Registered MBean " + objectName);
+ log.debugf("Registered MBean %1s", objectName);
}
public void uninstall(ControllerContext context) throws Exception
@@ -165,7 +165,7 @@
try
{
- log.debug("Unregistering MBean " + objectName);
+ log.debugf("Unregistering MBean %1s", objectName);
serviceController.destroy(objectName);
}
finally
@@ -176,10 +176,10 @@
}
catch(Exception e)
{
- log.debug("Error unregistering mbean", e);
+ log.debugf(e, "Error unregistering mbean");
}
}
- log.debug("Unregistered MBean " + objectName);
+ log.debugf("Unregistered MBean %1s", objectName);
}
private JMX readJmxAnnotation(ControllerContext context) throws Exception
Modified: projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -92,7 +92,7 @@
}
catch (Throwable t)
{
- log.debug("Unable to get classloader from " + context + " " + t);
+ log.debugf("Unable to get classloader from %1s %2s", context, t);
}
if (cl == null)
cl = Thread.currentThread().getContextClassLoader();
@@ -132,11 +132,11 @@
}
catch (Exception t)
{
- log.debug("Error unregistering mbean", t);
+ log.debugf(t, "Error unregistering mbean");
}
throw e;
}
- log.debug("Registered MBean " + objectName);
+ log.debugf("Registered MBean %1s", objectName);
}
/**
@@ -154,9 +154,9 @@
}
catch(Exception e)
{
- log.debug("Error unregistering mbean", e);
+ log.debugf(e, "Error unregistering mbean");
}
- log.debug("Unregistered MBean " + objectName);
+ log.debugf("Unregistered MBean %1s", objectName);
}
@SuppressWarnings("unchecked")
Modified: projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerStartStopLifecycleCallback.java
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerStartStopLifecycleCallback.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerStartStopLifecycleCallback.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -81,7 +81,7 @@
}
catch(Exception e)
{
- log.debug("Error stopping mbean", e);
+ log.debugf(e, "Error stopping mbean");
}
}
}
\ No newline at end of file
Modified: projects/kernel/branches/resolver/jmx-mc-int/.classpath
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/.classpath 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: projects/kernel/branches/resolver/jmx-mc-int/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/jmx-mc-int/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/jmx-mc-int/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:27 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/jmx-mc-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,90 +1,90 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-jmx-mc-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer JMX Integration</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer JMX Integration</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!--configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration-->
- </plugin>
- </plugins>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.mx</groupId>
- <artifactId>jboss-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.mx</groupId>
- <artifactId>jboss-mbeanserver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer JMX Integration</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer JMX Integration</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!--configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration-->
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-mbeanserver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -302,7 +302,7 @@
}
catch (Throwable e)
{
- log.debug("Unexpected error during destroy", e);
+ log.debugf(e, "Unexpected error during destroy");
}
// cleanup
@@ -317,16 +317,16 @@
*/
public void handleNotification2(Notification n, Object handback)
{
- log.debug("Got notification: " + n);
+ log.debugf("Got notification: %1s", n);
if (startHandback != null && startHandback.equals(handback))
{
- log.debug("Saw '" + handback + "' handback, starting barrier");
+ log.debugf("Saw '%1s' handback, starting barrier", handback);
startBarrier();
}
else if (stopHandback != null && stopHandback.equals(handback))
{
- log.debug("Saw '" + handback + "' handback, stopping barrier");
+ log.debugf("Saw '%1s' handback, stopping barrier", handback);
stopBarrier();
}
}
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -164,7 +164,7 @@
throw new IllegalStateException("Interceptor already attached");
}
- log.debug("Attaching interceptor: " + interceptor.getName());
+ log.debugf("Attaching interceptor: %1s", interceptor.getName());
// remember the interceptor
this.interceptor = interceptor;
@@ -185,7 +185,7 @@
params,
signature);
- log.debug("Interceptor attached to: '" + target + "'");
+ log.debugf("Interceptor attached to: '%1s'", target);
}
}
}
@@ -197,7 +197,7 @@
{
if (interceptor != null)
{
- log.debug("Detaching interceptor: " + interceptor.getName());
+ log.debugf("Detaching interceptor: %1s", interceptor.getName());
if (interceptables != null)
{
Object[] params = new Object[] { interceptor };
@@ -213,12 +213,11 @@
params,
signature);
- log.debug("Interceptor detached from: '" + target + "'");
+ log.debugf("Interceptor detached from: '%1s'", target);
}
catch (Exception e)
{
- log.debug("Caught exception while removing interceptor from '" +
- target + "'", e);
+ log.debugf(e, "Caught exception while removing interceptor from '%1s'", target);
}
}
}
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -239,7 +239,7 @@
if (this.xmllist != null && this.sublist == null)
{
// Parse the XML spec
- log.debug("Parsing subscription specification");
+ log.debugf("Parsing subscription specification");
List subscriptionList = parseXMLSubscriptionSpec(this.xmllist);
subscribe(subscriptionList, dynamicSubscriptions, listener);
@@ -249,7 +249,7 @@
subscribe(sublist, dynamicSubscriptions, listener);
}
else
- log.debug("Subscription specification not provided");
+ log.debugf("Subscription specification not provided");
}
/**
@@ -276,12 +276,12 @@
this.dynamicSubscriptions = dynamicSubscriptions;
this.listener = listener;
- log.debug(this.sublist);
-
- log.debug("Subscribing for JMX notifications" +
- ", dynamic=" + dynamicSubscriptions +
- (this.getServiceName().equals(listener) ? "" :
- ", listener='" + listener + "'"));
+ log.debugf("%1s", this.sublist);
+
+ log.debugf(
+ "Subscribing for JMX notifications, dynamic=%1s %2s",
+ dynamicSubscriptions, (this.getServiceName().equals(listener) ? "" : ", listener='" + listener + "'")
+ );
bulkRegister();
@@ -295,13 +295,13 @@
this.myHandback
);
- log.debug("Subscribed to MBeanServerDelegate, too");
+ log.debugf("Subscribed to MBeanServerDelegate, too");
}
subscribed = true;
}
else
- log.debug("Subscription list not provided");
+ log.debugf("Subscription list not provided");
}
/**
@@ -313,7 +313,7 @@
if (!subscribed)
return;
- log.debug("Removing all JMX notification subscriptions");
+ log.debugf("Removing all JMX notification subscriptions");
bulkUnregister();
if (this.dynamicSubscriptions == true)
@@ -327,7 +327,7 @@
this.myHandback
);
- log.debug("Unsubscribed from MBeanServerDelegate, too");
+ log.debugf("Unsubscribed from MBeanServerDelegate, too");
}
catch (MalformedObjectNameException e)
{
@@ -392,7 +392,7 @@
{
if(objectName.apply(target))
{
- log.debug("ObjectName: '" + target + "' matched '" + objectName + "'");
+ log.debugf("ObjectName: '%1s' matched '%2s'", target, objectName);
// go for it!
singleRegister(
@@ -464,8 +464,7 @@
catch (InstanceNotFoundException e)
{
// ignore - mbean might not be registered
- log.debug("Could not subscribe to: '" + target
- + "', target or listener MBean not registered");
+ log.debugf("Could not subscribe to: '%1s', target or listener MBean not registered", target);
}
catch (RuntimeException e)
{
@@ -487,24 +486,23 @@
// remove the matching subscription
server.removeNotificationListener(target, listener, filter, handback);
- log.debug("Unsubscribed from: '" + target + "'");
+ log.debugf("Unsubscribed from: '%1s'", target);
}
catch (InstanceNotFoundException e)
{
// ignore - target mbean not present
- log.debug("Could not unsubscribe from non-existent: '"
- + target + "'");
+ log.debugf("Could not unsubscribe from non-existent: '%1s'", target);
}
catch (ListenerNotFoundException e)
{
// May happen if target is not a notification broadcaster
// and so we hadn't registered in the first place
- log.debug("Could not unsubscribe from: '" + target + "'");
+ log.debugf("Could not unsubscribe from: '%1s'", target);
}
catch (RuntimeException e)
{
// whatever
- log.debug("Could not unsubscribe from: '" + target + "'");
+ log.debugf("Could not unsubscribe from: '%1s'", target);
}
}
@@ -531,7 +529,7 @@
{
Set mset = server.queryNames(objectName, null);
- log.debug("ObjectName: '" + objectName + "' matched " + mset.size() + " MBean(s)");
+ log.debugf("ObjectName: '%1s' matched %2d MBean(s)", objectName, mset.size());
Iterator j = mset.iterator();
while (j.hasNext())
@@ -566,7 +564,7 @@
{
Set mset = server.queryNames(objectName, null);
- log.debug("ObjectName: '" + objectName + "' matched " + mset.size() + " MBean(s)");
+ log.debugf("ObjectName: '%1s' matched %2d MBean(s)", objectName, mset.size());
Iterator j = mset.iterator();
while (j.hasNext())
@@ -587,14 +585,13 @@
{
StringBuffer sbuf = new StringBuffer(100);
- sbuf.append("Subscribed to: { objectName='").append(objectName);
- sbuf.append("', listener='").append(listener);
- sbuf.append("', handback=").append(handback);
- sbuf.append(", filter=");
- sbuf.append(filter == null ? null : filter.toString());
+ sbuf.append("Subscribed to: { objectName='%1s");
+ sbuf.append("', listener='%2s");
+ sbuf.append("', handback=%3s");
+ sbuf.append(", filter=%4s");
sbuf.append(" }");
- log.debug(sbuf.toString());
+ log.debugf(sbuf.toString(), objectName, listener, handback, filter);
}
/**
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceConfigurator.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceConfigurator.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceConfigurator.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -178,7 +178,7 @@
Object outputValue = value;
if (attributeName.toLowerCase().indexOf("password") != -1)
outputValue = "****";
- log.debug(attributeName + " set to " + outputValue + " in " + objectName);
+ log.debugf("%1s set to %2s in %3s", attributeName, outputValue, objectName);
}
server.setAttribute(objectName, new Attribute(attributeName, value));
}
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceController.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceController.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceController.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -342,7 +342,7 @@
return;
}
- log.debug("Registering service " + serviceName);
+ log.debugf("Registering service %1s", serviceName);
// This is an already registered mbean
KernelController controller = kernel.getController();
@@ -378,7 +378,7 @@
return;
}
- log.debug("Creating service " + serviceName);
+ log.debugf("Creating service %1s", serviceName);
// Register if not already done so
ServiceControllerContext context = installed.get(serviceName);
@@ -394,7 +394,7 @@
|| ctx.state == ServiceContext.RUNNING
|| ctx.state == ServiceContext.FAILED)
{
- log.debug("Ignoring create request for service: " + ctx.objectName + " at state " + ctx.getStateString());
+ log.debugf("Ignoring create request for service %1s at state %2s", ctx.objectName, ctx.getStateString());
return;
}
@@ -418,7 +418,7 @@
return;
}
- log.debug("starting service " + serviceName);
+ log.debugf("starting service %1s", serviceName);
// Register if not already done so
ServiceControllerContext context = installed.get(serviceName);
@@ -432,7 +432,7 @@
// If we are already started (can happen in dependencies) just return
if (ctx.state == ServiceContext.RUNNING || ctx.state == ServiceContext.FAILED)
{
- log.debug("Ignoring start request for service: " + ctx.objectName + " at state " + ctx.getStateString());
+ log.debugf("Ignoring start request for service: %1s at state %2s", ctx.objectName, ctx.getStateString());
return;
}
@@ -456,7 +456,7 @@
return;
}
- log.debug("restarting service " + serviceName);
+ log.debugf("restarting service %1s", serviceName);
stop(serviceName);
start(serviceName);
}
@@ -469,7 +469,7 @@
return;
}
- log.debug("stopping service: " + serviceName);
+ log.debugf("stopping service: %1s", serviceName);
ServiceControllerContext context = installed.get(serviceName);
if (context == null)
@@ -482,7 +482,7 @@
ServiceContext ctx = context.getServiceContext();
if (ctx.state != ServiceContext.RUNNING)
{
- log.debug("Ignoring stop request for service: " + ctx.objectName + " at state " + ctx.getStateString());
+ log.debugf("Ignoring stop request for service: %1s at state %2s", ctx.objectName, ctx.getStateString());
return;
}
@@ -506,7 +506,7 @@
return;
}
- log.debug("destroying service: " + serviceName);
+ log.debugf("destroying service: %1s", serviceName);
ServiceControllerContext context = installed.get(serviceName);
if (context == null)
@@ -519,7 +519,7 @@
ServiceContext ctx = context.getServiceContext();
if (ctx.state == ServiceContext.DESTROYED || ctx.state == ServiceContext.NOTYETINSTALLED || ctx.state == ServiceContext.FAILED)
{
- log.debug("Ignoring destroy request for service: " + ctx.objectName + " at state " + ctx.getStateString());
+ log.debugf("Ignoring destroy request for service: %1s at state %2s", ctx.objectName, ctx.getStateString());
return;
}
@@ -555,7 +555,7 @@
return;
}
installedOrder.remove(context);
- log.debug("removing service: " + objectName);
+ log.debugf("removing service: %1s", objectName);
// Uninstall the context
safelyRemoveAnyRegisteredContext(context);
@@ -571,7 +571,7 @@
public void shutdown()
{
- log.debug("Stopping " + installedOrder.size() + " services");
+ log.debugf("Stopping %1d services", installedOrder.size());
KernelController controller = kernel.getController();
@@ -585,7 +585,7 @@
controller.uninstall(context.getName());
++serviceCounter;
}
- log.debug("Stopped " + serviceCounter + " services");
+ log.debugf("Stopped %1d services", serviceCounter);
// Shutdown ourselves
controller.uninstall(ServiceControllerMBean.OBJECT_NAME.getCanonicalName());
@@ -604,7 +604,7 @@
kernel = bootstrap.getKernel();
}
- log.debug("Controller MBean online");
+ log.debugf("Controller MBean online");
return name == null ? OBJECT_NAME : name;
}
@@ -671,7 +671,7 @@
controller.change(context, requiredState);
ControllerState state = context.getState();
if (logWait != null && requiredState.equals(state) == false && state != ControllerState.ERROR)
- log.debug("Waiting in " + logWait + " of " + context.getObjectName() + " on " + getUnresolvedDependencies(context, requiredState));
+ log.debugf("Waiting in %1s of %2s on %3s", logWait, context.getObjectName(), getUnresolvedDependencies(context, requiredState));
}
}
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -140,7 +140,7 @@
result = installExternalXMBean(server, objectName, metaData);
}
- log.debug("Created mbean: " + objectName);
+ log.debugf("Created mbean: %1s", objectName);
return result;
}
catch (Throwable e)
@@ -178,13 +178,13 @@
String interfaceName = metaData.getInterfaceName();
Class<?> intf = loader.loadClass(interfaceName);
- log.debug("About to create bean resource: " + objectName + " with code: " + code + " and interface " + interfaceName);
+ log.debugf("About to create bean resource:%1s with code: %2s and interface %3s", objectName, code, interfaceName);
Object resource = server.instantiate(code,
loaderName,
constructor.getParameters(loader),
constructor.getSignature());
- log.debug("About to register StandardMBean : " + objectName);
+ log.debugf("About to register StandardMBean : %1s", objectName);
ObjectInstance instance = server.createMBean(StandardMBean.class.getName(),
objectName,
loaderName,
@@ -210,7 +210,7 @@
ServiceConstructorMetaData constructor = metaData.getConstructor();
// This is a standard or dynamic mbean
- log.debug("About to create bean: " + objectName + " with code: " + code);
+ log.debugf("About to create bean: %1s with code: %2s", objectName, code);
Object resource = null;
try
{
@@ -251,7 +251,7 @@
ServiceConstructorMetaData constructor = metaData.getConstructor();
// This is an xmbean with an embedded mbean descriptor
- log.debug("About to create xmbean object: " + objectName + " with code: " + code + " with embedded descriptor");
+ log.debugf("About to create xmbean object: %1s with code: %2s with embedded descriptor", objectName, code);
//xmbean: construct object first.
Object resource = server.instantiate(code,
loaderName,
@@ -288,7 +288,7 @@
String xmbeanDD = metaData.getXMBeanDD();
// This is an xmbean with an external descriptor
- log.debug("About to create xmbean object: " + objectName + " with code: " + code + " with descriptor: " + xmbeanDD);
+ log.debugf("About to create xmbean object: %1s with code: %2s with descriptor: %3s", objectName, code, xmbeanDD);
//xmbean: construct object first.
Object resource = server.instantiate(code,
loaderName,
@@ -334,12 +334,12 @@
throw new IllegalArgumentException("Null ObjectName");
try
{
- log.debug("Removing mbean from server: " + objectName);
+ log.debugf("Removing mbean from server: %1s", objectName);
server.unregisterMBean(objectName);
}
catch (Throwable t)
{
- log.debug("Error unregistering mbean " + objectName, t);
+ log.debugf(t, "Error unregistering mbean %1s", objectName);
}
}
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -184,7 +184,7 @@
}
catch (Throwable t)
{
- log.debug("Error setting attribute " + attribute.getName(), t);
+ log.debugf(t, "Error setting attribute %1s", attribute.getName());
}
}
return list;
@@ -204,7 +204,7 @@
}
catch (Throwable t)
{
- log.debug("Error getting attribute " + attributes[i], t);
+ log.debugf(t, "Error getting attribute %1s", attributes[i]);
}
}
return list;
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -312,11 +312,11 @@
if (state == CREATED || state == STARTING || state == STARTED
|| state == STOPPING || state == STOPPED)
{
- log.debug("Ignoring create call; current state is " + getStateString());
+ log.debugf("Ignoring create call; current state is %1s", getStateString());
return;
}
- log.debug("Creating " + jbossInternalDescription());
+ log.debugf("Creating %1s", jbossInternalDescription());
try
{
@@ -325,30 +325,30 @@
}
catch (Exception e)
{
- log.debug("Initialization failed " + jbossInternalDescription(), e);
+ log.debugf(e, "Initialization failed %1s", jbossInternalDescription());
throw e;
}
- log.debug("Created " + jbossInternalDescription());
+ log.debugf("Created %1s", jbossInternalDescription());
}
protected void jbossInternalStart() throws Exception
{
if (state == STARTING || state == STARTED || state == STOPPING)
{
- log.debug("Ignoring start call; current state is " + getStateString());
+ log.debugf("Ignoring start call; current state is %1s", getStateString());
return;
}
if (state != CREATED && state != STOPPED && state != FAILED)
{
- log.debug("Start requested before create, calling create now");
+ log.debugf("Start requested before create, calling create now");
create();
}
state = STARTING;
sendStateChangeNotification(STOPPED, STARTING, getName() + " starting", null);
- log.debug("Starting " + jbossInternalDescription());
+ log.debugf("Starting %1s", jbossInternalDescription());
try
{
@@ -358,26 +358,26 @@
{
state = FAILED;
sendStateChangeNotification(STARTING, FAILED, getName() + " failed", e);
- log.debug("Starting failed " + jbossInternalDescription(), e);
+ log.debugf(e, "Starting failed %1s", jbossInternalDescription());
throw e;
}
state = STARTED;
sendStateChangeNotification(STARTING, STARTED, getName() + " started", null);
- log.debug("Started " + jbossInternalDescription());
+ log.debugf("Started %1s", jbossInternalDescription());
}
protected void jbossInternalStop()
{
if (state != STARTED)
{
- log.debug("Ignoring stop call; current state is " + getStateString());
+ log.debugf("Ignoring stop call; current state is %1s", getStateString());
return;
}
state = STOPPING;
sendStateChangeNotification(STARTED, STOPPING, getName() + " stopping", null);
- log.debug("Stopping " + jbossInternalDescription());
+ log.debugf("Stopping %1s", jbossInternalDescription());
try
{
@@ -393,24 +393,24 @@
state = STOPPED;
sendStateChangeNotification(STOPPING, STOPPED, getName() + " stopped", null);
- log.debug("Stopped " + jbossInternalDescription());
+ log.debugf("Stopped %1s", jbossInternalDescription());
}
protected void jbossInternalDestroy()
{
if (state == DESTROYED)
{
- log.debug("Ignoring destroy call; current state is " + getStateString());
+ log.debugf("Ignoring destroy call; current state is %1s", getStateString());
return;
}
if (state == STARTED)
{
- log.debug("Destroy requested before stop, calling stop now");
+ log.debugf("Destroy requested before stop, calling stop now");
stop();
}
- log.debug("Destroying " + jbossInternalDescription());
+ log.debugf("Destroying %1s", jbossInternalDescription());
try
{
@@ -421,7 +421,7 @@
log.warn("Destroying failed " + jbossInternalDescription(), t);
}
state = DESTROYED;
- log.debug("Destroyed " + jbossInternalDescription());
+ log.debugf("Destroyed %1s", jbossInternalDescription());
}
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceDeploymentParser.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceDeploymentParser.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceDeploymentParser.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -102,7 +102,7 @@
Element classpathElement = (Element)children.item(i);
if (classpathElement.getTagName().equals("classpath"))
{
- log.debug("Found classpath element: " + classpathElement);
+ log.debugf("Found classpath element: %1s", classpathElement);
if (classpathElement.hasAttribute("codebase") == false)
throw new ConfigurationException("Invalid classpath element missing codebase: " + classpathElement);
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/CreateDestroyLifecycleAction.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/CreateDestroyLifecycleAction.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/CreateDestroyLifecycleAction.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -82,7 +82,7 @@
}
catch (Throwable t)
{
- log.debug("Error during destroy for " + context.getObjectName(), t);
+ log.debugf(t, "Error during destroy for %1s", context.getObjectName());
}
}
}
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/StartStopLifecycleAction.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/StartStopLifecycleAction.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/StartStopLifecycleAction.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -81,7 +81,7 @@
}
catch (Throwable t)
{
- log.debug("Error during stop for " + context.getObjectName(), t);
+ log.debugf(t, "Error during stop for %1s" + context.getObjectName());
}
}
}
Modified: projects/kernel/branches/resolver/kernel/.classpath
===================================================================
--- projects/kernel/branches/resolver/kernel/.classpath 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: projects/kernel/branches/resolver/kernel/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/kernel/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/kernel/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/kernel/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:27 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/kernel/pom.xml
===================================================================
--- projects/kernel/branches/resolver/kernel/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,154 +1,154 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-kernel</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Kernel</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Kernel</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!--skip>true</skip-->
- <!--testFailureIgnore>true</testFailureIgnore-->
- <excludes>
- <exclude>org/jboss/test/kernel/asynchronous/test/**</exclude>
- <exclude>org/jboss/test/kernel/qualifiers/test/**</exclude>
- <exclude>org/jboss/test/kernel/deployment/xml/test/Qualifier*TestCase.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/spi.xml</descriptor>
- <descriptor>src/assembly/plugins.xml</descriptor>
- <descriptor>src/assembly/annotations.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>run-asynchronous-tests</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>test</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <property name="byteman.path" value="${maven.dependency.org.jboss.byteman.byteman.jar.path}" />
- <property name="report.dir" value="${project.build.directory}/surefire-reports" />
- <property name="testOutputDirectory" value="${project.build.testOutputDirectory}" />
-
- <ant antfile="${project.build.testOutputDirectory}/build.xml" inheritrefs="true">
- <target name="asynchronous-tests" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.byteman</groupId>
- <artifactId>byteman</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-kernel</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Kernel</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Kernel</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--skip>true</skip-->
+ <!--testFailureIgnore>true</testFailureIgnore-->
+ <excludes>
+ <exclude>org/jboss/test/kernel/asynchronous/test/**</exclude>
+ <exclude>org/jboss/test/kernel/qualifiers/test/**</exclude>
+ <exclude>org/jboss/test/kernel/deployment/xml/test/Qualifier*TestCase.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/spi.xml</descriptor>
+ <descriptor>src/assembly/plugins.xml</descriptor>
+ <descriptor>src/assembly/annotations.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>run-asynchronous-tests</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>test</phase>
+ <configuration>
+ <tasks unless="maven.test.skip">
+ <property name="byteman.path" value="${maven.dependency.org.jboss.byteman.byteman.jar.path}" />
+ <property name="report.dir" value="${project.build.directory}/surefire-reports" />
+ <property name="testOutputDirectory" value="${project.build.testOutputDirectory}" />
+
+ <ant antfile="${project.build.testOutputDirectory}/build.xml" inheritrefs="true">
+ <target name="asynchronous-tests" />
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -288,7 +288,7 @@
// currently value constructor supports only values that are instances of class itself
// this will add another instance with the same class to context
ClassInfo type = beanInfo.getClassInfo();
- log.debug("Constructing bean from injection value: results in multiple beans with same class type - " + type);
+ log.debugf("Constructing bean from injection value: results in multiple beans with same class type - %1s", type);
return type;
}
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -373,7 +373,7 @@
{
visitor.visitorNodeStack().push(node);
}
- log.debug(context.getName() + ": Contextual injection usage (class -> classloader): " + injectionClass + " -> " + SecurityActions.getClassLoader(injectionClass) + " defined by " + node);
+ log.debugf("%1s : Contextual injection usage (class -> classloader): %2s -> %3s defined by %4s", context.getName(), injectionClass, SecurityActions.getClassLoader(injectionClass), node);
// set when required
ControllerState whenRequired = whenRequiredState;
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -62,7 +62,7 @@
}
catch (Throwable t)
{
- log.debug("Unable to initialise property editors", t);
+ log.debugf(t, "Unable to initialise property editors");
}
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/ContextualInjectionDependencyItem.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/ContextualInjectionDependencyItem.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/beans/metadata/plugins/ContextualInjectionDependencyItem.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -49,7 +49,7 @@
private final SearchInfo search;
- private final AbstractInjectionValueMetaData injectionValueMetaData;
+ private volatile AbstractInjectionValueMetaData injectionValueMetaData;
private volatile ClearableDependencyItemCallbackHandler clearableDependencyItemCallbackHandler;
@@ -139,6 +139,7 @@
handler.invokeClearingCallbacks(controller, this);
setIDependOn(null);
+ injectionValueMetaData = null;
}
public void registerCallback(ClearableDependencyItemCallback callback)
@@ -153,5 +154,4 @@
}
clearableDependencyItemCallbackHandler.registerCallback(callback);
}
-
}
\ No newline at end of file
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/KernelFactory.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/KernelFactory.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/KernelFactory.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -83,7 +83,7 @@
long begin = 0;
long end = 0;
- log.debug("Starting JBoss Kernel construction...");
+ log.debugf("Starting JBoss Kernel construction...");
begin = System.currentTimeMillis();
//local caching for easy reference:
@@ -109,7 +109,7 @@
log.trace("Kernel instance initialzed");
end = System.currentTimeMillis();
- log.debug("Completed JBoss Kernel construction. Duration: " + (end - begin) + " milliseconds");
+ log.debugf("Completed JBoss Kernel construction. Duration: %1d milliseconds", (end - begin));
return kernel;
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -73,7 +73,7 @@
}
catch (Throwable t)
{
- log.debug("Ignored error unsetting context ", t);
+ log.debugf(t, "Ignored error unsetting context ");
}
}
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AnnotationsAction.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AnnotationsAction.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AnnotationsAction.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -67,7 +67,7 @@
}
catch(Throwable t)
{
- log.debug("Error while cleaning the annotations: " + t);
+ log.debugf(t, "Error while cleaning the annotations: ");
}
finally
{
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AutowireAction.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AutowireAction.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AutowireAction.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -54,7 +54,7 @@
}
catch (Throwable ignored)
{
- log.debug("Ignored error unsetting context ", ignored);
+ log.debugf(ignored, "Ignored error unsetting context ");
}
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/DescribeAction.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/DescribeAction.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/DescribeAction.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -91,7 +91,7 @@
}
catch (Throwable e)
{
- log.debug("Error while cleaning the annotations: " + e);
+ log.debugf(e, "Error while cleaning the annotations: ");
return;
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/InstantiateAction.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/InstantiateAction.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/InstantiateAction.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -119,7 +119,7 @@
}
catch (Throwable ignored)
{
- log.debug("Ignored error unsetting context ", ignored);
+ log.debugf(ignored, "Ignored error unsetting context ");
}
finally
{
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -232,7 +232,7 @@
}
catch (Exception ignored)
{
- log.debug("Ignored error unsetting context " + context.getName(), ignored);
+ log.debugf(ignored, "Ignored error unsetting context %1s", context.getName());
}
}
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ScopedKernelController.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ScopedKernelController.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ScopedKernelController.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -117,7 +117,7 @@
if (controller != null)
controller.removeController(this);
else
- log.debug("Parent controller already released, cannot remove this: " + toString());
+ log.debugf("Parent controller already released, cannot remove this: %1s", this);
setUnderlyingController(null);
setParentController(null);
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -393,6 +393,6 @@
if (controller.isShutdown() == false)
controller.uninstall(context.getName());
else
- log.debug("Not undeploying " + context.getName() + " the controller is shutdown!");
+ log.debugf("Not undeploying %1s, the controller is shutdown!", context.getName());
}
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -89,14 +89,14 @@
deployment.setName(url.toString());
long now = System.currentTimeMillis();
- log.debug("Parsing " + url + " took " + (now -start) + " milliseconds");
+ log.debugf("Parsing %1s took %2d milliseconds", url, (now - start));
if (trace)
log.trace("Deploying " + deployment);
deploy(deployment);
now = System.currentTimeMillis();
- log.debug("Deploying " + url + " took " + (now -start) + " milliseconds");
+ log.debugf("Deploying %1s took %2d milliseconds", url, (now - start));
if (trace)
log.trace("Deployed " + deployment.getInstalledContexts());
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/event/AbstractEventEmitter.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/event/AbstractEventEmitter.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/event/AbstractEventEmitter.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -171,7 +171,7 @@
}
catch (Throwable t)
{
- log.debug("Ignored unhandled throwable: ", t);
+ log.debugf(t, "Ignored unhandled throwable: ");
}
}
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/LRUPolicyCachingBasicKernelMetaDataRepository.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/LRUPolicyCachingBasicKernelMetaDataRepository.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/LRUPolicyCachingBasicKernelMetaDataRepository.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -54,7 +54,7 @@
if (min == null || max == null)
throw new IllegalArgumentException("Missing min (" + min + ") or max (" + max + ").");
- log.debug("Creating LRU cache policy, min: " + min + ", max: " + max);
+ log.debugf("Creating LRU cache policy, min: %1d, max: %2d", min, max);
return new ConcurrentLRUCachePolicyFactory(min, max);
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/TimedPolicyCachingBasicKernelMetaDataRepository.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/TimedPolicyCachingBasicKernelMetaDataRepository.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/TimedPolicyCachingBasicKernelMetaDataRepository.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -60,7 +60,7 @@
if (resolution == null)
resolution = parseInteger(readSystemProperty("TimedPolicyCaching.resolution", null));
- log.debug("Creating timed cache policy, lifetime: " + defaultLifetime + ", threadSafe: " + threadSafe + ", resolution: " + resolution);
+ log.debugf("Creating timed cache policy, lifetime: %1d, threadSafe: %2b, resolution: %3d", defaultLifetime, threadSafe, resolution);
if (defaultLifetime == null)
return new TimedCachePolicyFactory();
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -87,7 +87,7 @@
if (url != null)
methodDeployment = deploy(url);
else
- getLog().debug("No method specific deployment " + getMethodDeployment());
+ getLog().debugf("No method specific deployment %1s", getMethodDeployment());
afterSetUp();
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -296,7 +296,7 @@
{
try
{
- log.debug("Deploying " + url);
+ log.debugf("Deploying %1s", url);
KernelDeployment deployment = deployer.deploy(url);
log.trace("Deployed " + url);
return deployment;
@@ -329,11 +329,11 @@
protected KernelControllerContext deploy(BeanMetaData beanMetaData) throws Exception
{
KernelController controller = kernel.getController();
- log.debug("Deploying " + beanMetaData);
+ log.debugf("Deploying %1s", beanMetaData);
try
{
KernelControllerContext result = controller.install(beanMetaData);
- log.debug("Deployed " + result.getName());
+ log.debugf("Deployed %1s", result.getName());
return result;
}
catch (Exception e)
@@ -358,11 +358,11 @@
*/
protected void deploy(KernelDeployment deployment) throws Exception
{
- log.debug("Deploying " + deployment);
+ log.debugf("Deploying %1s", deployment);
try
{
deployer.deploy(deployment);
- log.debug("Deployed " + deployment);
+ log.debugf("Deployed %1s", deployment);
}
catch (Exception e)
{
@@ -387,10 +387,10 @@
{
if (context == null)
throw new IllegalArgumentException("Null context");
- log.debug("Undeploying " + context.getName());
+ log.debugf("Undeploying %1s", context.getName());
KernelController controller = kernel.getController();
controller.uninstall(context.getName());
- log.debug("Undeployed " + context.getName());
+ log.debugf("Undeployed %1s", context.getName());
}
/**
@@ -400,7 +400,7 @@
*/
protected void undeploy(KernelDeployment deployment)
{
- log.debug("Undeploying " + deployment.getName());
+ log.debugf("Undeploying %1s", deployment.getName());
try
{
deployer.undeploy(deployment);
@@ -419,7 +419,7 @@
*/
protected void undeploy(URL url)
{
- log.debug("Undeploying " + url);
+ log.debugf("Undeploying %1s", url);
try
{
deployer.undeploy(url);
@@ -443,7 +443,7 @@
if (url != null)
deploy(url);
else
- log.debug("No test specific deployment " + testName);
+ log.debugf("No test specific deployment %1s", testName);
}
protected void shutdown()
@@ -467,7 +467,7 @@
*/
protected void undeploy()
{
- log.debug("Undeploying " + deployer.getDeploymentNames());
+ log.debugf("Undeploying %1s", deployer.getDeploymentNames());
deployer.shutdown();
}
}
Copied: projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ContextualInjectCleanupTestCase.java (from rev 100253, projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ContextualInjectCleanupTestCase.java)
===================================================================
--- projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ContextualInjectCleanupTestCase.java (rev 0)
+++ projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ContextualInjectCleanupTestCase.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,118 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.dependency.test;
+
+import java.lang.ref.WeakReference;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.ContextualInjectionDependencyItem;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.test.kernel.dependency.support.SimpleBeanImpl;
+import org.jboss.test.kernel.dependency.support.SimpleBeanWithDependencyImpl;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ContextualInjectCleanupTestCase extends OldAbstractKernelDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(ContextualInjectCleanupTestCase.class);
+ }
+
+ public ContextualInjectCleanupTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public ContextualInjectCleanupTestCase(String name, boolean xmltest) throws Throwable
+ {
+ super(name, xmltest, true);
+ }
+
+ public void testClearedContextualInjectInjectionValueMetaData() throws Throwable
+ {
+ clearedContextualInjectInjectionValueMetaData();
+
+ assertInstall(offSetNumber(0), "Name1");
+ ControllerContext context2 = assertInstall(offSetNumber(1), "Name2");
+
+ assertNotNull(context2.getDependencyInfo());
+ Set<DependencyItem> items = context2.getDependencyInfo().getIDependOn(ContextualInjectionDependencyItem.class);
+ assertNotNull(items);
+ assertEquals(1, items.size());
+ ContextualInjectionDependencyItem item = (ContextualInjectionDependencyItem)items.iterator().next();
+ assertNotNull(item.getInjectionValueMetaData());
+ assertNotNull(item.getIDependOn());
+
+ assertUninstall("Name2");
+
+ items = context2.getDependencyInfo().getIDependOn(ContextualInjectionDependencyItem.class);
+ assertNotNull(items);
+ assertEquals(1, items.size());
+ item = (ContextualInjectionDependencyItem)items.iterator().next();
+ assertNull(item.getInjectionValueMetaData());
+ assertNull(item.getIDependOn());
+
+ WeakReference<ControllerContext> ctxRef = new WeakReference<ControllerContext>(context2);
+ context2 = null;
+
+ setBeanMetaDatas(null);
+ int i = 0;
+ while (i < 10 && ctxRef.get() != null)
+ {
+ System.gc();
+ i++;
+ Thread.sleep(200);
+ }
+
+ assertNull(ctxRef.get());
+ }
+
+ protected void clearedContextualInjectInjectionValueMetaData()
+ {
+ BeanMetaDataBuilder builder1 = BeanMetaDataBuilder.createBuilder("Name1", SimpleBeanImpl.class.getName());
+
+ BeanMetaDataBuilder builder2 = BeanMetaDataBuilder.createBuilder("Name2", SimpleBeanWithDependencyImpl.class.getName());
+ builder2.addPropertyMetaData("simpleBean",builder2.createContextualInject());
+ addAnnotation((AbstractBeanMetaData)builder2.getBeanMetaData());
+
+ setBeanMetaDatas(new BeanMetaData[] {builder1.getBeanMetaData(), builder2.getBeanMetaData()});
+ }
+
+ protected void addAnnotation(AbstractBeanMetaData bmd)
+ {
+ }
+
+ protected int offSetNumber(int i)
+ {
+ return i;
+ }
+}
Modified: projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -124,6 +124,8 @@
suite.addTest(OptionalTestCase.suite());
suite.addTest(OptionalXMLTestCase.suite());
suite.addTest(OptionalAnnotationTestCase.suite());
+ suite.addTest(DependsOnMeCleanupTestCase.suite());
+ suite.addTest(ScopedDependsOnMeCleanupTestCase.suite());
return suite;
}
}
Copied: projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java (from rev 100253, projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java)
===================================================================
--- projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java (rev 0)
+++ projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,176 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.dependency.test;
+
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.test.kernel.dependency.support.SimpleBeanImpl;
+import org.jboss.test.kernel.dependency.support.SimpleBeanWithDependencyImpl;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class DependsOnMeCleanupTestCase extends OldAbstractKernelDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(DependsOnMeCleanupTestCase.class);
+ }
+
+ public DependsOnMeCleanupTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public DependsOnMeCleanupTestCase(String name, boolean xmltest) throws Throwable
+ {
+ super(name, xmltest, true);
+ }
+
+ public void testCleanDependenciesPlainDependency() throws Throwable
+ {
+ cleanDependenciesPlainDependency();
+ executeTest();
+ }
+
+ protected void cleanDependenciesPlainDependency()
+ {
+ BeanMetaDataBuilder builder1 = BeanMetaDataBuilder.createBuilder("Name1", SimpleBeanImpl.class.getName());
+
+ BeanMetaDataBuilder builder2 = BeanMetaDataBuilder.createBuilder("Name2", SimpleBeanImpl.class.getName());
+ builder2.addDependency("Name1");
+ addAnnotation((AbstractBeanMetaData)builder2.getBeanMetaData());
+
+ setBeanMetaDatas(new BeanMetaData[] {builder1.getBeanMetaData(), builder2.getBeanMetaData()});
+ }
+
+ public void testCleanDependenciesNormalInject() throws Throwable
+ {
+ cleanDependenciesNormalInject();
+ executeTest();
+ }
+
+ protected void cleanDependenciesNormalInject()
+ {
+ BeanMetaDataBuilder builder1 = BeanMetaDataBuilder.createBuilder("Name1", SimpleBeanImpl.class.getName());
+
+ BeanMetaDataBuilder builder2 = BeanMetaDataBuilder.createBuilder("Name2", SimpleBeanWithDependencyImpl.class.getName());
+ builder2.addPropertyMetaData("simpleBean",builder2.createInject("Name1"));
+ addAnnotation((AbstractBeanMetaData)builder2.getBeanMetaData());
+
+ setBeanMetaDatas(new BeanMetaData[] {builder1.getBeanMetaData(), builder2.getBeanMetaData()});
+ }
+
+ public void testCleanDependenciesContextualInject() throws Throwable
+ {
+ cleanDependenciesContextualInject();
+ executeTest();
+ }
+
+ protected void cleanDependenciesContextualInject()
+ {
+ BeanMetaDataBuilder builder1 = BeanMetaDataBuilder.createBuilder("Name1", SimpleBeanImpl.class.getName());
+
+ BeanMetaDataBuilder builder2 = BeanMetaDataBuilder.createBuilder("Name2", SimpleBeanWithDependencyImpl.class.getName());
+ builder2.addPropertyMetaData("simpleBean",builder2.createContextualInject());
+ addAnnotation((AbstractBeanMetaData)builder2.getBeanMetaData());
+
+ setBeanMetaDatas(new BeanMetaData[] {builder1.getBeanMetaData(), builder2.getBeanMetaData()});
+ }
+
+ protected void executeTest() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(offSetNumber(0), "Name1");
+ ControllerContext context2 = assertInstall(offSetNumber(1), "Name2");
+ checkDependsOnMe(context1, context2);
+
+ assertUninstall("Name2");
+ checkNoDependsOnMe(context1);
+
+ context2 = assertInstall(offSetNumber(1), "Name2");
+ checkDependsOnMe(context1, context2);
+
+ assertUninstall("Name1");
+ checkNoDependsOnMe(context1);
+ }
+
+ protected void checkDependsOnMe(ControllerContext dependency, ControllerContext dependent)
+ {
+ DependencyInfo dependencyInfo = dependency.getDependencyInfo();
+ assertNotNull(dependencyInfo);
+ Set<DependencyItem> dependsOnMe = dependencyInfo.getDependsOnMe(null);
+ assertNotNull(dependsOnMe);
+ assertTrue(dependsOnMe.size() > 0);
+
+
+ DependencyInfo dependentInfo = dependent.getDependencyInfo();
+ assertNotNull(dependentInfo);
+ Set<DependencyItem> iDependOn = dependentInfo.getIDependOn(null);
+ assertNotNull(iDependOn);
+
+ assertEquals(dependsOnMe.size(), iDependOn.size());
+
+ assertTrue(dependsOnMe.containsAll(iDependOn));
+ }
+
+ protected void checkNoDependsOnMe(ControllerContext dependency)
+ {
+ DependencyInfo dependencyInfo = dependency.getDependencyInfo();
+ assertNotNull(dependencyInfo);
+ Set<DependencyItem> dependsOnMe = dependencyInfo.getDependsOnMe(null);
+ assertTrue(dependsOnMe == null || dependsOnMe.size() == 0);
+ }
+
+ protected void addAnnotation(AbstractBeanMetaData bmd)
+ {
+ }
+
+ protected void assertControllers(ControllerContext...contexts)
+ {
+ if (contexts.length <= 1)
+ return;
+
+ for (int i = 1 ; i < contexts.length ; i++)
+ {
+ assertNotSame(contexts[0].getController(), contexts[i].getController());
+ if (i > 1)
+ assertSame(contexts[i].getController(), contexts[i-1].getController());
+ }
+ }
+
+ protected int offSetNumber(int i)
+ {
+ return i;
+ }
+
+
+}
Copied: projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java (from rev 100253, projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java)
===================================================================
--- projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java (rev 0)
+++ projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,58 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.dependency.test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.beans.metadata.plugins.AbstractAnnotationMetaData;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
+import org.jboss.metadata.plugins.scope.DeploymentScope;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ScopedDependsOnMeCleanupTestCase extends DependsOnMeCleanupTestCase
+{
+ public static Test suite()
+ {
+ return suite(ScopedDependsOnMeCleanupTestCase.class);
+ }
+
+ public ScopedDependsOnMeCleanupTestCase(String name) throws Throwable
+ {
+ super(name, false);
+ }
+
+ protected void addAnnotation(AbstractBeanMetaData bmd)
+ {
+ Set<AnnotationMetaData> annotations = new HashSet<AnnotationMetaData>();
+ annotations.add(new AbstractAnnotationMetaData("@" + DeploymentScope.class.getName() + "(\"somedeployment\")"));
+ bmd.setAnnotations(annotations);
+ }
+
+}
Copied: projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.java (from rev 100253, projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.java)
===================================================================
--- projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.java (rev 0)
+++ projects/kernel/branches/resolver/kernel/src/test/java/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.java 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,69 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.deployment.test;
+
+import junit.framework.Test;
+
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.kernel.deployment.support.SimpleLifecycleBean;
+import org.jboss.test.kernel.junit.MicrocontainerTest;
+
+/**
+ * Test ignore lifecycle - automatic mode.
+ *
+ * @author <a href="mailto:ales.justin at gmail.com">Ales Justin</a>
+ */
+public class IgnoredAutoLifecycleTestCase extends MicrocontainerTest
+{
+ private static final String BEAN_NAME = "LifecycleBean";
+
+ public IgnoredAutoLifecycleTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(IgnoredAutoLifecycleTestCase.class);
+ }
+
+ public void testIgnoredLifecycle() throws Throwable
+ {
+ KernelControllerContext context = getControllerContext(BEAN_NAME);
+ SimpleLifecycleBean target = (SimpleLifecycleBean) context.getTarget();
+ assertNotNull(target);
+
+ assertFalse(target.isCreate());
+ assertFalse(target.isStart());
+ assertFalse(target.isStop());
+ assertFalse(target.isDestroy());
+
+ undeploy(context);
+
+ assertFalse(target.isCreate());
+ assertFalse(target.isStart());
+ assertFalse(target.isStop());
+ assertFalse(target.isDestroy());
+
+ deploy(context.getBeanMetaData());
+ }
+}
\ No newline at end of file
Copied: projects/kernel/branches/resolver/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.xml (from rev 100253, projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.xml)
===================================================================
--- projects/kernel/branches/resolver/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.xml (rev 0)
+++ projects/kernel/branches/resolver/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/IgnoredAutoLifecycleTestCase.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="LifecycleBean" class="org.jboss.test.kernel.deployment.support.IgnoredLifecycleBean" mode="Manual">
+ <create ignored="true"/>
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <destroy ignored="true"/>
+ </bean>
+
+</deployment>
Modified: projects/kernel/branches/resolver/pom.xml
===================================================================
--- projects/kernel/branches/resolver/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,485 +1,485 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4</version>
- </parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Microcontainer Kernel Parent POM</name>
- <url>http://www.jboss.org/jbossmc/</url>
- <description>
- The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
- and configuration.
- </description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/kernel/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/kernel/trunk/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/kernel/trunk/</url>
- </scm>
-
- <modules>
- <module>dependency</module>
- <module>kernel</module>
- <module>jmx-mc-int</module>
- <module>aop-mc-int</module>
- <module>jmx-aop-mc-int</module>
- <module>spring-int</module>
- <module>guice-int</module>
- <module>weld-int</module>
- <module>build</module>
- </modules>
-
- <properties>
- <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.1.1.GA</version.jboss.logging.spi>
- <version.jboss.logging.log4j>2.1.1.GA</version.jboss.logging.log4j>
- <version.jbossxb>2.0.2.Beta4</version.jbossxb>
- <version.jboss.man>2.1.1.SP1</version.jboss.man>
- <version.jboss.vfs>2.2.0.Alpha2</version.jboss.vfs>
- <version.javassist>3.11.0.GA</version.javassist>
- <version.jboss.aop>2.1.0.CR3</version.jboss.aop>
- <version.org.jboss.reflect>2.2.0.Alpha2</version.org.jboss.reflect>
- <version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
- <version.org.jboss.mx>6.0.0.Beta2</version.org.jboss.mx>
- <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
- <version.junit>4.4</version.junit>
- <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
- <version.ant.junit>1.6.5</version.ant.junit>
- <version.jboss.drools>4.0.1</version.jboss.drools>
- <version.jboss.jbpm>3.1.1</version.jboss.jbpm>
- <version.google.guice>2.0</version.google.guice>
- <version.jboss.byteman>1.0.3.CP01</version.jboss.byteman>
- <version.org.jboss.ejb3.api>3.1.0-Alpha1</version.org.jboss.ejb3.api>
- <version.javax.validation>1.0.CR3</version.javax.validation>
- <version.javax.faces.jsf-api>1.2_12</version.javax.faces.jsf-api>
- <version.org.jboss.weld.api>1.0</version.org.jboss.weld.api>
- <version.org.jboss.weld.core>1.0.0</version.org.jboss.weld.core>
- <version.org.jboss.interceptor>1.0.0-CR5</version.org.jboss.interceptor>
- <version.interceptor.api>1.1-CR1</version.interceptor.api>
- <version.slf4j>1.5.9.RC1</version.slf4j>
- <version.javax.inject>1</version.javax.inject>
- </properties>
-
- <build>
- <outputDirectory>${kernel.outputDirectory}</outputDirectory>
- <testOutputDirectory>${kernel.testOutputDirectory}</testOutputDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>2.0.9</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>1.5.0</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- <configuration>
- <generateReleasePoms>false</generateReleasePoms>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/kernel/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0.1</version>
- <configuration>
- <!-- No way to get resource directory using properties http://jira.codehaus.org/browse/MNG-3638 -->
- <excludeFilterFile>${project.build.sourceDirectory}/../resources/findbugs/exclude.xml</excludeFilterFile>
- <debug>true</debug>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencyManagement>
- <!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>${version.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>${version.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.mx</groupId>
- <artifactId>jboss-jmx</artifactId>
- <version>${version.org.jboss.mx}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.mx</groupId>
- <artifactId>jboss-mbeanserver</artifactId>
- <version>${version.org.jboss.mx}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-mc-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-mc-int</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-spring-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-guice-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.logging.log4j}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${version.jbossxb}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <version>${version.org.jboss.reflect}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.org.jboss.mdr}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
- <!-- FIXME http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4077827#4077827 -->
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${version.javassist}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${version.javax.inject}</version>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${version.org.jboss.weld.api}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <version>${version.org.jboss.weld.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>${version.org.jboss.weld.core}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.javax.faces.jsf-api}</version>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- <version>${version.jboss.profiler.jvmti}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <version>${version.google.guice}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <classifier>aopalliance</classifier>
- <version>${version.google.guice}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.byteman</groupId>
- <artifactId>byteman</artifactId>
- <version>${version.jboss.byteman}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>${version.org.jboss.ejb3.api}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${version.javax.validation}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- <version>${version.org.jboss.interceptor}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
- <version>${version.interceptor.api}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${version.slf4j}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <version>${version.org.jboss.weld.ri}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <!-- Repositories (needed to access the parent) -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <kernel.outputDirectory>target/classes</kernel.outputDirectory>
- <kernel.testOutputDirectory>target/test-classes</kernel.testOutputDirectory>
- </properties>
- </profile>
- <profile>
- <id>eclipse</id>
- <build>
- <defaultGoal>process-test-resources</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>eclipse</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>eclipse</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <downloadSources>true</downloadSources>
- <buildOutputDirectory>${kernel.outputDirectory}</buildOutputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <kernel.outputDirectory>eclipse-target/classes</kernel.outputDirectory>
- <kernel.testOutputDirectory>eclipse-target/tests-classes</kernel.testOutputDirectory>
- </properties>
- </profile>
-
- <profile>
- <id>assembly</id>
- <properties>
- <kernel.outputDirectory>target/classes</kernel.outputDirectory>
- <kernel.testOutputDirectory>target/test-classes</kernel.testOutputDirectory>
- </properties>
- </profile>
- </profiles>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
+ </parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>JBoss Microcontainer Kernel Parent POM</name>
+ <url>http://www.jboss.org/jbossmc/</url>
+ <description>
+ The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
+ and configuration.
+ </description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/kernel/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/kernel/trunk/</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/kernel/trunk/</url>
+ </scm>
+
+ <modules>
+ <module>dependency</module>
+ <module>kernel</module>
+ <module>jmx-mc-int</module>
+ <module>aop-mc-int</module>
+ <module>jmx-aop-mc-int</module>
+ <module>spring-int</module>
+ <module>guice-int</module>
+ <module>weld-int</module>
+ <module>build</module>
+ </modules>
+
+ <properties>
+ <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
+ <version.jboss.logging.spi>2.1.1.GA</version.jboss.logging.spi>
+ <version.jboss.logging.log4j>2.1.1.GA</version.jboss.logging.log4j>
+ <version.jbossxb>2.0.2.Beta4</version.jbossxb>
+ <version.jboss.man>2.1.1.SP1</version.jboss.man>
+ <version.jboss.vfs>2.2.0.Alpha2</version.jboss.vfs>
+ <version.javassist>3.11.0.GA</version.javassist>
+ <version.jboss.aop>2.1.0.CR3</version.jboss.aop>
+ <version.org.jboss.reflect>2.2.0.Alpha2</version.org.jboss.reflect>
+ <version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
+ <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
+ <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
+ <version.junit>4.4</version.junit>
+ <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
+ <version.ant.junit>1.6.5</version.ant.junit>
+ <version.jboss.drools>4.0.1</version.jboss.drools>
+ <version.jboss.jbpm>3.1.1</version.jboss.jbpm>
+ <version.google.guice>2.0</version.google.guice>
+ <version.jboss.byteman>1.0.3.CP01</version.jboss.byteman>
+ <version.org.jboss.ejb3.api>3.1.0-Alpha1</version.org.jboss.ejb3.api>
+ <version.javax.validation>1.0.CR3</version.javax.validation>
+ <version.javax.faces.jsf-api>1.2_12</version.javax.faces.jsf-api>
+ <version.org.jboss.weld.api>1.0</version.org.jboss.weld.api>
+ <version.org.jboss.weld.core>1.0.0</version.org.jboss.weld.core>
+ <version.org.jboss.interceptor>1.0.0-CR5</version.org.jboss.interceptor>
+ <version.interceptor.api>1.1-CR1</version.interceptor.api>
+ <version.slf4j>1.5.9.RC1</version.slf4j>
+ <version.javax.inject>1</version.javax.inject>
+ </properties>
+
+ <build>
+ <outputDirectory>${kernel.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${kernel.testOutputDirectory}</testOutputDirectory>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>2.0.9</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>1.5.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ <configuration>
+ <generateReleasePoms>false</generateReleasePoms>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/kernel/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.0.1</version>
+ <configuration>
+ <!-- No way to get resource directory using properties http://jira.codehaus.org/browse/MNG-3638 -->
+ <excludeFilterFile>${project.build.sourceDirectory}/../resources/findbugs/exclude.xml</excludeFilterFile>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencyManagement>
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-mbeanserver</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-spring-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-guice-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.jboss.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.log4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${version.jbossxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.org.jboss.reflect}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.org.jboss.mdr}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ <!-- FIXME http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4077827#4077827 -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${version.javassist}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.jboss.aop}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${version.javax.inject}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${version.org.jboss.weld.api}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <version>${version.org.jboss.weld.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>${version.org.jboss.weld.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.javax.faces.jsf-api}</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ <version>${version.jboss.profiler.jvmti}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>${version.google.guice}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>aopalliance</classifier>
+ <version>${version.google.guice}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman</artifactId>
+ <version>${version.jboss.byteman}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <version>${version.org.jboss.ejb3.api}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${version.javax.validation}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ <version>${version.org.jboss.interceptor}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ <version>${version.interceptor.api}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${version.slf4j}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
+ <classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <version>${version.org.jboss.weld.ri}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <!-- Repositories (needed to access the parent) -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <kernel.outputDirectory>target/classes</kernel.outputDirectory>
+ <kernel.testOutputDirectory>target/test-classes</kernel.testOutputDirectory>
+ </properties>
+ </profile>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <defaultGoal>process-test-resources</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>eclipse</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <buildOutputDirectory>${kernel.outputDirectory}</buildOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <kernel.outputDirectory>eclipse-target/classes</kernel.outputDirectory>
+ <kernel.testOutputDirectory>eclipse-target/tests-classes</kernel.testOutputDirectory>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>assembly</id>
+ <properties>
+ <kernel.outputDirectory>target/classes</kernel.outputDirectory>
+ <kernel.testOutputDirectory>target/test-classes</kernel.testOutputDirectory>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
Modified: projects/kernel/branches/resolver/spring-int/.classpath
===================================================================
--- projects/kernel/branches/resolver/spring-int/.classpath 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/spring-int/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: projects/kernel/branches/resolver/spring-int/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/spring-int/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/spring-int/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/spring-int/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:28 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/spring-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/spring-int/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/spring-int/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,43 +1,43 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-spring-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Spring Int</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Spring Integration</description>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-spring-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Spring Int</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Spring Integration</description>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: projects/kernel/branches/resolver/weld-int/.classpath
===================================================================
--- projects/kernel/branches/resolver/weld-int/.classpath 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/weld-int/.classpath 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: projects/kernel/branches/resolver/weld-int/.settings/org.maven.ide.eclipse.prefs (from rev 100253, projects/kernel/trunk/weld-int/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/kernel/branches/resolver/weld-int/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/kernel/branches/resolver/weld-int/.settings/org.maven.ide.eclipse.prefs 2010-02-02 14:49:47 UTC (rev 100255)
@@ -0,0 +1,9 @@
+#Fri Jan 29 14:10:28 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/kernel/branches/resolver/weld-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/weld-int/pom.xml 2010-02-02 13:54:35 UTC (rev 100254)
+++ projects/kernel/branches/resolver/weld-int/pom.xml 2010-02-02 14:49:47 UTC (rev 100255)
@@ -1,125 +1,125 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-mc-kernel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-weld-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Weld Int</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Weld Integration</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!--skip>true</skip-->
- <!--testFailureIgnore>true</testFailureIgnore-->
- <excludes>
- <exclude>org/jboss/test/kernel/weld/beanwrapper/test/BeanImplementationTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <optional>true</optional>
- </dependency>
-
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${version.javax.validation}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-mc-kernel</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-weld-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Weld Int</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Weld Integration</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--skip>true</skip-->
+ <!--testFailureIgnore>true</testFailureIgnore-->
+ <excludes>
+ <exclude>org/jboss/test/kernel/weld/beanwrapper/test/BeanImplementationTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${version.javax.validation}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ </dependencies>
+</project>
More information about the jboss-cvs-commits
mailing list