Diff
Modified: java/nanocontainer/trunk/booter/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/booter/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/booter/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -9,17 +9,8 @@
<artifactId>nanocontainer-booter</artifactId>
<name>NanoContainer Booter</name>
<packaging>jar</packaging>
- <scm>
- <connection>scm:svn:https://svn.codehaus.org/picocontainer/java/nanocontainer/trunk/booter</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/picocontainer/java/nanocontainer/trunk/booter</developerConnection>
- <url>https://svn.codehaus.org/picocontainer/java/nanoocontainer/trunk/booter</url>
- </scm>
<dependencies>
<dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- </dependency>
- <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer</artifactId>
</dependency>
Modified: java/nanocontainer/trunk/booter/src/java/org/nanocontainer/booter/NanoContainerBooter.java (3150 => 3151)
--- java/nanocontainer/trunk/booter/src/java/org/nanocontainer/booter/NanoContainerBooter.java 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/booter/src/java/org/nanocontainer/booter/NanoContainerBooter.java 2006-12-26 22:44:03 UTC (rev 3151)
@@ -52,10 +52,10 @@
commonClassLoader );
Class nanoStandalone = hiddenClassLoader.loadClass("org.nanocontainer.Standalone");
- Constructor ctor = nanoStandalone.getConstructors()[0];
- System.out.println("NanoContainer-Booter: Booting...");
- ctor.newInstance(new Object[]{args});
- System.out.println("NanoContainer-Booter: Booted.");
+ Constructor constructor = nanoStandalone.getConstructors()[0];
+ System.out.println("NanoContainer Booter: Booting...");
+ constructor.newInstance(new Object[]{args});
+ System.out.println("NanoContainer Booter: Booted.");
}
Modified: java/nanocontainer/trunk/container/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/container/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/container/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -1,75 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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.nanocontainer</groupId>
- <artifactId>nanocontainer-parent</artifactId>
- <version>1.1-SNAPSHOT</version>
- </parent>
- <artifactId>nanocontainer</artifactId>
- <name>NanoContainer Core</name>
- <packaging>jar</packaging>
- <scm>
- <connection>scm:svn:https://svn.codehaus.org/picocontainer/java/nanocontainer/trunk/container</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/picocontainer/java/nanocontainer/trunk/container</developerConnection>
- <url>https://svn.codehaus.org/picocontainer/java/nanoocontainer/trunk/container</url>
- </scm>
+<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.nanocontainer</groupId>
+ <artifactId>nanocontainer-parent</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>nanocontainer</artifactId>
+ <name>NanoContainer Core</name>
+ <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </dependency>
- <!-- Test scoped dependencies -->
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer-gems</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>nanocontainer-testmodel</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <workingDirectory>${basedir}</workingDirectory>
- <systemProperties>
- <property>
- <name>testcomp.jar</name>
- <value>${basedir}/src/test-comp/TestComp.jar</value>
- </property>
- </systemProperties>
- <!-- Ignoring -->
- <excludes>
- <exclude>org/nanocontainer/script/jython/JythonContainerBuilderTestCase.java</exclude>
- <exclude>**/Abstract*Test.java</exclude>
- <exclude>**/Abstract*TestCase.java</exclude>
- </excludes>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </dependency>
+ <!-- test scoped dependencies -->
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer-gems</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-testmodel</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: java/nanocontainer/trunk/container-aop/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/container-aop/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/container-aop/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -27,18 +27,6 @@
<version>1.0-beta</version>
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- <optional>true</optional>
- </dependency>
- <!-- test scoped dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>nanocontainer-testmodel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>cglib</groupId>
<artifactId>cglib-asm</artifactId>
<version>1.0</version>
@@ -48,6 +36,16 @@
<artifactId>cglib</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <!-- test scoped dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-testmodel</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: java/nanocontainer/trunk/container-bsh/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/container-bsh/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/container-bsh/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -17,10 +17,6 @@
<artifactId>nanocontainer</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>nanocontainer-tck</artifactId>
- </dependency>
- <dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>2.0b4</version>
@@ -39,5 +35,11 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- test scoped dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-tck</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: java/nanocontainer/trunk/container-groovy/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/container-groovy/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/container-groovy/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -19,19 +19,12 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-aop</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>nanocontainer-tck</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>nanocontainer-testmodel</artifactId>
- </dependency>
- <dependency>
<groupId>groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.0-RC-01</version>
+ <version>1.0-RC-02</version>
<exclusions>
<exclusion>
<groupId>servletapi</groupId>
@@ -39,5 +32,16 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- test scoped dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-tck</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-testmodel</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: java/nanocontainer/trunk/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java (3150 => 3151)
--- java/nanocontainer/trunk/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java 2006-12-26 22:44:03 UTC (rev 3151)
@@ -537,8 +537,7 @@
" pico = builder.container {\n" +
" classPathElement(path:'this/path/does/not/exist.jar')\n" +
" component(class:\"FooBar\") " +
- " }" +
- "");
+ " }");
buildContainer(script, parent, ASSEMBLY_SCOPE);
fail("should have barfed with bad path exception");
@@ -552,15 +551,14 @@
public void testWithDynamicClassPath() {
DefaultNanoPicoContainer parent = new DefaultNanoPicoContainer();
Reader script = new StringReader(
- ""
- + " builder = new org.nanocontainer.script.groovy.GroovyNodeBuilder()\n"
- + " File testCompJar = org.nanocontainer.TestHelper.getTestCompJarFile()\n"
- + " compJarPath = testCompJar.getCanonicalPath()\n"
- + " child = null\n"
- + " pico = builder.container {\n"
- + " classPathElement(path:compJarPath)\n"
- + " component(class:\"TestComp\")\n"
- + " }" + "");
+ " builder = new org.nanocontainer.script.groovy.GroovyNodeBuilder()\n"
+ + " File testCompJar = org.nanocontainer.TestHelper.getTestCompJarFile()\n"
+ + " compJarPath = testCompJar.getCanonicalPath()\n"
+ + " child = null\n"
+ + " pico = builder.container {\n"
+ + " classPathElement(path:compJarPath)\n"
+ + " component(class:\"TestComp\")\n"
+ + " }");
MutablePicoContainer pico = (MutablePicoContainer) buildContainer(script, parent, ASSEMBLY_SCOPE);
@@ -642,12 +640,10 @@
} catch (ClassNotFoundException ex) {
fail("Unable to load test component from the jar using a url classloader");
}
- Reader script = new StringReader(
- ""
- + " pico = builder.container(parent:parent) {\n"
- + " component(class:\"TestComp\")\n"
- + " }"
- + "");
+ Reader script = new StringReader(""
+ + "pico = builder.container(parent:parent) {\n"
+ + " component(class:\"TestComp\")\n"
+ + "}");
PicoContainer pico = buildContainer(new GroovyContainerBuilder(script, classLoader), null, null);
assertNotNull(pico);
@@ -660,6 +656,7 @@
DefaultNanoPicoContainer parent = new DefaultNanoPicoContainer();
Reader script = new StringReader(
"import org.nanocontainer.script.NullNodeBuilderDecorationDelegate\n" +
+ "import org.nanocontainer.script.groovy.GroovyNodeBuilder\n" +
"import org.nanocontainer.testmodel.*\n" +
"builder = new GroovyNodeBuilder(new NullNodeBuilderDecorationDelegate(), GroovyNodeBuilder.PERFORM_ATTRIBUTE_VALIDATION)\n" +
"nano = builder.container {\n" +
@@ -681,6 +678,7 @@
DefaultNanoPicoContainer parent = new DefaultNanoPicoContainer();
Reader script = new StringReader(
"import org.nanocontainer.script.NullNodeBuilderDecorationDelegate\n" +
+ "import org.nanocontainer.script.groovy.GroovyNodeBuilder\n" +
"import org.nanocontainer.testmodel.*\n" +
"builder = new GroovyNodeBuilder(new NullNodeBuilderDecorationDelegate(), GroovyNodeBuilder.SKIP_ATTRIBUTE_VALIDATION)\n" +
"nano = builder.container {\n" +
Modified: java/nanocontainer/trunk/container-jruby/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/container-jruby/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/container-jruby/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -17,17 +17,20 @@
<artifactId>nanocontainer</artifactId>
</dependency>
<dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <!-- test scoped dependencies -->
+ <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-tck</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-testmodel</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby</artifactId>
- <version>0.9.1</version>
- </dependency>
</dependencies>
</project>
Modified: java/nanocontainer/trunk/container-jython/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/container-jython/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/container-jython/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -17,17 +17,37 @@
<artifactId>nanocontainer</artifactId>
</dependency>
<dependency>
+ <groupId>jython</groupId>
+ <artifactId>jython</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <!-- test scoped dependencies -->
+ <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-tck</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-testmodel</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>jython</groupId>
- <artifactId>jython</artifactId>
- <version>2.1</version>
- </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- FIXME: works when run in IDE but not via mvn -->
+ <excludes>
+ <exclude>
+ org/nanocontainer/script/jython/JythonContainerBuilderTestCase.java
+ </exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: java/nanocontainer/trunk/container-rhino/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/container-rhino/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/container-rhino/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -17,17 +17,20 @@
<artifactId>nanocontainer</artifactId>
</dependency>
<dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.5R4.1</version>
+ </dependency>
+ <!-- test scoped dependencies -->
+ <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-tck</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-testmodel</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.5R4.1</version>
- </dependency>
</dependencies>
</project>
Modified: java/nanocontainer/trunk/deployer/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/deployer/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/deployer/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -9,18 +9,8 @@
<artifactId>nanocontainer-deployer</artifactId>
<name>NanoContainer Deployer</name>
<packaging>jar</packaging>
- <scm>
- <connection>scm:svn:https://svn.codehaus.org/picocontainer/java/nanocontainer/trunk/deployer</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/picocontainer/java/nanocontainer/trunk/deployer</developerConnection>
- <url>https://svn.codehaus.org/picocontainer/java/nanoocontainer/trunk/deployer</url>
- </scm>
-
<dependencies>
<dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- </dependency>
- <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer</artifactId>
</dependency>
@@ -28,23 +18,28 @@
<groupId>commons-vfs</groupId>
<artifactId>commons-vfs</artifactId>
</dependency>
- <!-- Test scoped depedencies -->
+ <!-- Test scoped dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-booter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- FIXME: create target/nanodist/apps-->
+ <excludes>
+ <exclude>
+ org/nanocontainer/deployer/NanoContainerDeployerTestCase.java
+ </exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: java/nanocontainer/trunk/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -200,7 +200,7 @@
<artifactId>picocontainer-tck</artifactId>
<version>1.2</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-testmodel</artifactId>
@@ -311,9 +311,6 @@
<link>
http://proxytoys.codehaus.org/apidocs/
</link>
- <link>
- http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/apidocs/
- </link>
</links>
<stylesheet>maven</stylesheet>
<header>
@@ -328,8 +325,7 @@
<version>2.2</version>
<configuration>
<forkMode>once</forkMode>
- <printSummary>true</printSummary>
- <useFile>true</useFile>
+ <workingDirectory>${basedir}</workingDirectory>
<systemProperties>
<property>
<name>test.src.dir</name>
@@ -339,7 +335,21 @@
<name>java.awt.headless</name>
<value>true</value>
</property>
+ <property>
+ <name>testcomp.jar</name>
+ <value>
+ ${basedir}/../container/src/test-comp/TestComp.jar
+ </value>
+ </property>
</systemProperties>
+ <excludes>
+ <exclude>**/Abstract*Test.java</exclude>
+ <exclude>**/Abstract*TestCase.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
+ </includes>
</configuration>
</plugin>
<plugin>
Modified: java/nanocontainer/trunk/webcontainer/pom.xml (3150 => 3151)
--- java/nanocontainer/trunk/webcontainer/pom.xml 2006-12-26 21:41:02 UTC (rev 3150)
+++ java/nanocontainer/trunk/webcontainer/pom.xml 2006-12-26 22:44:03 UTC (rev 3151)
@@ -13,21 +13,29 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
+ <groupId>org.nanocontainer</groupId>
+ <artifactId>nanocontainer</artifactId>
</dependency>
<dependency>
+ <groupId>org.nanocontainer</groupId>
+ <artifactId>nanocontainer-groovy</artifactId>
+ </dependency>
+ <!-- test scoped dependencies -->
+ <dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer-gems</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.nanocontainer</groupId>
- <artifactId>nanocontainer</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-tck</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.nanocontainer</groupId>
- <artifactId>nanocontainer-groovy</artifactId>
- </dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-testmodel</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
