You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2009/06/27 23:08:04 UTC
svn commit: r789014 [1/3] - in /incubator/ace/trunk/test/src:
net/luminis/liq/ca/
net/luminis/liq/client/repository/helper/dotnet/configuration/
net/luminis/liq/client/repository/impl/
net/luminis/liq/client/repositoryuseradmin/impl/ net/luminis/liq/co...
Author: marrs
Date: Sat Jun 27 21:07:58 2009
New Revision: 789014
URL: http://svn.apache.org/viewvc?rev=789014&view=rev
Log:
Renamed packages to basename "org.apache.ace" and added license headers to each source file.
Added:
incubator/ace/trunk/test/src/org/
incubator/ace/trunk/test/src/org/apache/
incubator/ace/trunk/test/src/org/apache/ace/
incubator/ace/trunk/test/src/org/apache/ace/ca/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/ca/
incubator/ace/trunk/test/src/org/apache/ace/client/
incubator/ace/trunk/test/src/org/apache/ace/client/repository/
incubator/ace/trunk/test/src/org/apache/ace/client/repository/helper/
incubator/ace/trunk/test/src/org/apache/ace/client/repository/helper/dotnet/
incubator/ace/trunk/test/src/org/apache/ace/client/repository/helper/dotnet/configuration/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/client/repository/helper/dotnet/configuration/
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/client/repository/impl/
incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/
incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/client/repositoryuseradmin/impl/
incubator/ace/trunk/test/src/org/apache/ace/configurator/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/configurator/
incubator/ace/trunk/test/src/org/apache/ace/deployment/
incubator/ace/trunk/test/src/org/apache/ace/deployment/DeploymentTest.java
- copied, changed from r788992, incubator/ace/trunk/test/src/net/luminis/liq/deployment/DeploymentTest.java
incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/
incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/filebased/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/deployment/provider/filebased/
incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/deployment/provider/repositorybased/
incubator/ace/trunk/test/src/org/apache/ace/deployment/servlet/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/deployment/servlet/
incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/
incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/deployment/streamgenerator/impl/
incubator/ace/trunk/test/src/org/apache/ace/deployment/task/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/deployment/task/
incubator/ace/trunk/test/src/org/apache/ace/discovery/
incubator/ace/trunk/test/src/org/apache/ace/discovery/property/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/discovery/property/
incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/discovery/upnp/
incubator/ace/trunk/test/src/org/apache/ace/encryptedstore/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/encryptedstore/
incubator/ace/trunk/test/src/org/apache/ace/fadian/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/fadian/
incubator/ace/trunk/test/src/org/apache/ace/gateway/
incubator/ace/trunk/test/src/org/apache/ace/gateway/log/
incubator/ace/trunk/test/src/org/apache/ace/gateway/log/store/
incubator/ace/trunk/test/src/org/apache/ace/gateway/log/store/impl/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/gateway/log/store/impl/
incubator/ace/trunk/test/src/org/apache/ace/gateway/log/task/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/gateway/log/task/
incubator/ace/trunk/test/src/org/apache/ace/identification/
incubator/ace/trunk/test/src/org/apache/ace/identification/ifconfig/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/identification/ifconfig/
incubator/ace/trunk/test/src/org/apache/ace/identification/property/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/identification/property/
incubator/ace/trunk/test/src/org/apache/ace/imethod/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/imethod/
incubator/ace/trunk/test/src/org/apache/ace/inotify/
incubator/ace/trunk/test/src/org/apache/ace/inotify/alertlog/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/inotify/alertlog/
incubator/ace/trunk/test/src/org/apache/ace/log/
incubator/ace/trunk/test/src/org/apache/ace/log/LogDescriptorTest.java
- copied, changed from r788992, incubator/ace/trunk/test/src/net/luminis/liq/log/LogDescriptorTest.java
incubator/ace/trunk/test/src/org/apache/ace/log/LogEventTest.java
- copied, changed from r788992, incubator/ace/trunk/test/src/net/luminis/liq/log/LogEventTest.java
incubator/ace/trunk/test/src/org/apache/ace/log/listener/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/log/listener/
incubator/ace/trunk/test/src/org/apache/ace/obr/
incubator/ace/trunk/test/src/org/apache/ace/obr/metadata/
incubator/ace/trunk/test/src/org/apache/ace/obr/metadata/bindeximpl/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/obr/metadata/bindeximpl/
incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/obr/servlet/
incubator/ace/trunk/test/src/org/apache/ace/obr/storage/
incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/obr/storage/file/
incubator/ace/trunk/test/src/org/apache/ace/repository/
incubator/ace/trunk/test/src/org/apache/ace/repository/SortedRangeSetTest.java
- copied, changed from r788992, incubator/ace/trunk/test/src/net/luminis/liq/repository/SortedRangeSetTest.java
incubator/ace/trunk/test/src/org/apache/ace/repository/impl/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/repository/impl/
incubator/ace/trunk/test/src/org/apache/ace/resourceprocessors/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/resourceprocessors/
incubator/ace/trunk/test/src/org/apache/ace/scheduler/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/scheduler/
incubator/ace/trunk/test/src/org/apache/ace/server/
incubator/ace/trunk/test/src/org/apache/ace/server/log/
incubator/ace/trunk/test/src/org/apache/ace/server/log/LogServletTest.java
- copied, changed from r788992, incubator/ace/trunk/test/src/net/luminis/liq/server/log/LogServletTest.java
incubator/ace/trunk/test/src/org/apache/ace/server/log/store/
incubator/ace/trunk/test/src/org/apache/ace/server/log/store/impl/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/server/log/store/impl/
incubator/ace/trunk/test/src/org/apache/ace/server/log/task/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/server/log/task/
incubator/ace/trunk/test/src/org/apache/ace/test/
incubator/ace/trunk/test/src/org/apache/ace/test/build/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/test/build/
incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/bundlestop/
incubator/ace/trunk/test/src/org/apache/ace/test/deployment/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/deployment/
incubator/ace/trunk/test/src/org/apache/ace/test/http/
incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/http/listener/
incubator/ace/trunk/test/src/org/apache/ace/test/log/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/log/
incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/mockautoconf/
incubator/ace/trunk/test/src/org/apache/ace/test/osgi/
incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/test/osgi/dm/
incubator/ace/trunk/test/src/org/apache/ace/test/repository/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/repository/
incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/repositoryadmin/
incubator/ace/trunk/test/src/org/apache/ace/test/tools/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/test/tools/
incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/useradminconfigurator/
incubator/ace/trunk/test/src/org/apache/ace/test/utils/
incubator/ace/trunk/test/src/org/apache/ace/test/utils/FileUtils.java
- copied, changed from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/utils/FileUtils.java
incubator/ace/trunk/test/src/org/apache/ace/test/utils/NetUtils.java
- copied, changed from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/utils/NetUtils.java
incubator/ace/trunk/test/src/org/apache/ace/test/utils/TestUtils.java
- copied, changed from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/utils/TestUtils.java
incubator/ace/trunk/test/src/org/apache/ace/test/utils/deployment/
- copied from r788992, incubator/ace/trunk/test/src/net/luminis/liq/test/utils/deployment/
Removed:
incubator/ace/trunk/test/src/net/luminis/liq/ca/
incubator/ace/trunk/test/src/net/luminis/liq/client/repository/helper/dotnet/configuration/
incubator/ace/trunk/test/src/net/luminis/liq/client/repository/impl/
incubator/ace/trunk/test/src/net/luminis/liq/client/repositoryuseradmin/impl/
incubator/ace/trunk/test/src/net/luminis/liq/configurator/
incubator/ace/trunk/test/src/net/luminis/liq/deployment/DeploymentTest.java
incubator/ace/trunk/test/src/net/luminis/liq/deployment/provider/filebased/
incubator/ace/trunk/test/src/net/luminis/liq/deployment/provider/repositorybased/
incubator/ace/trunk/test/src/net/luminis/liq/deployment/servlet/
incubator/ace/trunk/test/src/net/luminis/liq/deployment/streamgenerator/impl/
incubator/ace/trunk/test/src/net/luminis/liq/deployment/task/
incubator/ace/trunk/test/src/net/luminis/liq/discovery/property/
incubator/ace/trunk/test/src/net/luminis/liq/discovery/upnp/
incubator/ace/trunk/test/src/net/luminis/liq/encryptedstore/
incubator/ace/trunk/test/src/net/luminis/liq/fadian/
incubator/ace/trunk/test/src/net/luminis/liq/gateway/log/store/impl/
incubator/ace/trunk/test/src/net/luminis/liq/gateway/log/task/
incubator/ace/trunk/test/src/net/luminis/liq/identification/ifconfig/
incubator/ace/trunk/test/src/net/luminis/liq/identification/property/
incubator/ace/trunk/test/src/net/luminis/liq/imethod/
incubator/ace/trunk/test/src/net/luminis/liq/inotify/alertlog/
incubator/ace/trunk/test/src/net/luminis/liq/log/LogDescriptorTest.java
incubator/ace/trunk/test/src/net/luminis/liq/log/LogEventTest.java
incubator/ace/trunk/test/src/net/luminis/liq/log/listener/
incubator/ace/trunk/test/src/net/luminis/liq/obr/metadata/bindeximpl/
incubator/ace/trunk/test/src/net/luminis/liq/obr/servlet/
incubator/ace/trunk/test/src/net/luminis/liq/obr/storage/file/
incubator/ace/trunk/test/src/net/luminis/liq/repository/SortedRangeSetTest.java
incubator/ace/trunk/test/src/net/luminis/liq/repository/impl/
incubator/ace/trunk/test/src/net/luminis/liq/resourceprocessors/
incubator/ace/trunk/test/src/net/luminis/liq/scheduler/
incubator/ace/trunk/test/src/net/luminis/liq/server/log/LogServletTest.java
incubator/ace/trunk/test/src/net/luminis/liq/server/log/store/impl/
incubator/ace/trunk/test/src/net/luminis/liq/server/log/task/
incubator/ace/trunk/test/src/net/luminis/liq/test/bundlestop/
incubator/ace/trunk/test/src/net/luminis/liq/test/deployment/
incubator/ace/trunk/test/src/net/luminis/liq/test/http/listener/
incubator/ace/trunk/test/src/net/luminis/liq/test/log/
incubator/ace/trunk/test/src/net/luminis/liq/test/mockautoconf/
incubator/ace/trunk/test/src/net/luminis/liq/test/repository/
incubator/ace/trunk/test/src/net/luminis/liq/test/repositoryadmin/
incubator/ace/trunk/test/src/net/luminis/liq/test/useradminconfigurator/
incubator/ace/trunk/test/src/net/luminis/liq/test/utils/FileUtils.java
incubator/ace/trunk/test/src/net/luminis/liq/test/utils/NetUtils.java
incubator/ace/trunk/test/src/net/luminis/liq/test/utils/TestUtils.java
incubator/ace/trunk/test/src/net/luminis/liq/test/utils/deployment/
incubator/ace/trunk/test/src/net/luminis/test/build/
incubator/ace/trunk/test/src/net/luminis/test/osgi/dm/
incubator/ace/trunk/test/src/net/luminis/test/tools/
Modified:
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/AdminTestUtil.java
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ArtifactTest.java
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockBackupRepository.java
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockCachedRepository.java
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockRepository.java
incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ModelTest.java
incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java
incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminTest.java
incubator/ace/trunk/test/src/org/apache/ace/configurator/ConfiguratorTest.java
incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfigAdmin.java
incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfiguration.java
incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/filebased/FileBasedProviderTest.java
incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java
incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProviderTest.java
incubator/ace/trunk/test/src/org/apache/ace/deployment/servlet/DeploymentServletTest.java
incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java
incubator/ace/trunk/test/src/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java
incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java
incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java
incubator/ace/trunk/test/src/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTester.java
incubator/ace/trunk/test/src/org/apache/ace/gateway/log/task/LogSyncTaskTest.java
incubator/ace/trunk/test/src/org/apache/ace/identification/ifconfig/IfconfigIdentificationTest.java
incubator/ace/trunk/test/src/org/apache/ace/identification/property/SimpleIdentificationTest.java
incubator/ace/trunk/test/src/org/apache/ace/log/listener/LogTest.java
incubator/ace/trunk/test/src/org/apache/ace/log/listener/MockLog.java
incubator/ace/trunk/test/src/org/apache/ace/obr/metadata/bindeximpl/BindexMetadataTest.java
incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java
incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/MockBundleStore.java
incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/BundleFileStoreTest.java
incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/MockMetadataGenerator.java
incubator/ace/trunk/test/src/org/apache/ace/repository/impl/RepositoryImplTest.java
incubator/ace/trunk/test/src/org/apache/ace/scheduler/ExecuterTest.java
incubator/ace/trunk/test/src/org/apache/ace/scheduler/SchedulerTest.java
incubator/ace/trunk/test/src/org/apache/ace/server/log/store/impl/ServerLogStoreTester.java
incubator/ace/trunk/test/src/org/apache/ace/server/log/task/LogTaskTest.java
incubator/ace/trunk/test/src/org/apache/ace/test/build/BrokenTestListener.java
incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/Activator.java
incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/SystemBundleStopper.java
incubator/ace/trunk/test/src/org/apache/ace/test/deployment/Activator.java
incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java
incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/Activator.java
incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/EchoServlet.java
incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/MockHttpService.java
incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java
incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java
incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java
incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/Activator.java
incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/MockAutoConf.java
incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/FailTests.java
incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java
incubator/ace/trunk/test/src/org/apache/ace/test/repository/Activator.java
incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java
incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/Activator.java
incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java
incubator/ace/trunk/test/src/org/apache/ace/test/tools/BundleGenerator.java
incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java
incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java
incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java
incubator/ace/trunk/test/src/org/apache/ace/test/utils/deployment/BundleStreamGenerator.java
incubator/ace/trunk/test/src/org/apache/ace/test/utils/deployment/TestData.java
incubator/ace/trunk/test/src/org/apache/ace/test/utils/deployment/TestProvider.java
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/AdminTestUtil.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/AdminTestUtil.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/AdminTestUtil.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/AdminTestUtil.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.client.repository.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repository.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -30,6 +48,4 @@
}
return result;
}
-
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ArtifactTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ArtifactTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ArtifactTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ArtifactTest.java Sat Jun 27 21:07:58 2009
@@ -1,17 +1,34 @@
-package net.luminis.liq.client.repository.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repository.impl;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import net.luminis.liq.client.repository.helper.ArtifactHelper;
-import net.luminis.liq.client.repository.helper.ArtifactPreprocessor;
-import net.luminis.liq.client.repository.helper.bundle.BundleHelper;
-import net.luminis.liq.client.repository.helper.bundle.impl.BundleHelperImpl;
-import net.luminis.liq.client.repository.object.ArtifactObject;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.client.repository.helper.ArtifactHelper;
+import org.apache.ace.client.repository.helper.ArtifactPreprocessor;
+import org.apache.ace.client.repository.helper.bundle.BundleHelper;
+import org.apache.ace.client.repository.helper.bundle.impl.BundleHelperImpl;
+import org.apache.ace.client.repository.object.ArtifactObject;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java Sat Jun 27 21:07:58 2009
@@ -1,15 +1,32 @@
-package net.luminis.liq.client.repository.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repository.impl;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.repository.ext.BackupRepository;
-import net.luminis.liq.repository.ext.CachedRepository;
-import net.luminis.liq.repository.impl.CachedRepositoryImpl;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.ext.BackupRepository;
+import org.apache.ace.repository.ext.CachedRepository;
+import org.apache.ace.repository.impl.CachedRepositoryImpl;
+import org.apache.ace.test.utils.TestUtils;
import org.testng.annotations.Test;
public class CachedRepositoryImplTest {
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java Sat Jun 27 21:07:58 2009
@@ -1,13 +1,30 @@
-package net.luminis.liq.client.repository.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repository.impl;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import net.luminis.liq.repository.impl.FilebasedBackupRepository;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.repository.impl.FilebasedBackupRepository;
+import org.apache.ace.test.utils.TestUtils;
import org.testng.annotations.Test;
public class FilebasedBackupRepositoryTest {
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockBackupRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockBackupRepository.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockBackupRepository.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockBackupRepository.java Sat Jun 27 21:07:58 2009
@@ -1,10 +1,29 @@
-package net.luminis.liq.client.repository.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repository.impl;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import net.luminis.liq.repository.ext.BackupRepository;
+import org.apache.ace.repository.ext.BackupRepository;
+
public class MockBackupRepository implements BackupRepository {
private byte[] m_current;
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockCachedRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockCachedRepository.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockCachedRepository.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockCachedRepository.java Sat Jun 27 21:07:58 2009
@@ -1,10 +1,29 @@
-package net.luminis.liq.client.repository.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repository.impl;
import java.io.IOException;
import java.io.InputStream;
-import net.luminis.liq.repository.SortedRangeSet;
-import net.luminis.liq.repository.ext.CachedRepository;
+import org.apache.ace.repository.SortedRangeSet;
+import org.apache.ace.repository.ext.CachedRepository;
+
public class MockCachedRepository implements CachedRepository {
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockRepository.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockRepository.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/MockRepository.java Sat Jun 27 21:07:58 2009
@@ -1,11 +1,30 @@
-package net.luminis.liq.client.repository.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repository.impl;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.repository.SortedRangeSet;
+import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.SortedRangeSet;
+
public class MockRepository implements Repository {
private byte[] m_repo;
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ModelTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ModelTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ModelTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repository/impl/ModelTest.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.client.repository.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repository.impl;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -8,29 +26,28 @@
import java.util.List;
import java.util.Map;
-import net.luminis.liq.client.repository.Association;
-import net.luminis.liq.client.repository.ObjectRepository;
-import net.luminis.liq.client.repository.RepositoryUtil;
-import net.luminis.liq.client.repository.helper.bundle.BundleHelper;
-import net.luminis.liq.client.repository.helper.bundle.impl.BundleHelperImpl;
-import net.luminis.liq.client.repository.object.Artifact2GroupAssociation;
-import net.luminis.liq.client.repository.object.ArtifactObject;
-import net.luminis.liq.client.repository.object.DeploymentArtifact;
-import net.luminis.liq.client.repository.object.DeploymentVersionObject;
-import net.luminis.liq.client.repository.object.GatewayObject;
-import net.luminis.liq.client.repository.object.Group2LicenseAssociation;
-import net.luminis.liq.client.repository.object.GroupObject;
-import net.luminis.liq.client.repository.object.LicenseObject;
-import net.luminis.liq.client.repository.repository.Artifact2GroupAssociationRepository;
-import net.luminis.liq.client.repository.repository.ArtifactRepository;
-import net.luminis.liq.client.repository.repository.DeploymentVersionRepository;
-import net.luminis.liq.client.repository.repository.GatewayRepository;
-import net.luminis.liq.client.repository.repository.Group2LicenseAssociationRepository;
-import net.luminis.liq.client.repository.repository.GroupRepository;
-import net.luminis.liq.client.repository.repository.License2GatewayAssociationRepository;
-import net.luminis.liq.client.repository.repository.LicenseRepository;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.client.repository.Association;
+import org.apache.ace.client.repository.ObjectRepository;
+import org.apache.ace.client.repository.RepositoryUtil;
+import org.apache.ace.client.repository.helper.bundle.BundleHelper;
+import org.apache.ace.client.repository.helper.bundle.impl.BundleHelperImpl;
+import org.apache.ace.client.repository.object.Artifact2GroupAssociation;
+import org.apache.ace.client.repository.object.ArtifactObject;
+import org.apache.ace.client.repository.object.DeploymentArtifact;
+import org.apache.ace.client.repository.object.DeploymentVersionObject;
+import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.Group2LicenseAssociation;
+import org.apache.ace.client.repository.object.GroupObject;
+import org.apache.ace.client.repository.object.LicenseObject;
+import org.apache.ace.client.repository.repository.Artifact2GroupAssociationRepository;
+import org.apache.ace.client.repository.repository.ArtifactRepository;
+import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
+import org.apache.ace.client.repository.repository.GatewayRepository;
+import org.apache.ace.client.repository.repository.Group2LicenseAssociationRepository;
+import org.apache.ace.client.repository.repository.GroupRepository;
+import org.apache.ace.client.repository.repository.License2GatewayAssociationRepository;
+import org.apache.ace.client.repository.repository.LicenseRepository;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
@@ -42,7 +59,7 @@
/**
- * Test class for the object model used </code>net.luminis.liq.client.repository<code>.
+ * Test class for the object model used </code>org.apache.ace.client.repository<code>.
*/
public class ModelTest {
@@ -674,7 +691,5 @@
artifacts.add(new DeploymentArtifactImpl(s));
}
return m_deploymentVersionRepository.create(attr, tags, artifacts.toArray(new DeploymentArtifact[0]));
-
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.client.repositoryuseradmin.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repositoryuseradmin.impl;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -11,10 +29,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import net.luminis.liq.repository.SortedRangeSet;
-import net.luminis.liq.repository.ext.CachedRepository;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.repository.SortedRangeSet;
+import org.apache.ace.repository.ext.CachedRepository;
+import org.apache.ace.test.utils.TestUtils;
import org.apache.felix.framework.FilterImpl;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
Modified: incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminTest.java Sat Jun 27 21:07:58 2009
@@ -1,8 +1,26 @@
-package net.luminis.liq.client.repositoryuseradmin.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.client.repositoryuseradmin.impl;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
-import net.luminis.liq.test.utils.TestUtils;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
+import org.apache.ace.test.utils.TestUtils;
import org.apache.felix.framework.FilterImpl;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
@@ -132,8 +150,5 @@
catch (IllegalArgumentException iae) {
// expected
}
-}
-
-
-
+ }
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/configurator/ConfiguratorTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/configurator/ConfiguratorTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/configurator/ConfiguratorTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/configurator/ConfiguratorTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.configurator;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.configurator;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.File;
import java.io.FileOutputStream;
@@ -9,9 +27,8 @@
import java.util.Dictionary;
import java.util.Properties;
-import net.luminis.liq.test.utils.FileUtils;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.test.utils.FileUtils;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.log.LogService;
Modified: incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfigAdmin.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfigAdmin.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfigAdmin.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfigAdmin.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.configurator;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.configurator;
import java.io.IOException;
Modified: incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfiguration.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfiguration.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/configurator/MockConfiguration.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.configurator;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.configurator;
import java.io.IOException;
import java.util.Dictionary;
Copied: incubator/ace/trunk/test/src/org/apache/ace/deployment/DeploymentTest.java (from r788992, incubator/ace/trunk/test/src/net/luminis/liq/deployment/DeploymentTest.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/deployment/DeploymentTest.java?p2=incubator/ace/trunk/test/src/org/apache/ace/deployment/DeploymentTest.java&p1=incubator/ace/trunk/test/src/net/luminis/liq/deployment/DeploymentTest.java&r1=788992&r2=789014&rev=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/net/luminis/liq/deployment/DeploymentTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/deployment/DeploymentTest.java Sat Jun 27 21:07:58 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.deployment;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.InputStream;
-import net.luminis.liq.deployment.deploymentadmin.DeploymentAdminDeployer;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.deployment.deploymentadmin.DeploymentAdminDeployer;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.framework.Version;
import org.osgi.service.deploymentadmin.DeploymentAdmin;
import org.osgi.service.deploymentadmin.DeploymentPackage;
Modified: incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/filebased/FileBasedProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/filebased/FileBasedProviderTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/filebased/FileBasedProviderTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/filebased/FileBasedProviderTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.deployment.provider.filebased;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.provider.filebased;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.File;
import java.util.Collection;
@@ -8,12 +26,11 @@
import java.util.List;
import java.util.Properties;
-import net.luminis.liq.deployment.provider.ArtifactData;
-import net.luminis.liq.deployment.provider.impl.ArtifactDataImpl;
-import net.luminis.liq.test.utils.FileUtils;
-import net.luminis.liq.test.utils.TestUtils;
-import net.luminis.liq.test.utils.deployment.BundleStreamGenerator;
-
+import org.apache.ace.deployment.provider.ArtifactData;
+import org.apache.ace.deployment.provider.impl.ArtifactDataImpl;
+import org.apache.ace.test.utils.FileUtils;
+import org.apache.ace.test.utils.TestUtils;
+import org.apache.ace.test.utils.deployment.BundleStreamGenerator;
import org.osgi.service.log.LogService;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
Modified: incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java Sat Jun 27 21:07:58 2009
@@ -1,11 +1,29 @@
-package net.luminis.liq.deployment.provider.repositorybased;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.provider.repositorybased;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.repository.SortedRangeSet;
+import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.SortedRangeSet;
public class MockDeploymentRepository implements Repository {
@@ -19,7 +37,7 @@
/* (non-Javadoc)
* Magic number version 1, generates an IOException, else return
- * @see net.luminis.liq.repository.Repository#checkout(long)
+ * @see org.apache.ace.repository.Repository#checkout(long)
*/
public InputStream checkout(long version) throws IOException, IllegalArgumentException {
if (version == 1) {
Modified: incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProviderTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProviderTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProviderTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.deployment.provider.repositorybased;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.provider.repositorybased;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.File;
import java.io.IOException;
@@ -23,15 +41,14 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import net.luminis.liq.client.repository.helper.bundle.BundleHelper;
-import net.luminis.liq.client.repository.object.DeploymentArtifact;
-import net.luminis.liq.deployment.provider.ArtifactData;
-import net.luminis.liq.deployment.provider.impl.ArtifactDataImpl;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.test.utils.FileUtils;
-import net.luminis.liq.test.utils.TestUtils;
-import net.luminis.liq.test.utils.deployment.BundleStreamGenerator;
-
+import org.apache.ace.client.repository.helper.bundle.BundleHelper;
+import org.apache.ace.client.repository.object.DeploymentArtifact;
+import org.apache.ace.deployment.provider.ArtifactData;
+import org.apache.ace.deployment.provider.impl.ArtifactDataImpl;
+import org.apache.ace.repository.Repository;
+import org.apache.ace.test.utils.FileUtils;
+import org.apache.ace.test.utils.TestUtils;
+import org.apache.ace.test.utils.deployment.BundleStreamGenerator;
import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
import org.testng.annotations.AfterTest;
Modified: incubator/ace/trunk/test/src/org/apache/ace/deployment/servlet/DeploymentServletTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/deployment/servlet/DeploymentServletTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/deployment/servlet/DeploymentServletTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/deployment/servlet/DeploymentServletTest.java Sat Jun 27 21:07:58 2009
@@ -1,8 +1,26 @@
-package net.luminis.liq.deployment.servlet;
-
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
-import static net.luminis.liq.test.utils.TestUtils.configureObject;
-import static net.luminis.liq.test.utils.TestUtils.createMockObjectAdapter;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.servlet;
+
+import static org.apache.ace.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.configureObject;
+import static org.apache.ace.test.utils.TestUtils.createMockObjectAdapter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -15,10 +33,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.luminis.liq.deployment.provider.ArtifactData;
-import net.luminis.liq.deployment.provider.DeploymentProvider;
-import net.luminis.liq.deployment.streamgenerator.StreamGenerator;
-
+import org.apache.ace.deployment.provider.ArtifactData;
+import org.apache.ace.deployment.provider.DeploymentProvider;
+import org.apache.ace.deployment.streamgenerator.StreamGenerator;
import org.osgi.service.log.LogService;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
Modified: incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java Sat Jun 27 21:07:58 2009
@@ -1,7 +1,25 @@
-package net.luminis.liq.deployment.streamgenerator.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.streamgenerator.impl;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
-import static net.luminis.liq.test.utils.TestUtils.BROKEN;
+import static org.apache.ace.test.utils.TestUtils.BROKEN;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.IOException;
import java.io.InputStream;
@@ -15,10 +33,9 @@
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
-import net.luminis.liq.deployment.provider.DeploymentProvider;
-import net.luminis.liq.test.utils.TestUtils;
-import net.luminis.liq.test.utils.deployment.TestProvider;
-
+import org.apache.ace.deployment.provider.DeploymentProvider;
+import org.apache.ace.test.utils.TestUtils;
+import org.apache.ace.test.utils.deployment.TestProvider;
import org.osgi.service.log.LogService;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
Modified: incubator/ace/trunk/test/src/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.deployment.task;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.task;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -12,13 +30,11 @@
import java.net.URLConnection;
import java.net.URLStreamHandler;
-import net.luminis.liq.deployment.Deployment;
-import net.luminis.liq.deployment.task.DeploymentUpdateTask;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.deployment.Deployment;
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.framework.Version;
import org.osgi.service.log.LogService;
import org.testng.annotations.BeforeMethod;
Modified: incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java Sat Jun 27 21:07:58 2009
@@ -1,13 +1,30 @@
-package net.luminis.liq.discovery.property;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery.property;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.net.URL;
import java.util.Dictionary;
import java.util.Hashtable;
-import net.luminis.liq.discovery.property.constants.DiscoveryConstants;
-
+import org.apache.ace.discovery.property.constants.DiscoveryConstants;
import org.osgi.service.cm.ConfigurationException;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
Modified: incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.discovery.upnp;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery.upnp;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.net.URL;
import java.util.Properties;
@@ -32,8 +50,6 @@
m_discovery.start();
}
-
-
/**
* Test if discovering while there's no UPnPService
* works as expected (returns null)
@@ -46,8 +62,6 @@
assert (url == null) : "Invalid url was returned (should have been null): " + url;
}
-
-
private UPnPDevice expectDeviceAdditionForURL(String url, String type) throws Exception {
final String returnLocation = "returnLocation";
final String returnType = "returnType";
@@ -76,7 +90,6 @@
return device;
}
-
/**
* Test if the url as provided by a UPnPDevice
* is returned as expected.
@@ -96,8 +109,6 @@
m_discovery.discover();
m_control.verify();
-
-
}
/**
Modified: incubator/ace/trunk/test/src/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTester.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTester.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTester.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTester.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.gateway.log.store.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log.store.impl;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.File;
import java.io.IOException;
@@ -8,12 +26,11 @@
import java.util.List;
import java.util.Properties;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.log.AuditEvent;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.log.AuditEvent;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.log.LogService;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
Modified: incubator/ace/trunk/test/src/org/apache/ace/gateway/log/task/LogSyncTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/gateway/log/task/LogSyncTaskTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/gateway/log/task/LogSyncTaskTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/gateway/log/task/LogSyncTaskTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.gateway.log.task;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log.task;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.IOException;
import java.io.InputStream;
@@ -11,14 +29,13 @@
import java.util.List;
import java.util.Properties;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.repository.SortedRangeSet;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.repository.SortedRangeSet;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.log.LogService;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: incubator/ace/trunk/test/src/org/apache/ace/identification/ifconfig/IfconfigIdentificationTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/identification/ifconfig/IfconfigIdentificationTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/identification/ifconfig/IfconfigIdentificationTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/identification/ifconfig/IfconfigIdentificationTest.java Sat Jun 27 21:07:58 2009
@@ -1,8 +1,26 @@
-package net.luminis.liq.identification.ifconfig;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification.ifconfig;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
-import net.luminis.liq.test.utils.TestUtils;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.log.LogService;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
Modified: incubator/ace/trunk/test/src/org/apache/ace/identification/property/SimpleIdentificationTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/identification/property/SimpleIdentificationTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/identification/property/SimpleIdentificationTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/identification/property/SimpleIdentificationTest.java Sat Jun 27 21:07:58 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.identification.property;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification.property;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.util.Properties;
-import net.luminis.liq.identification.property.constants.IdentificationConstants;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.log.LogService;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
Copied: incubator/ace/trunk/test/src/org/apache/ace/log/LogDescriptorTest.java (from r788992, incubator/ace/trunk/test/src/net/luminis/liq/log/LogDescriptorTest.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/log/LogDescriptorTest.java?p2=incubator/ace/trunk/test/src/org/apache/ace/log/LogDescriptorTest.java&p1=incubator/ace/trunk/test/src/net/luminis/liq/log/LogDescriptorTest.java&r1=788992&r2=789014&rev=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/net/luminis/liq/log/LogDescriptorTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/log/LogDescriptorTest.java Sat Jun 27 21:07:58 2009
@@ -1,9 +1,26 @@
-package net.luminis.liq.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.repository.SortedRangeSet;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
+import org.apache.ace.repository.SortedRangeSet;
import org.testng.annotations.Test;
public class LogDescriptorTest {
Copied: incubator/ace/trunk/test/src/org/apache/ace/log/LogEventTest.java (from r788992, incubator/ace/trunk/test/src/net/luminis/liq/log/LogEventTest.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/log/LogEventTest.java?p2=incubator/ace/trunk/test/src/org/apache/ace/log/LogEventTest.java&p1=incubator/ace/trunk/test/src/net/luminis/liq/log/LogEventTest.java&r1=788992&r2=789014&rev=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/net/luminis/liq/log/LogEventTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/log/LogEventTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.util.Dictionary;
import java.util.Properties;
Modified: incubator/ace/trunk/test/src/org/apache/ace/log/listener/LogTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/log/listener/LogTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/log/listener/LogTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/log/listener/LogTest.java Sat Jun 27 21:07:58 2009
@@ -1,16 +1,33 @@
-package net.luminis.liq.log.listener;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.listener;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.util.Dictionary;
import java.util.List;
import java.util.Properties;
-import net.luminis.liq.log.AuditEvent;
-import net.luminis.liq.log.Log;
-import net.luminis.liq.log.listener.MockLog.LogEntry;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.log.AuditEvent;
+import org.apache.ace.log.Log;
+import org.apache.ace.log.listener.MockLog.LogEntry;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.Constants;
@@ -92,10 +109,10 @@
listeners.startInternal();
m_logProxy.setLog(m_mockLog);
- final String symbolicName = "net.luminis.liq.auditlog.listener.testbundle.a";
+ final String symbolicName = "org.apache.ace.auditlog.listener.testbundle.a";
final long bundleId = 123;
final String bundleVersion = "1.2.3";
- final String bundleLocation = "/home/bla/schaap/testbundlea.jar";
+ final String bundleLocation = "/home/apache/ace/testbundlea.jar";
Bundle testBundleA = TestUtils.createMockObjectAdapter(Bundle.class, new Object() {
@SuppressWarnings("all")
Modified: incubator/ace/trunk/test/src/org/apache/ace/log/listener/MockLog.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/log/listener/MockLog.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/log/listener/MockLog.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/log/listener/MockLog.java Sat Jun 27 21:07:58 2009
@@ -1,11 +1,29 @@
-package net.luminis.liq.log.listener;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.listener;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Dictionary;
import java.util.List;
-import net.luminis.liq.log.Log;
+import org.apache.ace.log.Log;
public class MockLog implements Log {
Modified: incubator/ace/trunk/test/src/org/apache/ace/obr/metadata/bindeximpl/BindexMetadataTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/obr/metadata/bindeximpl/BindexMetadataTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/obr/metadata/bindeximpl/BindexMetadataTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/obr/metadata/bindeximpl/BindexMetadataTest.java Sat Jun 27 21:07:58 2009
@@ -1,17 +1,34 @@
-package net.luminis.liq.obr.metadata.bindeximpl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.obr.metadata.bindeximpl;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
-import net.luminis.liq.deployment.provider.ArtifactData;
-import net.luminis.liq.deployment.provider.impl.ArtifactDataImpl;
-import net.luminis.liq.obr.metadata.MetadataGenerator;
-import net.luminis.liq.obr.metadata.bindex.BIndexMetadataGenerator;
-import net.luminis.liq.test.utils.deployment.BundleStreamGenerator;
-
+import org.apache.ace.deployment.provider.ArtifactData;
+import org.apache.ace.deployment.provider.impl.ArtifactDataImpl;
+import org.apache.ace.obr.metadata.MetadataGenerator;
+import org.apache.ace.obr.metadata.bindex.BIndexMetadataGenerator;
+import org.apache.ace.test.utils.deployment.BundleStreamGenerator;
import org.testng.annotations.Test;
public class BindexMetadataTest {