Diff
Modified: java/nanocontainer/trunk/booter/README.txt (3157 => 3158)
--- java/nanocontainer/trunk/booter/README.txt 2006-12-27 11:39:32 UTC (rev 3157)
+++ java/nanocontainer/trunk/booter/README.txt 2006-12-27 12:57:13 UTC (rev 3158)
@@ -2,5 +2,5 @@
mvn integration-test
cd target/booter
-sh nanocontainer.sh
+sh nanocontainer.sh -c composition.xml
Modified: java/nanocontainer/trunk/booter/pom.xml (3157 => 3158)
--- java/nanocontainer/trunk/booter/pom.xml 2006-12-27 11:39:32 UTC (rev 3157)
+++ java/nanocontainer/trunk/booter/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
@@ -21,6 +21,12 @@
<artifactId>commons-cli</artifactId>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.6.1</version>
+ <scope>integration-test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -30,7 +36,9 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.nanocontainer.booter.NanoContainerBooter</mainClass>
+ <mainClass>
+ org.nanocontainer.booter.NanoContainerBooter
+ </mainClass>
</manifest>
</archive>
</configuration>
@@ -49,7 +57,16 @@
<!-- Create test components -->
<mkdir
dir="${project.build.directory}/test-comps" />
+
<jar
+ jarfile="${project.build.directory}/test-comps/api.jar">
+ <fileset
+ dir="${project.build.directory}/test-classes/">
+ <include name="**/Bear.class" />
+ <include name="**/Honey.class" />
+ </fileset>
+ </jar>
+ <jar
jarfile="${project.build.directory}/test-comps/bearimpl.jar">
<fileset
dir="${project.build.directory}/test-classes/">
@@ -67,12 +84,16 @@
</fileset>
</jar>
- <!-- Copy to booter dist -->
+ <!-- Copy to booter bin dist -->
<copy
todir="${project.build.directory}/booter">
- <fileset dir="src/">
+ <fileset dir="src/bin">
+ <include name="booter.policy" />
<include name="nanocontainer.*" />
</fileset>
+ <fileset dir="src/test">
+ <include name="composition.*" />
+ </fileset>
<filterset>
<filter token="VER"
value="${pom.version}" />
@@ -80,9 +101,6 @@
</copy>
<copy
todir="${project.build.directory}/booter/lib">
- <fileset dir="src/">
- <include name="booter.policy" />
- </fileset>
<fileset
dir="${project.build.directory}">
<include
@@ -115,7 +133,9 @@
<artifactItems>
<artifactItem>
<groupId>${pom.groupId}</groupId>
- <artifactId>nanocontainer</artifactId>
+ <artifactId>
+ nanocontainer
+ </artifactId>
</artifactItem>
</artifactItems>
<outputDirectory>
Copied: java/nanocontainer/trunk/booter/src/bin/booter.policy (from rev 3157, java/nanocontainer/trunk/booter/src/booter.policy) (0 => 3158)
--- java/nanocontainer/trunk/booter/src/bin/booter.policy (rev 0)
+++ java/nanocontainer/trunk/booter/src/bin/booter.policy 2006-12-27 12:57:13 UTC (rev 3158)
@@ -0,0 +1,16 @@
+// For lib/common
+grant codeBase "file:lib${/}common${/}*" {
+ permission java.security.AllPermission;
+};
+
+// For lib/hidden
+grant codeBase "file:lib${/}hidden${/}*" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:lib${/}*" {
+ permission java.security.AllPermission;
+};
+
+
+
Copied: java/nanocontainer/trunk/booter/src/bin/nanocontainer.bat (from rev 3157, java/nanocontainer/trunk/booter/src/nanocontainer.bat) (0 => 3158)
--- java/nanocontainer/trunk/booter/src/bin/nanocontainer.bat (rev 0)
+++ java/nanocontainer/trunk/booter/src/bin/nanocontainer.bat 2006-12-27 12:57:13 UTC (rev 3158)
@@ -0,0 +1,5 @@
+REM NanoContainer Booter script v @VER@
+REM www.nanocontainer.org
+
+java -Djava.security.manager -Djava.security.policy=file:booter.policy -jar lib\nanocontainer-booter-@VER@.jar $@
+
Copied: java/nanocontainer/trunk/booter/src/bin/nanocontainer.sh (from rev 3157, java/nanocontainer/trunk/booter/src/nanocontainer.sh) (0 => 3158)
--- java/nanocontainer/trunk/booter/src/bin/nanocontainer.sh (rev 0)
+++ java/nanocontainer/trunk/booter/src/bin/nanocontainer.sh 2006-12-27 12:57:13 UTC (rev 3158)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# NanoContainer Booter script v @VER@
+# www.nanocontainer.org
+
+EXEC="$JAVA_HOME/bin/java -Djava.security.manager -Djava.security.policy=file:booter.policy -jar lib/nanocontainer-booter-@VER@.jar $@"
+echo $EXEC
+$EXEC
+
Deleted: java/nanocontainer/trunk/booter/src/booter.policy (3157 => 3158)
--- java/nanocontainer/trunk/booter/src/booter.policy 2006-12-27 11:39:32 UTC (rev 3157)
+++ java/nanocontainer/trunk/booter/src/booter.policy 2006-12-27 12:57:13 UTC (rev 3158)
@@ -1,16 +0,0 @@
-// For PicoContainer and others in lib/common
-grant codeBase "file:lib${/}common${/}*" {
- permission java.security.AllPermission;
-};
-
-// For NanoContainer, Groovy, AST and others in lib/hidden
-grant codeBase "file:lib${/}hidden${/}*" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:lib${/}nanocontainer-booter.jar" {
- permission java.security.AllPermission;
-};
-
-
-
Deleted: java/nanocontainer/trunk/booter/src/nanocontainer.bat (3157 => 3158)
--- java/nanocontainer/trunk/booter/src/nanocontainer.bat 2006-12-27 11:39:32 UTC (rev 3157)
+++ java/nanocontainer/trunk/booter/src/nanocontainer.bat 2006-12-27 12:57:13 UTC (rev 3158)
@@ -1,5 +0,0 @@
-REM NanoContainer Booter script v @VER@
-REM www.nanocontainer.org
-
-java -Djava.security.manager -Djava.security.policy=file:lib\booter.policy -jar lib\nanocontainer-booter-@VER@.jar $@
-
Deleted: java/nanocontainer/trunk/booter/src/nanocontainer.sh (3157 => 3158)
--- java/nanocontainer/trunk/booter/src/nanocontainer.sh 2006-12-27 11:39:32 UTC (rev 3157)
+++ java/nanocontainer/trunk/booter/src/nanocontainer.sh 2006-12-27 12:57:13 UTC (rev 3158)
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# NanoContainer Booter script v @VER@
-# www.nanocontainer.org
-
-EXEC="$JAVA_HOME/bin/java -Djava.security.manager -Djava.security.policy=file:lib/booter.policy -jar lib/nanocontainer-booter-@VER@.jar $@"
-echo $EXEC
-$EXEC
-
Modified: java/nanocontainer/trunk/booter/src/test/composition.groovy (3157 => 3158)
--- java/nanocontainer/trunk/booter/src/test/composition.groovy 2006-12-27 11:39:32 UTC (rev 3157)
+++ java/nanocontainer/trunk/booter/src/test/composition.groovy 2006-12-27 12:57:13 UTC (rev 3158)
@@ -1,13 +1,13 @@
import org.nanocontainer.reflection.ImplementationHidingNanoPicoContainer
pico = builder.container(parent:parent, class:ImplementationHidingNanoPicoContainer) {
- classPathElement(path:"comps/api.jar")
+ classPathElement(path:"lib/hidden/api.jar")
classLoader {
- classPathElement(path:"comps/honeyimpl.jar")
+ classPathElement(path:"lib/hidden/honeyimpl.jar")
component(classNameKey:"org.nanocontainer.booter.Honey", class:"org.nanocontainer.booter.BeeHiveHoney")
}
classLoader {
- classPathElement(path:"comps/bearimpl.jar") {
+ classPathElement(path:"lib/hidden/bearimpl.jar") {
grant(new java.net.SocketPermission("yahoo.com:80", "connect"))
}
component(class:"org.nanocontainer.booter.BrownBear")
Modified: java/nanocontainer/trunk/booter/src/test/composition.xml (3157 => 3158)
--- java/nanocontainer/trunk/booter/src/test/composition.xml 2006-12-27 11:39:32 UTC (rev 3157)
+++ java/nanocontainer/trunk/booter/src/test/composition.xml 2006-12-27 12:57:13 UTC (rev 3158)
@@ -2,17 +2,17 @@
<container>
<classpath>
- <element file="comps/api.jar"/>
+ <element file="lib/hidden/api.jar"/>
</classpath>
<classloader>
<classpath>
- <element file="comps/honeyimpl.jar"/>
+ <element file="lib/hidden/honeyimpl.jar"/>
</classpath>
<component key="org.nanocontainer.booter.Honey" class="org.nanocontainer.booter.BeeHiveHoney"/>
</classloader>
<classloader>
<classpath>
- <element file="comps/bearimpl.jar">
+ <element file="lib/hidden/bearimpl.jar">
<grant classname="java.net.SocketPermission" context="yahoo.com:80" value="connect"/>
</element>
</classpath>
