Author: mcconnell
Date: Thu Jun 10 09:12:18 2004
New Revision: 21016
Added:
avalon/trunk/runtime/activation/api/build.properties (contents, props
changed)
avalon/trunk/runtime/activation/api/build.xml (contents, props changed)
Modified:
avalon/trunk/runtime/activation/api/ (props changed)
avalon/trunk/runtime/activation/impl/ (props changed)
avalon/trunk/runtime/activation/impl/build.properties
avalon/trunk/runtime/activation/impl/build.xml
avalon/trunk/runtime/activation/impl/etc/test/playground.xml
avalon/trunk/runtime/activation/impl/etc/test/secure.xml
avalon/trunk/runtime/activation/impl/etc/test/system/kernel.xml
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/AbstractTestCase.java
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityDisabledTestCase.java
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityEnabledTestCase.java
Log:
housekeeping
Added: avalon/trunk/runtime/activation/api/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/activation/api/build.properties Thu Jun 10
09:12:18 2004
@@ -0,0 +1,3 @@
+project.name = avalon-activation-api
+project.src.main = java
+project.home = ../../../central/system
Added: avalon/trunk/runtime/activation/api/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/activation/api/build.xml Thu Jun 10 09:12:18 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-activation-api" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Modified: avalon/trunk/runtime/activation/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/activation/impl/build.properties (original)
+++ avalon/trunk/runtime/activation/impl/build.properties Thu Jun 10
09:12:18 2004
@@ -1,3 +1,6 @@
+
project.name = avalon-activation-impl
project.src.main = java
project.home = ../../../central/system
+
+avalon.artifact.factory = org.apache.avalon.activation.impl.DefaultRuntime
Modified: avalon/trunk/runtime/activation/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/activation/impl/build.xml (original)
+++ avalon/trunk/runtime/activation/impl/build.xml Thu Jun 10 09:12:18 2004
@@ -6,6 +6,11 @@
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
+ <target name="init" depends="standard.init">
+ <x:filter key="avalon-logging-logkit-impl" feature="uri"
+ token="AVALON-LOGGING-LOGKIT-SPEC"/>
+ </target>
+
<target name="package" depends="standard.package">
<x:artifact/>
</target>
Modified: avalon/trunk/runtime/activation/impl/etc/test/playground.xml
==============================================================================
--- avalon/trunk/runtime/activation/impl/etc/test/playground.xml
(original)
+++ avalon/trunk/runtime/activation/impl/etc/test/playground.xml Thu Jun
10 09:12:18 2004
@@ -8,24 +8,24 @@
<categories priority="INFO"/>
<classloader>
- <classpath>
- <fileset dir="../test-classes"/>
+ <classpath>
+ <artifact>artifact:jar:avalon/test/avalon-test-playground</artifact>
</classpath>
</classloader>
<services>
- <service type="org.apache.avalon.playground.basic.BasicService"
version="1.1"/>
+ <service type="org.apache.avalon.test.playground.basic.BasicService"
version="1.1"/>
</services>
<container name="subsidiary">
<component name="complex"
- class="org.apache.avalon.playground.ComplexComponent">
+ class="org.apache.avalon.test.playground.ComplexComponent">
<categories priority="INFO"/>
</component>
<container name="test">
- <component name="simple"
class="org.apache.avalon.playground.SimpleComponent"/>
+ <component name="simple"
class="org.apache.avalon.test.playground.SimpleComponent"/>
</container>
</container>
@@ -36,15 +36,15 @@
-->
<!--
<component name="demo"
- class="org.apache.avalon.playground.DemoManager"/>
+ class="org.apache.avalon.test.playground.DemoManager"/>
<component name="exploitation"
- class="org.apache.avalon.playground.ExploitationManager"/>
+ class="org.apache.avalon.test.playground.ExploitationManager"/>
<component name="basic"
- class="org.apache.avalon.playground.basic.BasicComponent"
+ class="org.apache.avalon.test.playground.basic.BasicComponent"
activation="startup">
- <context class="org.apache.avalon.playground.basic.BasicContextImp">
+ <context class="org.apache.avalon.test.playground.basic.BasicContextImp">
<entry key="location">
<constructor>My Place</constructor>
</entry>
Modified: avalon/trunk/runtime/activation/impl/etc/test/secure.xml
==============================================================================
--- avalon/trunk/runtime/activation/impl/etc/test/secure.xml (original)
+++ avalon/trunk/runtime/activation/impl/etc/test/secure.xml Thu Jun 10
09:12:18 2004
@@ -6,8 +6,8 @@
<container name="root">
<classloader>
- <classpath>
- <fileset dir="."/>
+ <classpath>
+ <artifact>artifact:jar:avalon/test/avalon-test-components</artifact>
</classpath>
<grant>
<permission class="java.util.PropertyPermission" name="java.*" >
@@ -23,18 +23,18 @@
<container name="Component1" >
<services>
- <service
type="org.apache.avalon.activation.impl.test.components.TestService">
+ <service type="org.apache.avalon.test.components.TestService">
<source>test</source>
</service>
</services>
<component name="test"
- class="org.apache.avalon.activation.impl.test.components.TestComponent"
+ class="org.apache.avalon.test.components.TestComponent"
activation="startup"/>
</container>
<container name="Component2" >
<component name="anothertest"
-
class="org.apache.avalon.activation.impl.test.components.AnotherTestComponent"
+ class="org.apache.avalon.test.components.AnotherTestComponent"
activation="startup">
</component>
</container>
Modified: avalon/trunk/runtime/activation/impl/etc/test/system/kernel.xml
==============================================================================
--- avalon/trunk/runtime/activation/impl/etc/test/system/kernel.xml
(original)
+++ avalon/trunk/runtime/activation/impl/etc/test/system/kernel.xml Thu Jun
10 09:12:18 2004
@@ -9,7 +9,7 @@
<artifact spec="@AVALON-LOGGING-LOGKIT-SPEC@"/>
</system>
- <logging path="conf/system/logging.xml"/>
+ <logging path="system/logging.xml"/>
<security>
<profile name="default">
Modified:
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/AbstractTestCase.java
==============================================================================
---
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/AbstractTestCase.java
(original)
+++
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/AbstractTestCase.java
Thu Jun 10 09:12:18 2004
@@ -259,11 +259,17 @@
for( int i=0; i<children.length; i++ )
{
Configuration child = children[i];
- String spec = child.getAttribute( "spec" );
- Artifact artifact = Artifact.createArtifact( "artifact:" + spec );
+ String spec = getURI( child.getAttribute( "spec" ) );
+ Artifact artifact = Artifact.createArtifact( spec );
artifacts[i] = artifact;
}
return artifacts;
+ }
+
+ private static String getURI( String path )
+ {
+ if( path.startsWith( "artifact:" ) ) return path;
+ return "artifact:" + path;
}
protected ContainmentProfile setUpProfile( File file )
Modified:
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityDisabledTestCase.java
==============================================================================
---
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityDisabledTestCase.java
(original)
+++
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityDisabledTestCase.java
Thu Jun 10 09:12:18 2004
@@ -22,7 +22,7 @@
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.activation.impl.test.components.TestService;
+import org.apache.avalon.test.components.TestService;
public class CodeSecurityDisabledTestCase extends AbstractTestCase
{
Modified:
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityEnabledTestCase.java
==============================================================================
---
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityEnabledTestCase.java
(original)
+++
avalon/trunk/runtime/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityEnabledTestCase.java
Thu Jun 10 09:12:18 2004
@@ -19,11 +19,11 @@
import org.apache.avalon.composition.model.DeploymentModel;
+import org.apache.avalon.framework.activity.Disposable;
+
import org.apache.avalon.util.exception.ExceptionHelper;
-import org.apache.avalon.framework.activity.Disposable;
-
-import org.apache.avalon.activation.impl.test.components.TestService;
+import org.apache.avalon.test.components.TestService;
public class CodeSecurityEnabledTestCase extends AbstractTestCase
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
