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 [2/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...
Modified: incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.obr.servlet;
+/*
+ * 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.servlet;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -18,31 +36,24 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.luminis.liq.obr.storage.BundleStore;
-import net.luminis.liq.test.utils.FileUtils;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.obr.storage.BundleStore;
+import org.apache.ace.test.utils.FileUtils;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.log.LogService;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class BundleServletTest {
-
private HttpServletRequest m_request;
-
private HttpServletResponse m_response;
-
private ByteArrayOutputStream m_byteStream = new ByteArrayOutputStream();
-
protected int m_status;
-
private MockBundleStore m_store;
private BundleServlet m_bundleServlet;
private File m_testFile;
private String m_requestFile;
-
@BeforeMethod(alwaysRun = true)
protected void setUp() throws IOException {
m_testFile = createRandomFileWithContent();
Modified: incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/MockBundleStore.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/MockBundleStore.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/MockBundleStore.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/MockBundleStore.java Sat Jun 27 21:07:58 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.obr.servlet;
+/*
+ * 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.servlet;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Dictionary;
-import net.luminis.liq.obr.storage.BundleStore;
-
+import org.apache.ace.obr.storage.BundleStore;
import org.osgi.service.cm.ConfigurationException;
public class MockBundleStore implements BundleStore {
Modified: incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/BundleFileStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/BundleFileStoreTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/BundleFileStoreTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/BundleFileStoreTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.obr.storage.file;
+/*
+ * 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.storage.file;
-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.FileInputStream;
@@ -12,12 +30,11 @@
import java.util.Properties;
import java.util.Random;
-import net.luminis.liq.obr.metadata.MetadataGenerator;
-import net.luminis.liq.obr.storage.BundleStore;
-import net.luminis.liq.obr.storage.file.constants.OBRFileStoreConstants;
-import net.luminis.liq.test.utils.FileUtils;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.obr.metadata.MetadataGenerator;
+import org.apache.ace.obr.storage.BundleStore;
+import org.apache.ace.obr.storage.file.constants.OBRFileStoreConstants;
+import org.apache.ace.test.utils.FileUtils;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.cm.ConfigurationException;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
Modified: incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/MockMetadataGenerator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/MockMetadataGenerator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/MockMetadataGenerator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/obr/storage/file/MockMetadataGenerator.java Sat Jun 27 21:07:58 2009
@@ -1,8 +1,26 @@
-package net.luminis.liq.obr.storage.file;
+/*
+ * 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.storage.file;
import java.io.File;
-import net.luminis.liq.obr.metadata.MetadataGenerator;
+import org.apache.ace.obr.metadata.MetadataGenerator;
public class MockMetadataGenerator implements MetadataGenerator{
Copied: incubator/ace/trunk/test/src/org/apache/ace/repository/SortedRangeSetTest.java (from r788992, incubator/ace/trunk/test/src/net/luminis/liq/repository/SortedRangeSetTest.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/repository/SortedRangeSetTest.java?p2=incubator/ace/trunk/test/src/org/apache/ace/repository/SortedRangeSetTest.java&p1=incubator/ace/trunk/test/src/net/luminis/liq/repository/SortedRangeSetTest.java&r1=788992&r2=789014&rev=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/net/luminis/liq/repository/SortedRangeSetTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/repository/SortedRangeSetTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.repository;
+/*
+ * 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.repository;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import org.testng.annotations.Test;
Modified: incubator/ace/trunk/test/src/org/apache/ace/repository/impl/RepositoryImplTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/repository/impl/RepositoryImplTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/repository/impl/RepositoryImplTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/repository/impl/RepositoryImplTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.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.repository.impl;
-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;
Modified: incubator/ace/trunk/test/src/org/apache/ace/scheduler/ExecuterTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/scheduler/ExecuterTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/scheduler/ExecuterTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/scheduler/ExecuterTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.scheduler;
+/*
+ * 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.scheduler;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -8,7 +26,6 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-
public class ExecuterTest {
private Semaphore m_sem;
@@ -52,5 +69,4 @@
Thread.sleep(100);
assert m_sem.tryAcquire(1, TimeUnit.SECONDS);
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/scheduler/SchedulerTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/scheduler/SchedulerTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/scheduler/SchedulerTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/scheduler/SchedulerTest.java Sat Jun 27 21:07:58 2009
@@ -1,11 +1,28 @@
-package net.luminis.liq.scheduler;
+/*
+ * 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.scheduler;
-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.test.utils.TestUtils;
-
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.log.LogService;
import org.testng.annotations.BeforeMethod;
Copied: incubator/ace/trunk/test/src/org/apache/ace/server/log/LogServletTest.java (from r788992, incubator/ace/trunk/test/src/net/luminis/liq/server/log/LogServletTest.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/server/log/LogServletTest.java?p2=incubator/ace/trunk/test/src/org/apache/ace/server/log/LogServletTest.java&p1=incubator/ace/trunk/test/src/net/luminis/liq/server/log/LogServletTest.java&r1=788992&r2=789014&rev=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/net/luminis/liq/server/log/LogServletTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/server/log/LogServletTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.server.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.server.log;
-import static net.luminis.liq.test.utils.TestUtils.UNIT;
+import static org.apache.ace.test.utils.TestUtils.UNIT;
import java.io.IOException;
import java.util.ArrayList;
@@ -11,12 +29,11 @@
import javax.servlet.ServletInputStream;
import javax.servlet.ServletOutputStream;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.repository.SortedRangeSet;
-import net.luminis.liq.server.log.store.LogStore;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.repository.SortedRangeSet;
+import org.apache.ace.server.log.store.LogStore;
+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/server/log/store/impl/ServerLogStoreTester.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/server/log/store/impl/ServerLogStoreTester.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/server/log/store/impl/ServerLogStoreTester.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/server/log/store/impl/ServerLogStoreTester.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.server.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.server.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;
@@ -10,11 +28,10 @@
import java.util.Properties;
import java.util.Set;
-import net.luminis.liq.log.AuditEvent;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.log.AuditEvent;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.event.EventAdmin;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -76,9 +93,6 @@
assert in.equals(out) : "Stored events differ from the added.";
}
- /**
- * See ATL-1537
- */
@Test( groups = { TestUtils.UNIT } )
public void testLogWithSpecialCharacters() throws IOException {
String gatewayID = "myga\0teway";
@@ -98,5 +112,4 @@
}
root.delete();
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/server/log/task/LogTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/server/log/task/LogTaskTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/server/log/task/LogTaskTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/server/log/task/LogTaskTest.java Sat Jun 27 21:07:58 2009
@@ -1,16 +1,33 @@
-package net.luminis.liq.server.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.server.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.Writer;
import java.util.ArrayList;
import java.util.List;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.repository.RangeIterator;
-import net.luminis.liq.repository.SortedRangeSet;
-
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.repository.RangeIterator;
+import org.apache.ace.repository.SortedRangeSet;
import org.testng.annotations.Test;
public class LogTaskTest {
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/build/BrokenTestListener.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/build/BrokenTestListener.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/build/BrokenTestListener.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/build/BrokenTestListener.java Sat Jun 27 21:07:58 2009
@@ -1,9 +1,26 @@
-package net.luminis.test.build;
+/*
+ * 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.test.build;
import java.util.Collection;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.test.utils.TestUtils;
import org.testng.ITestContext;
import org.testng.ITestNGMethod;
import org.testng.Reporter;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/Activator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/Activator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/Activator.java Sat Jun 27 21:07:58 2009
@@ -1,5 +1,22 @@
-package net.luminis.liq.test.bundlestop;
-
+/*
+ * 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.test.bundlestop;
import java.util.Dictionary;
import java.util.Hashtable;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/SystemBundleStopper.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/SystemBundleStopper.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/SystemBundleStopper.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/bundlestop/SystemBundleStopper.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.test.bundlestop;
+/*
+ * 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.test.bundlestop;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -46,5 +64,4 @@
System.exit(1);
}
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/deployment/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/deployment/Activator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/deployment/Activator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/deployment/Activator.java Sat Jun 27 21:07:58 2009
@@ -1,7 +1,24 @@
-package net.luminis.liq.test.deployment;
-
-import net.luminis.test.osgi.dm.TestActivatorBase;
+/*
+ * 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.test.deployment;
+import org.apache.ace.test.osgi.dm.TestActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.test.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.test.deployment;
-import static net.luminis.liq.test.utils.TestUtils.INTEGRATION;
+import static org.apache.ace.test.utils.TestUtils.INTEGRATION;
import java.io.File;
import java.io.IOException;
@@ -16,14 +34,13 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import net.luminis.liq.deployment.provider.ArtifactData;
-import net.luminis.liq.deployment.provider.impl.ArtifactDataImpl;
-import net.luminis.liq.discovery.property.constants.DiscoveryConstants;
-import net.luminis.liq.http.listener.constants.HttpConstants;
-import net.luminis.liq.identification.property.constants.IdentificationConstants;
-import net.luminis.liq.scheduler.constants.SchedulerConstants;
-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.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.http.listener.constants.HttpConstants;
+import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.scheduler.constants.SchedulerConstants;
+import org.apache.ace.test.utils.deployment.BundleStreamGenerator;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -307,9 +324,9 @@
setProperty(IdentificationConstants.IDENTIFICATION_PID, new Object[][] { { IdentificationConstants.IDENTIFICATION_GATEWAYID_KEY, GWID } });
// configure scheduler
setProperty(SchedulerConstants.SCHEDULER_PID, new Object[][] {
- { "net.luminis.liq.gateway.auditlog.task.AuditLogSyncTask", POLL_INTERVAL },
- { "net.luminis.liq.deployment.task.DeploymentUpdateTask", POLL_INTERVAL }
- });
+ { "org.apache.ace.gateway.auditlog.task.AuditLogSyncTask", POLL_INTERVAL },
+ { "org.apache.ace.deployment.task.DeploymentUpdateTask", POLL_INTERVAL }
+ });
}
private void unconfigureGateway() throws IOException {
@@ -319,15 +336,15 @@
}
private void unconfigureServer() throws IOException {
- m_config.getConfiguration("net.luminis.liq.deployment.servlet", null).delete();
- m_config.getConfiguration("net.luminis.liq.deployment.provider.filebased", null).delete();
+ m_config.getConfiguration("org.apache.ace.deployment.servlet", null).delete();
+ m_config.getConfiguration("org.apache.ace.deployment.provider.filebased", null).delete();
}
private void configureServer() throws IOException {
// configure data bundle
- setProperty(net.luminis.liq.deployment.servlet.Activator.PID, new Object[][] { { HttpConstants.ENDPOINT, "/deployment" } });
+ setProperty(org.apache.ace.deployment.servlet.Activator.PID, new Object[][] { { HttpConstants.ENDPOINT, "/deployment" } });
// configure file based backend
- setProperty(net.luminis.liq.deployment.provider.filebased.Activator.PID, new Object[][] { { "BaseDirectoryName", m_tempDir.getAbsolutePath() } });
+ setProperty(org.apache.ace.deployment.provider.filebased.Activator.PID, new Object[][] { { "BaseDirectoryName", m_tempDir.getAbsolutePath() } });
}
@SuppressWarnings("unchecked")
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/Activator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/Activator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/Activator.java Sat Jun 27 21:07:58 2009
@@ -1,7 +1,24 @@
-package net.luminis.liq.test.http.listener;
-
-import net.luminis.test.osgi.dm.TestActivatorBase;
+/*
+ * 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.test.http.listener;
+import org.apache.ace.test.osgi.dm.TestActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
@@ -25,5 +42,4 @@
protected Class[] getTestClasses() {
return new Class[] { ServletConfiguratorIntegrationTest.class };
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/EchoServlet.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/EchoServlet.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/EchoServlet.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/EchoServlet.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.test.http.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.test.http.listener;
import java.io.IOException;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/MockHttpService.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/MockHttpService.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/MockHttpService.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/MockHttpService.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.test.http.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.test.http.listener;
import java.util.Dictionary;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.test.http.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.test.http.listener;
-import static net.luminis.liq.test.utils.TestUtils.INTEGRATION;
+import static org.apache.ace.test.utils.TestUtils.INTEGRATION;
import java.io.BufferedReader;
import java.io.IOException;
@@ -12,8 +30,7 @@
import javax.servlet.http.HttpServlet;
-import net.luminis.liq.http.listener.constants.HttpConstants;
-
+import org.apache.ace.http.listener.constants.HttpConstants;
import org.apache.felix.dependencymanager.DependencyManager;
import org.apache.felix.dependencymanager.Service;
import org.osgi.framework.Bundle;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java Sat Jun 27 21:07:58 2009
@@ -1,17 +1,34 @@
-package net.luminis.liq.test.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.test.log;
import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Properties;
-import net.luminis.liq.discovery.property.constants.DiscoveryConstants;
-import net.luminis.liq.http.listener.constants.HttpConstants;
-import net.luminis.liq.identification.property.constants.IdentificationConstants;
-import net.luminis.liq.log.Log;
-import net.luminis.liq.server.log.store.LogStore;
-import net.luminis.test.osgi.dm.TestActivatorBase;
-
+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.server.log.store.LogStore;
+import org.apache.ace.test.osgi.dm.TestActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -78,8 +95,8 @@
private void configureGateway() throws IOException {
setProperty(DiscoveryConstants.DISCOVERY_PID, new Object[][] { { DiscoveryConstants.DISCOVERY_URL_KEY, "http://" + HOST + ":" + PORT } });
setProperty(IdentificationConstants.IDENTIFICATION_PID, new Object[][] { { IdentificationConstants.IDENTIFICATION_GATEWAYID_KEY, GWID } });
- createFactoryInstance("net.luminis.liq.gateway.log.store.factory", new Object[][] { {"name", "auditlog"} });
- createFactoryInstance("net.luminis.liq.gateway.log.factory", new Object[][] { {"name", "auditlog"} });
+ createFactoryInstance("org.apache.ace.gateway.log.store.factory", new Object[][] { {"name", "auditlog"} });
+ createFactoryInstance("org.apache.ace.gateway.log.factory", new Object[][] { {"name", "auditlog"} });
}
private void unconfigureGateway() throws IOException {
@@ -88,14 +105,14 @@
}
private void unconfigureServer() throws IOException {
- m_config.getConfiguration("net.luminis.liq.deployment.servlet", null).delete();
- m_config.getConfiguration("net.luminis.liq.deployment.provider.filebased", null).delete();
+ m_config.getConfiguration("org.apache.ace.deployment.servlet", null).delete();
+ m_config.getConfiguration("org.apache.ace.deployment.provider.filebased", null).delete();
}
private void configureServer() throws Exception {
- setProperty("net.luminis.liq.deployment.servlet", new Object[][] { { HttpConstants.ENDPOINT, DEPLOYMENT } });
- createFactoryInstance("net.luminis.liq.server.log.servlet.factory", new Object[][] { {"name", "auditlog"}, { HttpConstants.ENDPOINT, AUDITLOG } });
- createFactoryInstance("net.luminis.liq.server.log.store.factory", new Object[][] { {"name", "auditlog"} });
+ setProperty("org.apache.ace.deployment.servlet", new Object[][] { { HttpConstants.ENDPOINT, DEPLOYMENT } });
+ createFactoryInstance("org.apache.ace.server.log.servlet.factory", new Object[][] { {"name", "auditlog"}, { HttpConstants.ENDPOINT, AUDITLOG } });
+ createFactoryInstance("org.apache.ace.server.log.store.factory", new Object[][] { {"name", "auditlog"} });
}
@SuppressWarnings("unchecked")
@@ -120,5 +137,4 @@
Configuration config = m_config.createFactoryConfiguration(factoryPid, null);
config.update(dict);
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.test.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.test.log;
-import static net.luminis.liq.test.utils.TestUtils.INTEGRATION;
+import static org.apache.ace.test.utils.TestUtils.INTEGRATION;
import java.io.IOException;
import java.io.InputStream;
@@ -10,11 +28,10 @@
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.log.Log;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.log.Log;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.server.log.store.LogStore;
import org.testng.annotations.Factory;
import org.testng.annotations.Test;
@@ -146,5 +163,4 @@
}
return result;
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/Activator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/Activator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/Activator.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.test.mockautoconf;
+/*
+ * 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.test.mockautoconf;
import java.util.Properties;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/MockAutoConf.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/MockAutoConf.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/MockAutoConf.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/mockautoconf/MockAutoConf.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.test.mockautoconf;
+/*
+ * 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.test.mockautoconf;
import java.io.IOException;
import java.io.InputStream;
@@ -72,5 +90,4 @@
public void rollback() {
System.err.println("Called rollback()");
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/FailTests.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/FailTests.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/FailTests.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/FailTests.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.test.osgi.dm;
+/*
+ * 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.test.osgi.dm;
import org.testng.annotations.Test;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java Sat Jun 27 21:07:58 2009
@@ -1,13 +1,30 @@
-package net.luminis.test.osgi.dm;
+/*
+ * 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.test.osgi.dm;
-import static net.luminis.liq.test.utils.TestUtils.INTEGRATION;
+import static org.apache.ace.test.utils.TestUtils.INTEGRATION;
import java.util.List;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.test.utils.TestUtils;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.apache.felix.dependencymanager.Service;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/repository/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/repository/Activator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/repository/Activator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/repository/Activator.java Sat Jun 27 21:07:58 2009
@@ -1,7 +1,24 @@
-package net.luminis.liq.test.repository;
-
-import net.luminis.test.osgi.dm.TestActivatorBase;
+/*
+ * 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.test.repository;
+import org.apache.ace.test.osgi.dm.TestActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -27,6 +44,5 @@
protected Class[] getTestClasses() {
return new Class[] { RepositoryTest.class };
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java Sat Jun 27 21:07:58 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.test.repository;
+/*
+ * 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.test.repository;
-import static net.luminis.liq.test.utils.TestUtils.INTEGRATION;
+import static org.apache.ace.test.utils.TestUtils.INTEGRATION;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -18,10 +36,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import net.luminis.liq.http.listener.constants.HttpConstants;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.repository.impl.constants.RepositoryConstants;
-
+import org.apache.ace.http.listener.constants.HttpConstants;
+import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.impl.constants.RepositoryConstants;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
@@ -61,8 +78,8 @@
protected void start() throws IOException {
// configure the (replication)repository servlets
- setProperty("net.luminis.liq.repository.servlet.RepositoryReplicationServlet", new Object[][] { { HttpConstants.ENDPOINT, "/replication" } });
- setProperty("net.luminis.liq.repository.servlet.RepositoryServlet", new Object[][] { { HttpConstants.ENDPOINT, "/repository" } });
+ setProperty("org.apache.ace.repository.servlet.RepositoryReplicationServlet", new Object[][] { { HttpConstants.ENDPOINT, "/replication" } });
+ setProperty("org.apache.ace.repository.servlet.RepositoryServlet", new Object[][] { { HttpConstants.ENDPOINT, "/repository" } });
}
@AfterMethod(alwaysRun = true)
@@ -86,7 +103,7 @@
props.put(RepositoryConstants.REPOSITORY_INITIAL_CONTENT, initial);
}
props.put("factory.instance.pid", instanceName);
- Configuration config = m_configAdmin.createFactoryConfiguration("net.luminis.liq.server.repository.factory", null);
+ Configuration config = m_configAdmin.createFactoryConfiguration("org.apache.ace.server.repository.factory", null);
ServiceTracker tracker = new ServiceTracker(m_context, m_context.createFilter("(factory.instance.pid=" + instanceName + ")"), null);
tracker.open();
@@ -340,6 +357,4 @@
bytes = in.read(buffer);
}
}
-
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/Activator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/Activator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/Activator.java Sat Jun 27 21:07:58 2009
@@ -1,26 +1,43 @@
-package net.luminis.liq.test.repositoryadmin;
+/*
+ * 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.test.repositoryadmin;
import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Properties;
-import net.luminis.liq.client.repository.RepositoryAdmin;
-import net.luminis.liq.client.repository.RepositoryObject;
-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.client.repository.stateful.StatefulGatewayObject;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayRepository;
-import net.luminis.liq.server.log.store.LogStore;
-import net.luminis.liq.test.utils.TestUtils;
-import net.luminis.test.osgi.dm.TestActivatorBase;
-
+import org.apache.ace.client.repository.RepositoryAdmin;
+import org.apache.ace.client.repository.RepositoryObject;
+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.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.server.log.store.LogStore;
+import org.apache.ace.test.osgi.dm.TestActivatorBase;
+import org.apache.ace.test.utils.TestUtils;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -71,7 +88,7 @@
public void start() throws IOException {
Properties props = new Properties();
props.put("name", "auditlog");
- Configuration config = m_configAdmin.createFactoryConfiguration("net.luminis.liq.server.log.store.factory", null);
+ Configuration config = m_configAdmin.createFactoryConfiguration("org.apache.ace.server.log.store.factory", null);
config.update(props);
}
@@ -80,6 +97,5 @@
protected Class[] getTestClasses() {
return new Class[] { RepositoryAdminTest.class };
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.test.repositoryadmin;
+/*
+ * 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.test.repositoryadmin;
import java.io.File;
import java.io.FileOutputStream;
@@ -27,47 +45,46 @@
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
-import net.luminis.liq.client.repository.ObjectRepository;
-import net.luminis.liq.client.repository.RepositoryAdmin;
-import net.luminis.liq.client.repository.RepositoryAdminLoginContext;
-import net.luminis.liq.client.repository.RepositoryObject;
-import net.luminis.liq.client.repository.RepositoryObject.WorkingState;
-import net.luminis.liq.client.repository.helper.ArtifactHelper;
-import net.luminis.liq.client.repository.helper.ArtifactPreprocessor;
-import net.luminis.liq.client.repository.helper.PropertyResolver;
-import net.luminis.liq.client.repository.helper.bundle.BundleHelper;
-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.License2GatewayAssociation;
-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.client.repository.stateful.StatefulGatewayObject;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayRepository;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayObject.ProvisioningState;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayObject.RegistrationState;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayObject.StoreState;
-import net.luminis.liq.http.listener.constants.HttpConstants;
-import net.luminis.liq.log.AuditEvent;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.obr.storage.file.constants.OBRFileStoreConstants;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.repository.impl.constants.RepositoryConstants;
-import net.luminis.liq.scheduler.constants.SchedulerConstants;
-import net.luminis.liq.server.log.store.LogStore;
-import net.luminis.liq.test.utils.TestUtils;
-
+import org.apache.ace.client.repository.ObjectRepository;
+import org.apache.ace.client.repository.RepositoryAdmin;
+import org.apache.ace.client.repository.RepositoryAdminLoginContext;
+import org.apache.ace.client.repository.RepositoryObject;
+import org.apache.ace.client.repository.RepositoryObject.WorkingState;
+import org.apache.ace.client.repository.helper.ArtifactHelper;
+import org.apache.ace.client.repository.helper.ArtifactPreprocessor;
+import org.apache.ace.client.repository.helper.PropertyResolver;
+import org.apache.ace.client.repository.helper.bundle.BundleHelper;
+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.License2GatewayAssociation;
+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.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.client.repository.stateful.StatefulGatewayObject.ProvisioningState;
+import org.apache.ace.client.repository.stateful.StatefulGatewayObject.RegistrationState;
+import org.apache.ace.client.repository.stateful.StatefulGatewayObject.StoreState;
+import org.apache.ace.http.listener.constants.HttpConstants;
+import org.apache.ace.log.AuditEvent;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.obr.storage.file.constants.OBRFileStoreConstants;
+import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.impl.constants.RepositoryConstants;
+import org.apache.ace.scheduler.constants.SchedulerConstants;
+import org.apache.ace.server.log.store.LogStore;
+import org.apache.ace.test.utils.TestUtils;
import org.apache.felix.dependencymanager.DependencyManager;
import org.apache.felix.dependencymanager.Service;
import org.osgi.framework.BundleContext;
@@ -1100,7 +1117,7 @@
props.put("hostName",HOST);
props.put("endpoint",ENDPOINT);
- final Configuration config = m_configAdmin.getConfiguration("net.luminis.liq.client.automation", null);
+ final Configuration config = m_configAdmin.getConfiguration("org.apache.ace.client.automation", null);
/*
* First test the basic scenario where we create some auditlog data, this gateway should be auto-registered after max 1 sec.
@@ -1142,7 +1159,7 @@
int initRepoSize = m_statefulGatewayRepository.get().size();
// Get the processauditlog task and run it
- ServiceTracker tracker = new ServiceTracker(m_context, m_context.createFilter("(&(" + Constants.OBJECTCLASS + "=" + Runnable.class.getName() + ")(" + SchedulerConstants.SCHEDULER_NAME_KEY + "=" + "net.luminis.liq.client.processauditlog" + "))"), null);
+ ServiceTracker tracker = new ServiceTracker(m_context, m_context.createFilter("(&(" + Constants.OBJECTCLASS + "=" + Runnable.class.getName() + ")(" + SchedulerConstants.SCHEDULER_NAME_KEY + "=" + "org.apache.ace.client.processauditlog" + "))"), null);
tracker.open();
final Runnable processAuditlog = (Runnable) tracker.waitForService(2000);
@@ -1217,7 +1234,7 @@
attributes.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1");
attributes.putValue(Constants.BUNDLE_MANIFESTVERSION, "2");
- File temp = File.createTempFile("net.luminis.test", ".jar");
+ File temp = File.createTempFile("org.apache.ace.test", ".jar");
temp.deleteOnExit();
JarOutputStream jos = new JarOutputStream(new FileOutputStream(temp), manifest);
jos.close();
@@ -1239,9 +1256,9 @@
}
// Use a valid JAR file, with a Bundle-SymbolicName header, but do not supply an OBR.
- attributes.putValue(BundleHelper.KEY_SYMBOLICNAME, "net.luminis.test");
+ attributes.putValue(BundleHelper.KEY_SYMBOLICNAME, "org.apache.ace.test");
- temp = File.createTempFile("net.luminis.test", ".jar");
+ temp = File.createTempFile("org.apache.ace.test", ".jar");
temp.deleteOnExit();
jos = new JarOutputStream(new FileOutputStream(temp), manifest);
jos.close();
@@ -1266,7 +1283,7 @@
// Create a JAR file which looks like a resource processor supplying bundle.
attributes.putValue(BundleHelper.KEY_RESOURCE_PROCESSOR_PID, "someProcessor");
- temp = File.createTempFile("net.luminis.test", ".jar");
+ temp = File.createTempFile("org.apache.ace.test", ".jar");
temp.deleteOnExit();
jos = new JarOutputStream(new FileOutputStream(temp), manifest);
jos.close();
@@ -1737,7 +1754,7 @@
protected void startRepositoryService() throws IOException {
// configure the (replication)repository servlets
- setProperty("net.luminis.liq.repository.servlet.RepositoryServlet", new Object[][] { { HttpConstants.ENDPOINT, ENDPOINT } });
+ setProperty("org.apache.ace.repository.servlet.RepositoryServlet", new Object[][] { { HttpConstants.ENDPOINT, ENDPOINT } });
}
@AfterMethod(alwaysRun = true)
@@ -1754,7 +1771,7 @@
props.put(RepositoryConstants.REPOSITORY_NAME, name);
props.put(RepositoryConstants.REPOSITORY_MASTER, String.valueOf(isMaster));
props.put("factory.instance.pid", instanceName);
- Configuration config = m_configAdmin.createFactoryConfiguration("net.luminis.liq.server.repository.factory", null);
+ Configuration config = m_configAdmin.createFactoryConfiguration("org.apache.ace.server.repository.factory", null);
ServiceTracker tracker = new ServiceTracker(m_context, m_context.createFilter("(factory.instance.pid=" + instanceName + ")"), null);
tracker.open();
@@ -1775,8 +1792,8 @@
propsStore.put(OBRFileStoreConstants.FILE_LOCATION_KEY, fileLocation);
propsStore.put("OBRInstance", "singleOBRStore");
- Configuration configServlet = m_configAdmin.getConfiguration("net.luminis.liq.obr.servlet", null);
- Configuration configStore = m_configAdmin.getConfiguration("net.luminis.liq.obr.storage.file", null);
+ Configuration configServlet = m_configAdmin.getConfiguration("org.apache.ace.obr.servlet", null);
+ Configuration configStore = m_configAdmin.getConfiguration("org.apache.ace.obr.storage.file", null);
configServlet.update(propsServlet);
configStore.update(propsStore);
@@ -1802,7 +1819,7 @@
Properties propsServlet = new Properties();
propsServlet.put(HttpConstants.ENDPOINT, endpoint + "invalid");
propsServlet.put("OBRInstance", "singleOBRServlet");
- Configuration configServlet = m_configAdmin.getConfiguration("net.luminis.liq.obr.servlet");
+ Configuration configServlet = m_configAdmin.getConfiguration("org.apache.ace.obr.servlet");
configServlet.update(propsServlet);
URL url = new URL("http://localhost:8080/" + endpoint + "/repository.xml");
@@ -1921,8 +1938,4 @@
public boolean needsNewVersion(String url, PropertyResolver props, String gatewayID, String fromVersion) {
return false;
}
-
}
-
-
-
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/tools/BundleGenerator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/tools/BundleGenerator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/tools/BundleGenerator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/tools/BundleGenerator.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.test.tools;
+/*
+ * 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.test.tools;
import java.io.File;
import java.io.FileNotFoundException;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java Sat Jun 27 21:07:58 2009
@@ -1,4 +1,22 @@
-package net.luminis.test.tools;
+/*
+ * 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.test.tools;
import java.io.BufferedReader;
import java.io.File;
@@ -17,9 +35,8 @@
import javax.servlet.http.HttpServletResponse;
-import net.luminis.liq.repository.RangeIterator;
-import net.luminis.liq.repository.SortedRangeSet;
-
+import org.apache.ace.repository.RangeIterator;
+import org.apache.ace.repository.SortedRangeSet;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java Sat Jun 27 21:07:58 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.test.useradminconfigurator;
+/*
+ * 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.test.useradminconfigurator;
import java.io.IOException;
import java.util.Properties;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.repository.impl.constants.RepositoryConstants;
-import net.luminis.test.osgi.dm.TestActivatorBase;
-
+import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.impl.constants.RepositoryConstants;
+import org.apache.ace.test.osgi.dm.TestActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.Configuration;
@@ -20,22 +37,21 @@
@Override
protected void initServices(BundleContext context, DependencyManager manager) {
manager.add(createService()
- .setImplementation(ConfiguratorTest.class)
- .add(createServiceDependency()
- .setService(UserAdmin.class)
- .setRequired(true))
- .add(createServiceDependency()
- .setService(Repository.class, "(&(" + RepositoryConstants.REPOSITORY_NAME + "=users)(" + RepositoryConstants.REPOSITORY_CUSTOMER + "=luminis))")
- .setRequired(true)));
+ .setImplementation(ConfiguratorTest.class)
+ .add(createServiceDependency()
+ .setService(UserAdmin.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(Repository.class, "(&(" + RepositoryConstants.REPOSITORY_NAME + "=users)(" + RepositoryConstants.REPOSITORY_CUSTOMER + "=luminis))")
+ .setRequired(true)));
// We need to do some configuration for this test to run; therefore,
// we (as activator) wait around for the ConfigurationAdmin.
manager.add(createService()
- .setImplementation(this)
- .add(createServiceDependency()
- .setService(ConfigurationAdmin.class)
- .setRequired(true)));
-
+ .setImplementation(this)
+ .add(createServiceDependency()
+ .setService(ConfigurationAdmin.class)
+ .setRequired(true)));
}
@Override
@@ -45,7 +61,7 @@
public void start() throws IOException {
// Create the repository
- Configuration config = m_configAdmin.createFactoryConfiguration("net.luminis.liq.server.repository.factory", null);
+ Configuration config = m_configAdmin.createFactoryConfiguration("org.apache.ace.server.repository.factory", null);
Properties props = new Properties();
props.put(RepositoryConstants.REPOSITORY_NAME, "users");
@@ -55,15 +71,15 @@
config.update(props);
// Start the servlet
- config = m_configAdmin.getConfiguration("net.luminis.liq.repository.servlet.RepositoryServlet", null);
+ config = m_configAdmin.getConfiguration("org.apache.ace.repository.servlet.RepositoryServlet", null);
props = new Properties();
- props.put("net.luminis.liq.server.servlet.endpoint", "/repository");
+ props.put("org.apache.ace.server.servlet.endpoint", "/repository");
config.update(props);
// Configure the task
- config = m_configAdmin.getConfiguration("net.luminis.liq.configurator.useradmin.task.UpdateUserAdminTask", null);
+ config = m_configAdmin.getConfiguration("org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask", null);
props = new Properties();
props.put("repositoryName", "users");
@@ -73,12 +89,11 @@
config.update(props);
// Schedule the task
- config = m_configAdmin.getConfiguration("net.luminis.liq.scheduler", null);
+ config = m_configAdmin.getConfiguration("org.apache.ace.scheduler", null);
props = new Properties();
- props.put("net.luminis.liq.configurator.useradmin.task.UpdateUserAdminTask", "1000");
+ props.put("org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask", "1000");
config.update(props);
}
-
}
Modified: incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java?rev=789014&r1=788992&r2=789014&view=diff
==============================================================================
--- incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java (original)
+++ incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java Sat Jun 27 21:07:58 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.test.useradminconfigurator;
+/*
+ * 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.test.useradminconfigurator;
-import static net.luminis.liq.test.utils.TestUtils.INTEGRATION;
+import static org.apache.ace.test.utils.TestUtils.INTEGRATION;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import net.luminis.liq.repository.Repository;
-
+import org.apache.ace.repository.Repository;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
import org.testng.annotations.Factory;
@@ -44,7 +61,7 @@
"<roles>" +
" <user name=\"TestUser\">" +
" <properties>" +
- " <email>testUser@luminis.nl</email>" +
+ " <email>testUser@apache.org</email>" +
" </properties>" +
" <credentials>" +
" <password type=\"String\">swordfish</password>" +
@@ -79,6 +96,4 @@
assert foundPassword : "A second after our user becoming available, there is no password.";
assert foundCertificate : "A second after our user becoming available, there is no certificate.";
}
-
-
}