mcconnell 2004/02/23 05:30:00
Modified: merlin/activation/impl/src/test/conf secure.xml
merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test
CodeSecurityDisabledTestCase.java
CodeSecurityEnabledTestCase.java
merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components
AnotherTestComponent.java AnotherTestService.java
TestComponent.java TestService.java
Log:
Cleanup references in the code-secure test.
Revision Changes Path
1.7 +3 -3 avalon/merlin/activation/impl/src/test/conf/secure.xml
Index: secure.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/test/conf/secure.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- secure.xml 23 Feb 2004 13:00:31 -0000 1.6
+++ secure.xml 23 Feb 2004 13:30:00 -0000 1.7
@@ -23,18 +23,18 @@
<container name="Component1" >
<services>
- <service type="org.apache.avalon.activation.csi.grant.components.TestService">
+ <service type="org.apache.avalon.activation.impl.test.components.TestService">
<source>test</source>
</service>
</services>
<component name="test"
- class="org.apache.avalon.activation.csi.grant.components.TestComponent"
+ class="org.apache.avalon.activation.impl.test.components.TestComponent"
activation="startup"/>
</container>
<container name="Component2" >
<component name="anothertest"
-
class="org.apache.avalon.activation.csi.grant.components.AnotherTestComponent"
+
class="org.apache.avalon.activation.impl.test.components.AnotherTestComponent"
activation="startup">
</component>
</container>
1.2 +1 -1
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityDisabledTestCase.java
Index: CodeSecurityDisabledTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityDisabledTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CodeSecurityDisabledTestCase.java 23 Feb 2004 13:00:31 -0000 1.1
+++ CodeSecurityDisabledTestCase.java 23 Feb 2004 13:30:00 -0000 1.2
@@ -22,7 +22,7 @@
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.activation.csi.grant.components.TestService;
+import org.apache.avalon.activation.impl.test.components.TestService;
public class CodeSecurityDisabledTestCase extends AbstractTestCase
{
1.2 +2 -0
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityEnabledTestCase.java
Index: CodeSecurityEnabledTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/CodeSecurityEnabledTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CodeSecurityEnabledTestCase.java 23 Feb 2004 13:00:31 -0000 1.1
+++ CodeSecurityEnabledTestCase.java 23 Feb 2004 13:30:00 -0000 1.2
@@ -23,6 +23,8 @@
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.activation.impl.test.components.TestService;
+
public class CodeSecurityEnabledTestCase extends AbstractTestCase
{
//-------------------------------------------------------
1.2 +3 -3
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components/AnotherTestComponent.java
Index: AnotherTestComponent.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components/AnotherTestComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnotherTestComponent.java 23 Feb 2004 13:00:31 -0000 1.1
+++ AnotherTestComponent.java 23 Feb 2004 13:30:00 -0000 1.2
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.activation.csi.grant.components;
+package org.apache.avalon.activation.impl.test.components;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.Serviceable;
@@ -29,7 +29,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
* @avalon.component name="anothertest" lifestyle="singleton"
* @avalon.service
- * type="org.apache.avalon.activation.csi.grant.components.AnotherTestService"
+ * type="org.apache.avalon.activation.impl.test.components.AnotherTestService"
*/
public class AnotherTestComponent extends AbstractLogEnabled
implements AnotherTestService, Serviceable
@@ -40,7 +40,7 @@
* Service from the container.
*
* @avalon.dependency
- * type="org.apache.avalon.activation.csi.grant.components.TestService"
+ * type="org.apache.avalon.activation.impl.test.components.TestService"
* key="TestService"
*/
public void service( ServiceManager man )
1.2 +1 -1
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components/AnotherTestService.java
Index: AnotherTestService.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components/AnotherTestService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnotherTestService.java 23 Feb 2004 13:00:31 -0000 1.1
+++ AnotherTestService.java 23 Feb 2004 13:30:00 -0000 1.2
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.activation.csi.grant.components;
+package org.apache.avalon.activation.impl.test.components;
import java.io.File;
1.2 +2 -2
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components/TestComponent.java
Index: TestComponent.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components/TestComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestComponent.java 23 Feb 2004 13:00:31 -0000 1.1
+++ TestComponent.java 23 Feb 2004 13:30:00 -0000 1.2
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.activation.csi.grant.components;
+package org.apache.avalon.activation.impl.test.components;
import java.io.File;
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
* @avalon.component name="test" lifestyle="singleton"
- * @avalon.service
type="org.apache.avalon.activation.csi.grant.components.TestService"
+ * @avalon.service
type="org.apache.avalon.activation.impl.test.components.TestService"
*/
public class TestComponent extends AbstractLogEnabled
implements Contextualizable, TestService
1.2 +1 -1
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components/TestService.java
Index: TestService.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/components/TestService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestService.java 23 Feb 2004 13:00:31 -0000 1.1
+++ TestService.java 23 Feb 2004 13:30:00 -0000 1.2
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.activation.csi.grant.components;
+package org.apache.avalon.activation.impl.test.components;
import java.io.File;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
