svn commit: r1503901 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Tue Jul 16 21:33:12 2013 New Revision: 1503901 URL: http://svn.apache.org/r1503901 Log: Launchpad: use latest snapshots I accidentally downgraded some versions in r1501298 . Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1503901&r1=1503900&r2=1503901&view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Jul 16 21:33:12 2013 @@ -141,7 +141,7 @@ org.apache.sling org.apache.sling.servlets.post -2.3.1-SNAPSHOT +2.3.3-SNAPSHOT org.apache.sling @@ -161,7 +161,7 @@ org.apache.sling org.apache.sling.jcr.classloader -3.1.13-SNAPSHOT +3.2.1-SNAPSHOT org.apache.sling
svn commit: r1503793 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Author: rombert
Date: Tue Jul 16 16:47:40 2013
New Revision: 1503793
URL: http://svn.apache.org/r1503793
Log:
SLING-2969 - IT failure: ClassloadingTest.testSimpleClassloading fails
intermitently
Fixed pax-exam setup for org.apache.sling.testing.tools
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1503793&r1=1503792&r2=1503793&view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Tue Jul 16 16:47:40 2013
@@ -138,6 +138,8 @@ public abstract class AbstractJobHandlin
mavenBundle("org.apache.sling",
"org.apache.sling.jcr.jackrabbit.server", "2.1.1-SNAPSHOT"),
mavenBundle("org.apache.sling",
"org.apache.sling.testing.tools", "1.0.6"),
+mavenBundle("org.apache.httpcomponents", "httpcore-osgi",
"4.1.2"),
+mavenBundle("org.apache.httpcomponents", "httpclient-osgi",
"4.1.2"),
CoreOptions.bundle( bundleFile.toURI().toString() ),
svn commit: r1503779 - in /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it: AbstractJobHandlingTest.java ClassloadingTest.java
Author: rombert
Date: Tue Jul 16 16:15:24 2013
New Revision: 1503779
URL: http://svn.apache.org/r1503779
Log:
SLING-2969 - IT failure: ClassloadingTest.testSimpleClassloading fails
intermitently
- fix test logic which was changed inadvertently - spotted by @cziegler
- include the org.apache.sling.testing.tools bundle in the pax-exam
setup
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1503779&r1=1503778&r2=1503779&view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Tue Jul 16 16:15:24 2013
@@ -137,6 +137,8 @@ public abstract class AbstractJobHandlin
mavenBundle("org.apache.derby", "derby", "10.5.3.0_1"),
mavenBundle("org.apache.sling",
"org.apache.sling.jcr.jackrabbit.server", "2.1.1-SNAPSHOT"),
+mavenBundle("org.apache.sling",
"org.apache.sling.testing.tools", "1.0.6"),
+
CoreOptions.bundle( bundleFile.toURI().toString() ),
junitBundles()
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java?rev=1503779&r1=1503778&r2=1503779&view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Tue Jul 16 16:15:24 2013
@@ -142,7 +142,7 @@ public class ClassloadingTest extends Ab
@Override
public boolean isTrue() throws Exception {
return jobManager.getStatistics().getNumberOfQueuedJobs()
== 0
-&& processedJobsCount.get() == 0
+&& processedJobsCount.get() == 1
&& jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (Map[]) null)
.size() == 0;
}
svn commit: r1503771 - in /sling/trunk/bundles/extensions/event: pom.xml src/test/java/org/apache/sling/event/it/ClassloadingTest.java src/test/java/org/apache/sling/event/it/Conditions.java
Author: rombert
Date: Tue Jul 16 15:59:57 2013
New Revision: 1503771
URL: http://svn.apache.org/r1503771
Log:
SLING-2969 - IT failure: ClassloadingTest.testSimpleClassloading fails
intermitently
Try to stabilize tests by using conditions and allowing for larger
timeouts.
Added:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/Conditions.java
(with props)
Modified:
sling/trunk/bundles/extensions/event/pom.xml
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Modified: sling/trunk/bundles/extensions/event/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1503771&r1=1503770&r2=1503771&view=diff
==
--- sling/trunk/bundles/extensions/event/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/pom.xml Tue Jul 16 15:59:57 2013
@@ -266,6 +266,13 @@
test
+
+org.apache.sling
+org.apache.sling.testing.tools
+1.0.2
+test
+bundle
+
org.ops4j.pax.exam
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java?rev=1503771&r1=1503770&r2=1503771&view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Tue Jul 16 15:59:57 2013
@@ -39,8 +39,10 @@ import org.apache.sling.event.jobs.JobMa
import org.apache.sling.event.jobs.JobUtil;
import org.apache.sling.event.jobs.QueueConfiguration;
import org.apache.sling.event.jobs.consumer.JobConsumer;
+import org.apache.sling.testing.tools.retry.RetryLoop;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -53,6 +55,9 @@ import org.osgi.service.event.EventHandl
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class ClassloadingTest extends AbstractJobHandlingTest {
+private static final int CONDITION_INTERVAL_MILLIS = 50;
+private static final int CONDITION_TIMEOUT_SECONDS = 5;
+
private static final String QUEUE_NAME = "cltest";
private static final String TOPIC = "sling/cltest";
@@ -82,15 +87,15 @@ public class ClassloadingTest extends Ab
}
-@org.junit.Test public void testSimpleClassloading() throws Exception {
-final AtomicInteger count = new AtomicInteger(0);
+@Test
+public void testSimpleClassloading() throws Exception {
+final AtomicInteger processedJobsCount = new AtomicInteger(0);
final List finishedEvents = Collections.synchronizedList(new
ArrayList());
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
new JobConsumer() {
-
@Override
public JobResult process(Job job) {
-count.incrementAndGet();
+processedJobsCount.incrementAndGet();
return JobResult.OK;
}
});
@@ -123,16 +128,25 @@ public class ClassloadingTest extends Ab
jobManager.addJob(TOPIC, null, props);
-while ( finishedEvents.size() < 1 ) {
-// we wait a little bit
-Thread.sleep(100);
-}
-Thread.sleep(100);
+new
RetryLoop(Conditions.collectionIsNotEmptyCondition(finishedEvents,
+"Waiting for finishedEvents to have at least one
element"), 5, 50);
// no jobs queued, none processed and no available
-assertEquals(0,
jobManager.getStatistics().getNumberOfQueuedJobs());
-assertEquals(1, count.get());
-assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (Map[])null).size());
+new RetryLoop(new RetryLoop.Condition() {
+
+@Override
+public String getDescription() {
+return "Waiting for job to be processed";
+}
+
+@Override
+public boolean isTrue() throws Exception {
+return jobManager.getStatistics().getNumberOfQueuedJobs()
== 0
+&& processedJobsCount.get() == 0
+&& jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (Map[]) null)
+.size() == 0;
+}
+}, CONDITION_TIMEOUT
svn commit: r1503765 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
Author: cziegeler
Date: Tue Jul 16 15:39:28 2013
New Revision: 1503765
URL: http://svn.apache.org/r1503765
Log:
SLING-2970 : Notification events should not be distributed
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java?rev=1503765&r1=1503764&r2=1503765&view=diff
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
Tue Jul 16 15:39:28 2013
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
-import org.apache.sling.event.EventUtil;
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.JobUtil;
import org.apache.sling.event.jobs.consumer.JobConsumer;
@@ -132,8 +131,6 @@ public abstract class Utility {
if ( time != null ) {
eventProps.put(PROPERTY_TIME, time);
}
-// make distributable
-eventProps.put(EventUtil.PROPERTY_DISTRIBUTE, "true");
// compatibility:
eventProps.put(JobUtil.PROPERTY_NOTIFICATION_JOB, toEvent(job));
eventAdmin.postEvent(new Event(eventTopic, eventProps));
svn commit: r1503746 - /sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Author: rombert Date: Tue Jul 16 15:06:17 2013 New Revision: 1503746 URL: http://svn.apache.org/r1503746 Log: SLING-1794 - ConfigInstallTest fails: Config must be removed once ConfigurationAdmin restarts: Configuration is still present Slightly increase the timeout when running tests, to help them pass consistently on Jenkins. Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1503746&r1=1503745&r2=1503746&view=diff == --- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original) +++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Tue Jul 16 15:06:17 2013 @@ -70,7 +70,7 @@ class OsgiInstallerTestBase implements F protected OsgiInstaller installer; - public static final long WAIT_FOR_ACTION_TIMEOUT_MSEC = 5000; +public static final long WAIT_FOR_ACTION_TIMEOUT_MSEC = 6000; public static final String BUNDLE_BASE_NAME = "org.apache.sling.installer.it-" + POM_VERSION; @Inject
svn commit: r1503745 - /sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Author: rombert
Date: Tue Jul 16 15:06:06 2013
New Revision: 1503745
URL: http://svn.apache.org/r1503745
Log:
SLING-1794 - ConfigInstallTest fails: Config must be removed once
ConfigurationAdmin restarts: Configuration is still present
Add timestamps to the IT log output to differentiate between test
failures and timing issues.
Modified:
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Modified:
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1503745&r1=1503744&r2=1503745&view=diff
==
---
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
(original)
+++
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Tue Jul 16 15:06:06 2013
@@ -400,10 +400,16 @@ class OsgiInstallerTestBase implements F
),
systemProperty(
"org.ops4j.pax.logging.DefaultServiceLog.level" ).value(paxDebugLevel),
provision(
+mavenBundle("org.apache.sling",
"org.apache.sling.commons.log", "3.0.0"),
+mavenBundle("org.apache.sling",
"org.apache.sling.commons.logservice", "1.0.2"),
+
+mavenBundle("org.slf4j", "slf4j-api", "1.6.4"),
+mavenBundle("org.slf4j", "jcl-over-slf4j", "1.6.4"),
+mavenBundle("org.slf4j", "log4j-over-slf4j", "1.6.4"),
+
mavenBundle("org.apache.felix",
"org.apache.felix.scr", "1.6.0"),
mavenBundle("org.apache.felix",
"org.apache.felix.configadmin", "1.2.8"),
mavenBundle("org.apache.felix",
"org.apache.felix.metatype", "1.0.2"),
- mavenBundle("org.apache.sling",
"org.apache.sling.commons.log", "2.1.2"),
mavenBundle("org.apache.sling",
"org.apache.sling.installer.core", POM_VERSION),
mavenBundle("org.apache.sling",
"org.apache.sling.installer.factory.configuration", CONFIG_VERSION)
)
svn commit: r1503753 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Tue Jul 16 15:14:55 2013 New Revision: 1503753 URL: http://svn.apache.org/r1503753 Log: Use latest snapshot version Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1503753&r1=1503752&r2=1503753&view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Jul 16 15:14:55 2013 @@ -101,7 +101,7 @@ org.apache.sling org.apache.sling.auth.core -1.1.2 +1.1.3-SNAPSHOT org.apache.sling
svn commit: r1503735 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
Author: cziegeler Date: Tue Jul 16 14:40:18 2013 New Revision: 1503735 URL: http://svn.apache.org/r1503735 Log: Add resource path to returned job Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java?rev=1503735&r1=1503734&r2=1503735&view=diff == --- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java (original) +++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java Tue Jul 16 14:40:18 2013 @@ -1282,8 +1282,9 @@ public class JobManagerImpl path, properties); -// update property types - priority and create job +// update property types - priority, add path and create job properties.put(Job.PROPERTY_JOB_PRIORITY, info.queueConfiguration.getPriority()); +properties.put(JobImpl.PROPERTY_RESOURCE_PATH, path); return new JobImpl(jobTopic, jobName, jobId, properties); }
svn commit: r1503719 - /sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
Author: bdelacretaz
Date: Tue Jul 16 13:58:29 2013
New Revision: 1503719
URL: http://svn.apache.org/r1503719
Log:
SLING-2965 - oops, it's more useful if the assertNotNulls actually test
something - thanks to Igor Bogomolov for noticing
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java?rev=1503719&r1=1503718&r2=1503719&view=diff
==
---
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
(original)
+++
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
Tue Jul 16 13:58:29 2013
@@ -57,7 +57,7 @@ public class WriteableResourcesTest {
resolver =
resourceResolverFactory.getAdministrativeResourceResolver(null);
assertNotNull("Expecting non-null ResourceResolver", resolver);
final Resource root = resolver.getResource("/");
-assertNotNull("Expecting non-null root Resource");
+assertNotNull("Expecting non-null root Resource", root);
final String path = getClass().getSimpleName() + "_" +
System.currentTimeMillis();
testRoot = resolver.create(root, path, null);
}
@@ -88,7 +88,7 @@ public class WriteableResourcesTest {
{
// Retrieve and check child resource
final Resource r = resolver.getResource(fullPath);
-assertNotNull("Expecting Resource at " + fullPath);
+assertNotNull("Expecting Resource at " + fullPath, r);
final ModifiableValueMap m = r.adaptTo(ModifiableValueMap.class);
assertValueMap(m, "title", "hello", "text", "world");
@@ -101,14 +101,14 @@ public class WriteableResourcesTest {
{
// Retrieve and check updated resource
final Resource r = resolver.getResource(fullPath);
-assertNotNull("Expecting modified Resource at " + fullPath);
+assertNotNull("Expecting modified Resource at " + fullPath, r);
assertValueMap(r.adaptTo(ValueMap.class), "title", "changed",
"more", "fun", "text", "world");
}
{
// Delete test resource and check that it's gone
final Resource r = resolver.getResource(fullPath);
-assertNotNull("Expecting non-null resource to delete, at " +
fullPath);
+assertNotNull("Expecting non-null resource to delete, at " +
fullPath, r);
resolver.delete(r);
resolver.commit();
assertNull("Expecting " + fullPath + " to be deleted",
resolver.getResource(fullPath));
svn commit: r1503632 - /sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
Author: cziegeler
Date: Tue Jul 16 09:36:48 2013
New Revision: 1503632
URL: http://svn.apache.org/r1503632
Log:
SLING-2966 : Insufficient synchronization in SlingAuthenticator
Modified:
sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
Modified:
sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java?rev=1503632&r1=1503631&r2=1503632&view=diff
==
---
sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
(original)
+++
sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
Tue Jul 16 09:36:48 2013
@@ -1468,30 +1468,28 @@ public class SlingAuthenticator implemen
this.authenticator = authenticator;
}
-public void serviceChanged(ServiceEvent event) {
-
-// modification of service properties, unregistration of the
-// service or service properties does not contain requirements
-// property any longer (new event with type 8 added in OSGi Core
-// 4.2)
-if ((event.getType() & (ServiceEvent.MODIFIED
-| ServiceEvent.UNREGISTERING | 8)) != 0) {
-removeService(event.getServiceReference());
-}
+public void serviceChanged(final ServiceEvent event) {
+synchronized ( props ) {
+// modification of service properties, unregistration of the
+// service or service properties does not contain requirements
+// property any longer (new event with type 8 added in OSGi
Core
+// 4.2)
+if ((event.getType() & (ServiceEvent.MODIFIED
+| ServiceEvent.UNREGISTERING | 8)) != 0) {
+removeService(event.getServiceReference());
+}
-// add requirements for newly registered services and for
-// updated services
-if ((event.getType() & (ServiceEvent.REGISTERED |
ServiceEvent.MODIFIED)) != 0) {
-addService(event.getServiceReference());
+// add requirements for newly registered services and for
+// updated services
+if ((event.getType() & (ServiceEvent.REGISTERED |
ServiceEvent.MODIFIED)) != 0) {
+addService(event.getServiceReference());
+}
}
}
void registerServices() {
AuthenticationRequirementHolder[][] authReqsList;
-synchronized (props) {
-authReqsList = props.values().toArray(
-new AuthenticationRequirementHolder[props.size()][]);
-}
+authReqsList = props.values().toArray(new
AuthenticationRequirementHolder[props.size()][]);
for (AuthenticationRequirementHolder[] authReqs : authReqsList) {
registerService(authReqs);
@@ -1517,19 +1515,13 @@ public class SlingAuthenticator implemen
}
final AuthenticationRequirementHolder[] authReqs =
authReqList.toArray(new AuthenticationRequirementHolder[authReqList.size()]);
-registerService(authReqs);
-synchronized (props) {
-props.put(ref.getProperty(Constants.SERVICE_ID), authReqs);
-}
+registerService(authReqs);
+props.put(ref.getProperty(Constants.SERVICE_ID), authReqs);
}
private void removeService(final ServiceReference ref) {
-final AuthenticationRequirementHolder[] authReqs;
-synchronized (props) {
-authReqs = props.remove(ref.getProperty(Constants.SERVICE_ID));
-}
-
+final AuthenticationRequirementHolder[] authReqs =
props.remove(ref.getProperty(Constants.SERVICE_ID));
if (authReqs != null) {
for (AuthenticationRequirementHolder authReq : authReqs) {
authenticator.authRequiredCache.removeHolder(authReq);
svn commit: r1503599 - in /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest: WriteableResourcesProxyTest.java WriteableResourcesTestProxy.java
Author: bdelacretaz
Date: Tue Jul 16 08:02:42 2013
New Revision: 1503599
URL: http://svn.apache.org/r1503599
Log:
SLING-2965 - tests class names must end in *Test to be picked up by the TestAll
class
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java
- copied, changed from r1503576,
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesTestProxy.java
Removed:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesTestProxy.java
Copied:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java
(from r1503576,
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesTestProxy.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java?p2=sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java&p1=sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesTestProxy.java&r1=1503576&r2=1503599&rev=1503599&view=diff
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesTestProxy.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java
Tue Jul 16 08:02:42 2013
@@ -20,7 +20,7 @@ import org.apache.sling.launchpad.webapp
import org.junit.Test;
/** Run the server-side WriteableResourcesTest */
-public class WriteableResourcesTestProxy {
+public class WriteableResourcesProxyTest {
@Test
public void runWriteableResourcesTest() throws Exception {
new
ServerSideTestClient().assertTestsPass("org.apache.sling.launchpad.testservices.serversidetests.WriteableResourcesTest",
1);
