Author: jawi
Date: Wed Jul 11 07:21:46 2012
New Revision: 1360039
URL: http://svn.apache.org/viewvc?rev=1360039&view=rev
Log:
Fixed integration base test class and the authentication itests.
Modified:
ace/sandbox/marrs/org.apache.ace.authentication.api/ (props changed)
ace/sandbox/marrs/org.apache.ace.authentication.itest/ (props changed)
ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd
ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java
ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/ (props
changed)
ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd
ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
ace/sandbox/marrs/org.apache.ace.http.itest/ (props changed)
ace/sandbox/marrs/org.apache.ace.itest/ (props changed)
ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd
ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java
ace/sandbox/marrs/org.apache.ace.log.itest/ (props changed)
ace/sandbox/marrs/run-target/target.bndrun
Propchange: ace/sandbox/marrs/org.apache.ace.authentication.api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jul 11 07:21:46 2012
@@ -2,4 +2,5 @@ bin
bin_test
generated
.metadata
+.settings
Propchange: ace/sandbox/marrs/org.apache.ace.authentication.itest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 11 07:21:46 2012
@@ -0,0 +1,4 @@
+bin
+bin_test
+generated
+
Modified: ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd?rev=1360039&r1=1360038&r2=1360039&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd Wed Jul 11
07:21:46 2012
@@ -17,89 +17,53 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
org.apache.ace.identification.property;version=latest,\
org.apache.ace.httplistener;version=latest,\
org.apache.ace.obr.storage;version=latest
--runrequire: bundle:(symbolicname=org.apache.felix.dependencymanager),\
- bundle:(symbolicname=org.apache.felix.configadmin),\
- bundle:(symbolicname=org.apache.felix.eventadmin),\
- bundle:(symbolicname=org.knopflerfish.bundle.useradmin),\
- bundle:(symbolicname=org.knopflerfish.log),\
- bundle:(symbolicname=org.apache.ace.authentication),\
- bundle:(symbolicname=org.apache.ace.authenticationprocessor.basicauth),\
- bundle:(symbolicname=org.apache.ace.connectionfactory),\
- bundle:(symbolicname=org.apache.ace.range.api),\
- bundle:(symbolicname=org.apache.ace.discovery.api),\
- bundle:(symbolicname=org.apache.ace.discovery.property),\
- bundle:(symbolicname=org.apache.ace.identification.api),\
- bundle:(symbolicname=org.apache.ace.identification.property),\
- bundle:(symbolicname=org.apache.ace.log),\
- bundle:(symbolicname=org.apache.ace.log.listener),\
- bundle:(symbolicname=org.apache.ace.log.servlet),\
- bundle:(symbolicname=org.apache.ace.server.log.store),\
- bundle:(symbolicname=org.apache.ace.log.task),\
- bundle:(symbolicname=org.apache.ace.gateway.log),\
- bundle:(symbolicname=org.apache.ace.gateway.log.store),\
- bundle:(symbolicname=org.apache.ace.httplistener),\
- bundle:(symbolicname=org.apache.ace.repository.api),\
- bundle:(symbolicname=org.apache.ace.repository.impl),\
- bundle:(symbolicname=org.apache.ace.repository.servlet),\
- bundle:(symbolicname=org.apache.ace.configurator.serveruseradmin),\
- bundle:(symbolicname=org.apache.ace.obr.metadata),\
- bundle:(symbolicname=org.apache.ace.obr.servlet),\
- bundle:(symbolicname=org.apache.ace.obr.storage),\
- bundle:(symbolicname=org.apache.ace.client.repository.api),\
- bundle:(symbolicname=org.apache.ace.client.repository.impl),\
- bundle:(symbolicname=org.apache.ace.client.repository.helper.base),\
- bundle:(symbolicname=org.apache.ace.client.repository.helper.bundle),\
-
bundle:(symbolicname=org.apache.ace.client.repository.helper.configuration),\
- bundle:(symbolicname=org.apache.ace.scheduler),\
- bundle:(symbolicname=org.apache.ace.resourceprocessor.useradmin),\
- bundle:(symbolicname=org.apache.ace.configurator.useradmin.task),\
- bundle:(symbolicname=org.apache.felix.shell.tui),\
- bundle:(symbolicname=org.apache.ace.itest),\
- bundle:(symbolicname=org.apache.felix.http.jetty)
-runfw: org.apache.felix.framework;version='[4,5)'
--runbundles:
org.apache.ace.obr.storage;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.obr.storage/generated/org.apache.ace.obr.storage.jar;version=latest,\
-
org.apache.ace.itest;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
-
org.apache.felix.dependencymanager;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.1.0,3.1.1)',\
-
org.apache.felix.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.shell/org.apache.felix.shell-1.4.2.jar;version='[1.4.2,1.4.3)',\
-
org.knopflerfish.bundle.useradmin;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.knopflerfish.bundle.useradmin/org.knopflerfish.bundle.useradmin-2.0.2.jar;version='[2.0.2,2.0.3)',\
-
org.apache.ace.client.repository.helper.configuration;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.helper.configuration/generated/org.apache.ace.client.repository.helper.configuration.jar;version=latest,\
-
org.apache.ace.configurator.useradmin.task;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.configurator.useradmin.task/generated/org.apache.ace.configurator.useradmin.task.jar;version=latest,\
-
org.apache.ace.identification.property;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.identification.property/generated/org.apache.ace.identification.property.jar;version=latest,\
+-runbundles: \
+
osgi.cmpn;resolution=http://bundles.bndtools.org.s3.amazonaws.com/osgi.cmpn/osgi.cmpn-4.2.1.jar;version='[4.2.1,4.2.2)',\
+
org.knopflerfish.bundle.useradmin;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.knopflerfish.bundle.useradmin/org.knopflerfish.bundle.useradmin-2.0.2.jar;version='[2.0.2,2.0.3)',\
+
org.knopflerfish.log;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.knopflerfish.log/org.knopflerfish.log-2.0.2.jar;version='[2.0.2,2.0.3)',\
+
org.apache.felix.dependencymanager;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.1.0,3.1.1)',\
+
org.apache.felix.dependencymanager.shell;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.0.1,3.0.2)',\
org.apache.felix.configadmin;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.configadmin/org.apache.felix.configadmin-1.2.8.jar;version='[1.2.8,1.2.9)',\
-
org.apache.ace.httplistener;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.httplistener/generated/org.apache.ace.httplistener.jar;version=latest,\
-
org.apache.ace.log.listener;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.log.listener/generated/org.apache.ace.log.listener.jar;version=latest,\
-
org.apache.ace.obr.servlet;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.obr.servlet/generated/org.apache.ace.obr.servlet.jar;version=latest,\
-
org.apache.ace.deployment.provider.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.provider.api/generated/org.apache.ace.deployment.provider.api.jar;version=latest,\
-
org.apache.ace.scheduler;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.scheduler/generated/org.apache.ace.scheduler.jar;version=latest,\
-
org.apache.ace.log.servlet;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.log.servlet/generated/org.apache.ace.log.servlet.jar;version=latest,\
-
org.apache.ace.gateway.log;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.gateway.log/generated/org.apache.ace.gateway.log.jar;version=latest,\
-
org.apache.ace.obr.metadata;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.obr.metadata/generated/org.apache.ace.obr.metadata.jar;version=latest,\
-
org.apache.ace.authentication.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.authentication.api/generated/org.apache.ace.authentication.api.jar;version=latest,\
-
org.knopflerfish.log;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.knopflerfish.log/org.knopflerfish.log-2.0.2.jar;version='[2.0.2,2.0.3)',\
+
org.apache.felix.eventadmin;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar;version='[1.2.14,1.2.15)',\
+
org.apache.felix.prefs;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar;version='[1.0.4,1.0.5)',\
org.apache.felix.http.jetty;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.0.jar;version='[2.2.0,2.2.1)',\
-
org.apache.ace.client.repository.impl;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.impl/generated/org.apache.ace.client.repository.impl.jar;version=latest,\
-
org.apache.ace.connectionfactory;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.connectionfactory/generated/org.apache.ace.connectionfactory.jar;version=latest,\
-
org.apache.ace.authentication;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.authentication/generated/org.apache.ace.authentication.jar;version=latest,\
-
org.apache.ace.client.repository.helper.bundle;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.helper.bundle/generated/org.apache.ace.client.repository.helper.bundle.jar;version=latest,\
-
org.apache.ace.discovery.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.discovery.api/generated/org.apache.ace.discovery.api.jar;version=latest,\
+
org.apache.felix.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.shell/org.apache.felix.shell-1.4.2.jar;version='[1.4.2,1.4.3)',\
org.apache.felix.shell.tui;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.shell.tui/org.apache.felix.shell.tui-1.4.1.jar;version='[1.4.1,1.4.2)',\
-
org.apache.ace.configurator.serveruseradmin;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.configurator.serveruseradmin/generated/org.apache.ace.configurator.serveruseradmin.jar;version=latest,\
-
org.apache.ace.range.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.range.api/generated/org.apache.ace.range.api.jar;version=latest,\
-
org.apache.ace.repository.impl;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.repository.impl/generated/org.apache.ace.repository.impl.jar;version=latest,\
-
org.apache.ace.discovery.property;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.discovery.property/generated/org.apache.ace.discovery.property.jar;version=latest,\
-
org.apache.ace.log.task;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.log.task/generated/org.apache.ace.log.task.jar;version=latest,\
-
org.apache.ace.log;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.log/generated/org.apache.ace.log.jar;version=latest,\
-
osgi.cmpn;resolution=http://bundles.bndtools.org.s3.amazonaws.com/osgi.cmpn/osgi.cmpn-4.2.1.jar;version='[4.2.1,4.2.2)',\
-
org.apache.ace.identification.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.identification.api/generated/org.apache.ace.identification.api.jar;version=latest,\
-
org.apache.ace.util;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.util/generated/org.apache.ace.util.jar;version=latest,\
-
org.apache.ace.resourceprocessor.useradmin;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.resourceprocessor.useradmin/generated/org.apache.ace.resourceprocessor.useradmin.jar;version=latest,\
-
org.apache.ace.gateway.log.store;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.gateway.log.store/generated/org.apache.ace.gateway.log.store.jar;version=latest,\
-
org.apache.felix.eventadmin;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar;version='[1.2.14,1.2.15)',\
-
org.apache.ace.authenticationprocessor.basicauth;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.authenticationprocessor.basicauth/generated/org.apache.ace.authenticationprocessor.basicauth.jar;version=latest,\
-
org.apache.ace.client.repository.helper.base;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.helper.base/generated/org.apache.ace.client.repository.helper.base.jar;version=latest,\
-
org.apache.ace.managementagent;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.managementagent/generated/org.apache.ace.managementagent.jar;version=latest,\
-
org.apache.ace.repository.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.repository.api/generated/org.apache.ace.repository.api.jar;version=latest,\
-
org.apache.ace.client.repository.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.api/generated/org.apache.ace.client.repository.api.jar;version=latest,\
-
org.apache.ace.server.log.store;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.server.log.store/generated/org.apache.ace.server.log.store.jar;version=latest,\
-
org.apache.ace.repository.servlet;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.repository.servlet/generated/org.apache.ace.repository.servlet.jar;version=latest
-Private-Package: org.apache.ace.it.authentication
\ No newline at end of file
+
org.apache.ace.discovery.property;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.discovery.property/generated/org.apache.ace.discovery.property.jar;version=latest,\
+
org.apache.ace.log.task;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.log.task/generated/org.apache.ace.log.task.jar;version=latest,\
+
org.apache.ace.log;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.log/generated/org.apache.ace.log.jar;version=latest,\
+
org.apache.ace.client.repository.helper.bundle;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.helper.bundle/generated/org.apache.ace.client.repository.helper.bundle.jar;version=latest,\
+
org.apache.ace.discovery.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.discovery.api/generated/org.apache.ace.discovery.api.jar;version=latest,\
+
org.apache.ace.configurator.serveruseradmin;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.configurator.serveruseradmin/generated/org.apache.ace.configurator.serveruseradmin.jar;version=latest,\
+
org.apache.ace.range.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.range.api/generated/org.apache.ace.range.api.jar;version=latest,\
+
org.apache.ace.repository.impl;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.repository.impl/generated/org.apache.ace.repository.impl.jar;version=latest,\
+
org.apache.ace.authenticationprocessor.basicauth;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.authenticationprocessor.basicauth/generated/org.apache.ace.authenticationprocessor.basicauth.jar;version=latest,\
+
org.apache.ace.client.repository.helper.base;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.helper.base/generated/org.apache.ace.client.repository.helper.base.jar;version=latest,\
+
org.apache.ace.repository.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.repository.api/generated/org.apache.ace.repository.api.jar;version=latest,\
+
org.apache.ace.client.repository.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.api/generated/org.apache.ace.client.repository.api.jar;version=latest,\
+
org.apache.ace.server.log.store;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.server.log.store/generated/org.apache.ace.server.log.store.jar;version=latest,\
+
org.apache.ace.repository.servlet;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.repository.servlet/generated/org.apache.ace.repository.servlet.jar;version=latest,\
+
org.apache.ace.identification.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.identification.api/generated/org.apache.ace.identification.api.jar;version=latest,\
+
org.apache.ace.util;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.util/generated/org.apache.ace.util.jar;version=latest,\
+
org.apache.ace.resourceprocessor.useradmin;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.resourceprocessor.useradmin/generated/org.apache.ace.resourceprocessor.useradmin.jar;version=latest,\
+
org.apache.ace.gateway.log.store;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.gateway.log.store/generated/org.apache.ace.gateway.log.store.jar;version=latest,\
+
org.apache.ace.httplistener;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.httplistener/generated/org.apache.ace.httplistener.jar;version=latest,\
+
org.apache.ace.obr.storage;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.obr.storage/generated/org.apache.ace.obr.storage.jar;version=latest,\
+
org.apache.ace.itest;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
+
org.apache.ace.client.repository.helper.configuration;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.helper.configuration/generated/org.apache.ace.client.repository.helper.configuration.jar;version=latest,\
+
org.apache.ace.configurator.useradmin.task;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.configurator.useradmin.task/generated/org.apache.ace.configurator.useradmin.task.jar;version=latest,\
+
org.apache.ace.identification.property;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.identification.property/generated/org.apache.ace.identification.property.jar;version=latest,\
+
org.apache.ace.gateway.log;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.gateway.log/generated/org.apache.ace.gateway.log.jar;version=latest,\
+
org.apache.ace.obr.metadata;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.obr.metadata/generated/org.apache.ace.obr.metadata.jar;version=latest,\
+
org.apache.ace.authentication.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.authentication.api/generated/org.apache.ace.authentication.api.jar;version=latest,\
+
org.apache.ace.client.repository.impl;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.impl/generated/org.apache.ace.client.repository.impl.jar;version=latest,\
+
org.apache.ace.connectionfactory;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.connectionfactory/generated/org.apache.ace.connectionfactory.jar;version=latest,\
+
org.apache.ace.authentication;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.authentication/generated/org.apache.ace.authentication.jar;version=latest,\
+
org.apache.ace.log.listener;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.log.listener/generated/org.apache.ace.log.listener.jar;version=latest,\
+
org.apache.ace.obr.servlet;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.obr.servlet/generated/org.apache.ace.obr.servlet.jar;version=latest,\
+
org.apache.ace.deployment.provider.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.deployment.provider.api/generated/org.apache.ace.deployment.provider.api.jar;version=latest,\
+
org.apache.ace.scheduler;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.scheduler/generated/org.apache.ace.scheduler.jar;version=latest,\
+
org.apache.ace.log.servlet;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.log.servlet/generated/org.apache.ace.log.servlet.jar;version=latest
+Private-Package: org.apache.ace.it.authentication
+-runvm: -Dorg.osgi.service.http.port=9000
\ No newline at end of file
Modified:
ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java?rev=1360039&r1=1360038&r2=1360039&view=diff
==============================================================================
---
ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
(original)
+++
ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
Wed Jul 11 07:21:46 2012
@@ -29,14 +29,14 @@ import java.util.concurrent.TimeUnit;
import org.apache.ace.client.repository.SessionFactory;
import org.apache.ace.connectionfactory.ConnectionFactory;
+import org.apache.ace.discovery.property.constants.DiscoveryConstants;
import org.apache.ace.http.listener.constants.HttpConstants;
+import
org.apache.ace.identification.property.constants.IdentificationConstants;
import org.apache.ace.log.Log;
import org.apache.ace.log.LogDescriptor;
import org.apache.ace.log.LogEvent;
import org.apache.ace.repository.Repository;
import org.apache.ace.repository.impl.constants.RepositoryConstants;
-import org.apache.ace.discovery.property.constants.*;
-import org.apache.ace.identification.property.constants.*;
import org.apache.ace.server.log.store.LogStore;
import org.apache.ace.test.constants.TestConstants;
import org.apache.felix.dm.Component;
@@ -55,6 +55,8 @@ public class LogAuthenticationTest exten
private static final String HOST = "localhost";
private static final String TARGET_ID = "target-id";
+
+ private String m_configurationPID;
private volatile Log m_auditLog;
private volatile LogStore m_serverStore;
@@ -64,87 +66,6 @@ public class LogAuthenticationTest exten
private volatile ConnectionFactory m_connectionFactory;
/**
- * @return the PAX Exam configuration options, never <code>null</code>.
- */
-// @Configuration
-// public Option[] configuration() {
-// return options(
-// systemProperty("org.osgi.service.http.port").value("" +
TestConstants.PORT),
-// new CleanCachesOption(),
-// junitBundles(),
-// provision(
-// // Misc bundles...
-// Osgi.compendium(),
-// Felix.dependencyManager(),
-// jetty(),
-// Felix.configAdmin(),
-// Felix.preferences(),
-// Felix.eventAdmin(),
-// Knopflerfish.useradmin(),
-// Knopflerfish.log(),
-// // ACE core bundles...
-// Ace.util(),
-// Ace.authentication(),
-// Ace.authenticationProcessorBasicAuth(),
-// Ace.connectionFactory(),
-// Ace.rangeApi(),
-// Ace.discoveryApi(),
-// Ace.discoveryProperty(),
-// Ace.identificationApi(),
-// Ace.identificationProperty(),
-// Ace.log(),
-// Ace.logListener(),
-// Ace.logServlet(),
-// Ace.serverLogStore(),
-// Ace.logTask(),
-// Ace.targetLog(),
-// Ace.targetLogStore(),
-// Ace.httplistener(),
-// Ace.repositoryApi(),
-// Ace.repositoryImpl(),
-// Ace.repositoryServlet(),
-// Ace.configuratorServeruseradmin(),
-// Ace.obrMetadata(),
-// Ace.obrServlet(),
-// Ace.obrStorage(),
-// Ace.clientRepositoryApi(),
-// Ace.clientRepositoryImpl(),
-// Ace.clientRepositoryHelperBase(),
-// Ace.clientRepositoryHelperBundle(),
-// Ace.clientRepositoryHelperConfiguration(),
-// Ace.scheduler(),
-// Ace.resourceprocessorUseradmin(),
-// Ace.configuratorUseradminTask()
-// )
-// );
-// }
-
- public void setUp() throws Exception {
- super.setUp();
-
- String baseURL = "http://"; + HOST + ":" + TestConstants.PORT;
-
- URL testURL = new URL(baseURL.concat(AUDITLOG_ENDPOINT));
- assertTrue("Failed to access auditlog in time!",
waitForURL(m_connectionFactory, testURL, 401, 15000));
-
- String userName = "d";
- String password = "f";
-
- importSingleUser(m_userRepository, userName, password);
- waitForUser(m_userAdmin, userName);
-
- configureFactory("org.apache.ace.connectionfactory",
- "authentication.baseURL", baseURL.concat(AUDITLOG_ENDPOINT),
- "authentication.type", "basic",
- "authentication.user.name", userName,
- "authentication.user.password", password);
-
- assertTrue("Failed to access auditlog in time!",
waitForURL(m_connectionFactory, testURL, 200, 15000));
-
- before();
- }
-
- /**
* Tests that accessing the log servlet with authentication works when
given the right credentials.
*/
public void testAccessLogServletWithCorrectCredentialsOk() throws
Exception {
@@ -160,7 +81,7 @@ public class LogAuthenticationTest exten
List<String> result = getResponse("http://localhost:"; +
TestConstants.PORT + "/auditlog/query");
assert result.size() > 1 : "We expect at least two logs on the
server.";
}
-
+
/**
* Tests that the log synchronization works when the log servlet has
authentication enabled.
*/
@@ -176,7 +97,7 @@ public class LogAuthenticationTest exten
boolean found = false;
long startTime = System.currentTimeMillis();
- long waitTime = 5000; // milliseconds
+ long waitTime = 15000; // milliseconds
while (!found && ((System.currentTimeMillis() - startTime) <
waitTime)) {
// synchronize again
@@ -188,15 +109,17 @@ public class LogAuthenticationTest exten
continue;
}
- List<LogEvent> events = m_serverStore.get(ranges2.get(0));
- for (LogEvent event : events) {
- if (event.getType() == type) {
- Dictionary properties = event.getProperties();
- assertEquals("value1", properties.get("one"));
- assertEquals("value2", properties.get("two"));
- found = true;
- break;
- }
+ for (LogDescriptor descriptor : ranges2) {
+ List<LogEvent> events = m_serverStore.get(descriptor);
+ for (LogEvent event : events) {
+ if (event.getType() == type) {
+ Dictionary properties = event.getProperties();
+ assertEquals("value1", properties.get("one"));
+ assertEquals("value2", properties.get("two"));
+ found = true;
+ break;
+ }
+ }
}
// wait if we have not found anything yet
@@ -208,11 +131,34 @@ public class LogAuthenticationTest exten
assertTrue("We could not retrieve our audit log event (after 5
seconds).", found);
}
+ @Override
+ protected void after() throws Exception {
+ String baseURL = "http://"; + HOST + ":" + TestConstants.PORT;
+
+ URL testURL = new URL(baseURL.concat(AUDITLOG_ENDPOINT));
+ assertTrue("Failed to access auditlog in time!",
waitForURL(m_connectionFactory, testURL, 401, 15000));
+
+ String userName = "d";
+ String password = "f";
+
+ importSingleUser(m_userRepository, userName, password);
+ waitForUser(m_userAdmin, userName);
+
+ m_configurationPID =
configureFactory("org.apache.ace.connectionfactory",
+ "authentication.baseURL", baseURL.concat(AUDITLOG_ENDPOINT),
+ "authentication.type", "basic",
+ "authentication.user.name", userName,
+ "authentication.user.password", password);
+
+ assertTrue("Failed to access auditlog in time!",
waitForURL(m_connectionFactory, testURL, 200, 15000));
+
+ before();
+ }
+
/**
* {@inheritDoc}
*/
protected void before() throws Exception {
-
String baseURL = "http://"; + HOST + ":" + TestConstants.PORT;
getService(SessionFactory.class).createSession("test-session-ID");
@@ -253,18 +199,26 @@ public class LogAuthenticationTest exten
*/
protected Component[] getDependencies() {
return new Component[] {
- createComponent()
- .setImplementation(this)
-
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
- .add(createServiceDependency()
- .setService(Repository.class, "(&(" +
RepositoryConstants.REPOSITORY_NAME + "=users)(" +
RepositoryConstants.REPOSITORY_CUSTOMER + "=apache))")
- .setRequired(true))
-
.add(createServiceDependency().setService(ConnectionFactory.class).setRequired(true))
-
.add(createServiceDependency().setService(HttpService.class).setRequired(true))
- .add(createServiceDependency().setService(Log.class, "(&(" +
Constants.OBJECTCLASS + "=" + Log.class.getName() +
")(name=auditlog))").setRequired(true))
- .add(createServiceDependency().setService(LogStore.class,
"(&(" + Constants.OBJECTCLASS + "=" + LogStore.class.getName() +
")(name=auditlog))").setRequired(true))
- .add(createServiceDependency().setService(Runnable.class,
"(&(" + Constants.OBJECTCLASS + "=" + Runnable.class.getName() +
")(taskName=auditlog))").setRequired(true))
- };
+ createComponent()
+ .setImplementation(this)
+
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
+ .add(createServiceDependency()
+ .setService(Repository.class, "(&(" +
RepositoryConstants.REPOSITORY_NAME + "=users)(" +
RepositoryConstants.REPOSITORY_CUSTOMER + "=apache))")
+ .setRequired(true))
+
.add(createServiceDependency().setService(ConnectionFactory.class).setRequired(true))
+
.add(createServiceDependency().setService(HttpService.class).setRequired(true))
+ .add(createServiceDependency().setService(Log.class, "(&("
+ Constants.OBJECTCLASS + "=" + Log.class.getName() +
")(name=auditlog))").setRequired(true))
+ .add(createServiceDependency().setService(LogStore.class,
"(&(" + Constants.OBJECTCLASS + "=" + LogStore.class.getName() +
")(name=auditlog))").setRequired(true))
+ .add(createServiceDependency().setService(Runnable.class,
"(&(" + Constants.OBJECTCLASS + "=" + Runnable.class.getName() +
")(taskName=auditlog))").setRequired(true))
+ };
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+
+ // Remove the configuration to start without any configured
authentication...
+ getConfiguration(m_configurationPID).delete();
}
private List<String> getResponse(String request) throws IOException {
Modified:
ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java?rev=1360039&r1=1360038&r2=1360039&view=diff
==============================================================================
---
ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java
(original)
+++
ace/sandbox/marrs/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java
Wed Jul 11 07:21:46 2012
@@ -40,6 +40,7 @@ import org.apache.ace.test.utils.FileUti
import org.apache.ace.test.utils.NetUtils;
import org.apache.felix.dm.Component;
import org.osgi.framework.Constants;
+import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.useradmin.UserAdmin;
@@ -61,92 +62,17 @@ public class ObrAuthenticationTest exten
private volatile ConnectionFactory m_connectionFactory;
/**
- * @return the PAX Exam configuration options, never <code>null</code>.
- */
-// @Configuration
-// public Option[] configuration() {
-// return options(
-// systemProperty("org.osgi.service.http.port").value("" +
TestConstants.PORT),
-// new CleanCachesOption(),
-// junitBundles(),
-// provision(
-// // Misc bundles...
-// Osgi.compendium(),
-// Felix.dependencyManager(),
-// jetty(),
-// Felix.configAdmin(),
-// Felix.preferences(),
-// Felix.eventAdmin(),
-// Knopflerfish.useradmin(),
-// Knopflerfish.log(),
-// // ACE core bundles...
-// Ace.util(),
-// Ace.authentication(),
-// Ace.authenticationProcessorBasicAuth(),
-// Ace.connectionFactory(),
-// Ace.rangeApi(),
-// Ace.log(),
-// Ace.serverLogStore(),
-// Ace.httplistener(),
-// Ace.repositoryApi(),
-// Ace.repositoryImpl(),
-// Ace.repositoryServlet(),
-// Ace.configuratorServeruseradmin(),
-// Ace.obrMetadata(),
-// Ace.obrServlet(),
-// Ace.obrStorage(),
-// Ace.clientRepositoryApi(),
-// Ace.clientRepositoryImpl(),
-// Ace.clientRepositoryHelperBase(),
-// Ace.clientRepositoryHelperBundle(),
-// Ace.clientRepositoryHelperConfiguration(),
-// Ace.scheduler(),
-// Ace.resourceprocessorUseradmin(),
-// Ace.configuratorUseradminTask()
-// )
-// );
-// }
-
- @Override
- public void setUp() throws Exception {
- m_endpoint = "/obr";
-
- String tmpDir = System.getProperty("java.io.tmpdir");
- m_storeLocation = new File(tmpDir, "store");
- m_storeLocation.delete();
- m_storeLocation.mkdirs();
-
- super.setUp();
-
- String userName = "d";
- String password = "f";
-
- importSingleUser(m_userRepository, userName, password);
- waitForUser(m_userAdmin, userName);
-
- URL obrURL = new URL("http://localhost:"; + TestConstants.PORT +
m_endpoint + "/");
- m_artifactRepository.setObrBase(obrURL);
-
- URL testURL = new URL(obrURL, "repository.xml");
-
- assertTrue("Failed to access OBR in time!",
waitForURL(m_connectionFactory, testURL, 401, 15000));
-
- m_authConfigPID = configureFactory("org.apache.ace.connectionfactory",
- "authentication.baseURL", obrURL.toExternalForm(),
- "authentication.type", "basic",
- "authentication.user.name", userName,
- "authentication.user.password", password);
-
- assertTrue("Failed to access auditlog in time!",
waitForURL(m_connectionFactory, testURL, 200, 15000));
- }
-
- /**
* Tears down the set up of the test case.
*
* @throws java.lang.Exception not part of this test case.
*/
public void tearDown() throws Exception {
FileUtils.removeDirectoryWithContent(m_storeLocation);
+
+ Configuration configuration = getConfiguration(m_authConfigPID);
+ if (configuration != null) {
+ configuration.delete();
+ }
}
/**
@@ -165,7 +91,6 @@ public class ObrAuthenticationTest exten
/**
* Test that we cannot retrieve the 'repository.xml' from the OBR without
any credentials.
*/
- //@Test(expected = IOException.class)
public void testAccessObrRepositoryWithoutCredentialsFail() throws
IOException {
URL url = new URL("http://localhost:"; + TestConstants.PORT +
m_endpoint + "/repository.xml");
@@ -176,14 +101,18 @@ public class ObrAuthenticationTest exten
// we expect a 401 for this URL...
NetUtils.waitForURL(url, 401, 15000);
- // ...causing all other methods on URLConnection to fail...
- conn.getContent(); // should fail!
+ try {
+ // ...causing all other methods on URLConnection to fail...
+ conn.getContent(); // should fail!
+ fail("IOException expected!");
+ } catch (IOException exception) {
+ // Ok; ignored...
+ }
}
/**
* Test that we cannot retrieve the 'repository.xml' from the OBR with
incorrect credentials.
*/
- //@Test(expected = IOException.class)
public void testAccessObrRepositoryWithWrongCredentialsFail() throws
IOException {
org.osgi.service.cm.Configuration configuration =
m_configAdmin.getConfiguration(m_authConfigPID);
assertNotNull(configuration);
@@ -202,8 +131,13 @@ public class ObrAuthenticationTest exten
// we expect a 401 for this URL...
NetUtils.waitForURL(url, 401, 15000);
- // ...causing all other methods on URLConnection to fail...
- conn.getContent(); // should fail!
+ try {
+ // ...causing all other methods on URLConnection to fail...
+ conn.getContent(); // should fail!
+ fail("IOException expected!");
+ } catch (IOException exception) {
+ // Ok; ignored...
+ }
}
/**
@@ -215,9 +149,9 @@ public class ObrAuthenticationTest exten
Attributes attributes = manifest.getMainAttributes();
attributes.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1");
attributes.putValue(Constants.BUNDLE_MANIFESTVERSION, "2");
- attributes.putValue(BundleHelper.KEY_SYMBOLICNAME,
"org.apache.ace.test");
+ attributes.putValue(BundleHelper.KEY_SYMBOLICNAME,
"org.apache.ace.test1");
- File temp = File.createTempFile("org.apache.ace.test", ".jar");
+ File temp = File.createTempFile("org.apache.ace.test1", ".jar");
temp.deleteOnExit();
JarOutputStream jos = new JarOutputStream(new FileOutputStream(temp),
manifest);
jos.close();
@@ -231,7 +165,7 @@ public class ObrAuthenticationTest exten
attributes.putValue(BundleHelper.KEY_RESOURCE_PROCESSOR_PID,
"someProcessor");
attributes.putValue(BundleHelper.KEY_VERSION, "1.0.0.processor");
- temp = File.createTempFile("org.apache.ace.test", ".jar");
+ temp = File.createTempFile("org.apache.ace.test2", ".jar");
temp.deleteOnExit();
jos = new JarOutputStream(new FileOutputStream(temp), manifest);
jos.close();
@@ -245,7 +179,6 @@ public class ObrAuthenticationTest exten
/**
* Test that an import of an artifact through the API of ACE works, making
sure they can access an authenticated OBR as well.
*/
- //@Test(expected = IOException.class)
public void testImportArtifactWithoutCredentialsFail() throws Exception {
org.osgi.service.cm.Configuration configuration =
m_configAdmin.getConfiguration(m_authConfigPID);
assertNotNull(configuration);
@@ -258,14 +191,43 @@ public class ObrAuthenticationTest exten
Attributes attributes = manifest.getMainAttributes();
attributes.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1");
attributes.putValue(Constants.BUNDLE_MANIFESTVERSION, "2");
- attributes.putValue(BundleHelper.KEY_SYMBOLICNAME,
"org.apache.ace.test");
+ attributes.putValue(BundleHelper.KEY_SYMBOLICNAME,
"org.apache.ace.test3");
- File temp = File.createTempFile("org.apache.ace.test", ".jar");
+ File temp = File.createTempFile("org.apache.ace.test3", ".jar");
temp.deleteOnExit();
JarOutputStream jos = new JarOutputStream(new FileOutputStream(temp),
manifest);
jos.close();
- m_artifactRepository.importArtifact(temp.toURI().toURL(), true /*
upload */); // should fail!
+ try {
+ m_artifactRepository.importArtifact(temp.toURI().toURL(), true
/* upload */); // should fail!
+ fail("IOException expected!");
+ } catch (IOException exception) {
+ // Ok; expected...
+ }
+ }
+
+ @Override
+ protected void after() throws Exception {
+ String userName = "d";
+ String password = "f";
+
+ importSingleUser(m_userRepository, userName, password);
+ waitForUser(m_userAdmin, userName);
+
+ URL obrURL = new URL("http://localhost:"; + TestConstants.PORT +
m_endpoint + "/");
+ m_artifactRepository.setObrBase(obrURL);
+
+ URL testURL = new URL(obrURL, "repository.xml");
+
+ assertTrue("Failed to access OBR in time!",
waitForURL(m_connectionFactory, testURL, 401, 15000));
+
+ m_authConfigPID = configureFactory("org.apache.ace.connectionfactory",
+ "authentication.baseURL", obrURL.toExternalForm(),
+ "authentication.type", "basic",
+ "authentication.user.name", userName,
+ "authentication.user.password", password);
+
+ assertTrue("Failed to access auditlog in time!",
waitForURL(m_connectionFactory, testURL, 200, 15000));
}
/**
@@ -273,6 +235,13 @@ public class ObrAuthenticationTest exten
*/
@Override
protected void before() throws Exception {
+ m_endpoint = "/obr";
+
+ String tmpDir = System.getProperty("java.io.tmpdir");
+ m_storeLocation = new File(tmpDir, "store");
+ m_storeLocation.delete();
+ m_storeLocation.mkdirs();
+
final String fileLocation = m_storeLocation.getAbsolutePath();
getService(SessionFactory.class).createSession("test-session-ID");
Propchange: ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 11 07:21:46 2012
@@ -0,0 +1,4 @@
+bin
+bin_test
+generated
+
Modified: ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd?rev=1360039&r1=1360038&r2=1360039&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd
(original)
+++ ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd Wed
Jul 11 07:21:46 2012
@@ -15,21 +15,22 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest
-runfw: org.apache.felix.framework;version='[4,5)'
--runbundles:
org.apache.ace.itest;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
-
org.apache.felix.dependencymanager;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.1.0,3.1.1)',\
-
org.apache.felix.configadmin;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.configadmin/org.apache.felix.configadmin-1.2.8.jar;version='[1.2.8,1.2.9)',\
-
org.apache.ace.httplistener;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.httplistener/generated/org.apache.ace.httplistener.jar;version=latest,\
-
org.apache.ace.deployment.provider.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.provider.api/generated/org.apache.ace.deployment.provider.api.jar;version=latest,\
-
org.apache.ace.authentication.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.authentication.api/generated/org.apache.ace.authentication.api.jar;version=latest,\
-
org.apache.ace.range.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.range.api/generated/org.apache.ace.range.api.jar;version=latest,\
-
osgi.cmpn;resolution=http://bundles.bndtools.org.s3.amazonaws.com/osgi.cmpn/osgi.cmpn-4.2.1.jar;version='[4.2.1,4.2.2)',\
-
org.apache.ace.resourceprocessor.useradmin;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.resourceprocessor.useradmin/generated/org.apache.ace.resourceprocessor.useradmin.jar;version=latest,\
-
org.apache.ace.repository.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.repository.api/generated/org.apache.ace.repository.api.jar;version=latest,\
+-runbundles: \
+ org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
+ org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\
+ org.apache.felix.http.jetty;version='[2.2.0,2.2.1)',\
+ org.apache.felix.prefs;version='[1.0.4,1.0.5)',\
+ osgi.cmpn;version='[4.2.1,4.2.2)',\
+ org.knopflerfish.bundle.useradmin;version='[2.0.2,2.0.3)',\
+ org.knopflerfish.log;version='[2.0.2,2.0.3)',\
+ org.apache.ace.itest;version=latest,\
+ org.apache.ace.httplistener;version=latest,\
+ org.apache.ace.deployment.provider.api;version=latest,\
+ org.apache.ace.authentication.api;version=latest,\
+ org.apache.ace.range.api;version=latest,\
+ org.apache.ace.resourceprocessor.useradmin;version=latest,\
+ org.apache.ace.repository.api;version=latest,\
org.apache.ace.connectionfactory;version=latest,\
- org.apache.felix.http.jetty,\
- org.apache.felix.prefs,\
- org.knopflerfish.bundle.useradmin,\
- org.knopflerfish.log,\
org.apache.ace.scheduler;version=latest,\
org.apache.ace.repository.impl;version=latest,\
org.apache.ace.repository.servlet;version=latest,\
Modified:
ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java?rev=1360039&r1=1360038&r2=1360039&view=diff
==============================================================================
---
ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
(original)
+++
ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
Wed Jul 11 07:21:46 2012
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.apache.ace.it.IntegrationTestBase;
import org.apache.ace.repository.Repository;
import org.apache.ace.repository.impl.constants.RepositoryConstants;
-import org.apache.ace.test.constants.TestConstants;
import org.apache.felix.dm.Component;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
Propchange: ace/sandbox/marrs/org.apache.ace.http.itest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 11 07:21:46 2012
@@ -0,0 +1,4 @@
+bin
+bin_test
+generated
+
Propchange: ace/sandbox/marrs/org.apache.ace.itest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 11 07:21:46 2012
@@ -0,0 +1,4 @@
+bin
+bin_test
+generated
+
Modified: ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd?rev=1360039&r1=1360038&r2=1360039&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd Wed Jul 11 07:21:46 2012
@@ -3,15 +3,13 @@
org.apache.ace.util;version=latest,\
org.apache.felix.dependencymanager,\
junit.osgi
--runrequire: bundle:(symbolicname=org.apache.felix.dependencymanager),\
- bundle:(symbolicname=osgi.cmpn),\
- bundle:(symbolicname=org.apache.felix.shell.tui)
-runfw: org.apache.felix.framework;version='[4,5)'
-runee: JavaSE-1.6
--runbundles:
org.apache.ace.util;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.util/generated/org.apache.ace.util.jar;version=latest,\
-
org.apache.felix.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.shell/org.apache.felix.shell-1.4.2.jar;version='[1.4.2,1.4.3)',\
-
org.apache.felix.dependencymanager;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.1.0,3.1.1)',\
+-runbundles: \
+
org.apache.ace.util;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.util/generated/org.apache.ace.util.jar;version=latest,\
org.apache.ace.deployment.provider.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.provider.api/generated/org.apache.ace.deployment.provider.api.jar;version=latest,\
+
org.apache.felix.dependencymanager;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.1.0,3.1.1)',\
+
org.apache.felix.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.shell/org.apache.felix.shell-1.4.2.jar;version='[1.4.2,1.4.3)',\
org.apache.felix.shell.tui;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.shell.tui/org.apache.felix.shell.tui-1.4.1.jar;version='[1.4.1,1.4.2)',\
osgi.cmpn;resolution=http://bundles.bndtools.org.s3.amazonaws.com/osgi.cmpn/osgi.cmpn-4.2.1.jar;version='[4.2.1,4.2.2)'
Export-Package: org.apache.ace.it
Modified:
ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java?rev=1360039&r1=1360038&r2=1360039&view=diff
==============================================================================
---
ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java
(original)
+++
ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java
Wed Jul 11 07:21:46 2012
@@ -31,8 +31,6 @@ import java.util.concurrent.TimeUnit;
import junit.framework.TestCase;
-import static junit.framework.Assert.*;
-
import org.apache.felix.dm.Component;
import org.apache.felix.dm.ComponentDependencyDeclaration;
import org.apache.felix.dm.ComponentStateListener;
@@ -58,7 +56,7 @@ public class IntegrationTestBase extends
* If we have to wait for a service, wait this amount of seconds.
*/
private static final int SERVICE_TIMEOUT = 5;
-
+
protected BundleContext m_bundleContext;
protected DependencyManager m_dependencyManager;
@@ -105,9 +103,11 @@ public class IntegrationTestBase extends
return config.getPid();
}
- public void setUp() throws Exception {
+ public final void setUp() throws Exception {
m_bundleContext =
FrameworkUtil.getBundle(IntegrationTestBase.class).getBundleContext();
+ m_bundleContext =
FrameworkUtil.getBundle(getClass()).getBundleContext();
m_dependencyManager = new DependencyManager(m_bundleContext);
+
Component[] components = getDependencies();
ComponentCounter listener = new ComponentCounter(components);
@@ -121,19 +121,31 @@ public class IntegrationTestBase extends
m_dependencyManager.add(component);
}
- // Call back the implementation...
- before();
+ // Call back the implementation...
+ before();
// And wait for all components to come online.
try {
if (!listener.waitForEmpty(SERVICE_TIMEOUT, SECONDS)) {
fail("Not all components were started. Still missing the
following:\n" + listener.componentsString());
}
+
+ after();
}
catch (InterruptedException e) {
fail("Interrupted while waiting for services to get started.");
}
}
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ protected void after() throws Exception {}
@SuppressWarnings("unchecked")
protected <T> T getService(Class<T> serviceClass, String filterString)
throws InvalidSyntaxException {
@@ -177,12 +189,12 @@ public class IntegrationTestBase extends
}
}
- private Configuration getConfiguration(String pid) throws IOException {
+ protected Configuration getConfiguration(String pid) throws IOException {
ConfigurationAdmin admin = getService(ConfigurationAdmin.class);
return admin.getConfiguration(pid, null);
}
- private Configuration createFactoryConfiguration(String factoryPid) throws
IOException {
+ protected Configuration createFactoryConfiguration(String factoryPid)
throws IOException {
ConfigurationAdmin admin = getService(ConfigurationAdmin.class);
return admin.createFactoryConfiguration(factoryPid, null);
}
Propchange: ace/sandbox/marrs/org.apache.ace.log.itest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 11 07:21:46 2012
@@ -0,0 +1,4 @@
+bin
+bin_test
+generated
+
Modified: ace/sandbox/marrs/run-target/target.bndrun
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/run-target/target.bndrun?rev=1360039&r1=1360038&r2=1360039&view=diff
==============================================================================
--- ace/sandbox/marrs/run-target/target.bndrun (original)
+++ ace/sandbox/marrs/run-target/target.bndrun Wed Jul 11 07:21:46 2012
@@ -8,4 +8,4 @@
org.apache.felix.gogo.runtime;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar;version='[0.10.0,0.10.1)',\
org.apache.ace.managementagent;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.managementagent/generated/org.apache.ace.managementagent.jar;version=latest,\
org.apache.felix.gogo.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar;version='[0.10.0,0.10.1)'
--runvm: -Dlog=true
\ No newline at end of file
+-runvm: -Dlog=true
