Author: asoldano
Date: Sun May 19 15:09:53 2013
New Revision: 1484290
URL: http://svn.apache.org/r1484290
Log:
[CXF-5023] Removing 'aux' dir in test as that makes the build fail on Windows
Added:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SingletonSubscriptionManagerContainer.java
(with props)
Removed:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/aux/
Modified:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingEventSource.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingSubscriptionManager.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
Modified:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java?rev=1484290&r1=1484289&r2=1484290&view=diff
==============================================================================
---
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
(original)
+++
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
Sun May 19 15:09:53 2013
@@ -33,7 +33,6 @@ import org.apache.cxf.ws.eventing.backen
import
org.apache.cxf.ws.eventing.backend.manager.SubscriptionManagerInterfaceForNotificators;
import
org.apache.cxf.ws.eventing.backend.notification.EventSinkInterfaceNotificatorService;
import org.apache.cxf.ws.eventing.backend.notification.NotificatorService;
-import
org.apache.cxf.ws.eventing.base.aux.SingletonSubscriptionManagerContainer;
import org.apache.cxf.ws.eventing.base.services.TestingEventSource;
import org.apache.cxf.ws.eventing.base.services.TestingSubscriptionManager;
import org.apache.cxf.ws.eventing.eventsource.EventSourceEndpoint;
Added:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SingletonSubscriptionManagerContainer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SingletonSubscriptionManagerContainer.java?rev=1484290&view=auto
==============================================================================
---
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SingletonSubscriptionManagerContainer.java
(added)
+++
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SingletonSubscriptionManagerContainer.java
Sun May 19 15:09:53 2013
@@ -0,0 +1,44 @@
+/**
+ * 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.cxf.ws.eventing.base;
+
+import org.apache.cxf.ws.eventing.backend.manager.SubscriptionManager;
+import org.apache.cxf.ws.eventing.backend.manager.SubscriptionManagerImpl;
+
+public final class SingletonSubscriptionManagerContainer {
+
+ private static SubscriptionManager instance;
+
+ private SingletonSubscriptionManagerContainer() {
+ // utility class should not have a public constructor
+ }
+
+ public static synchronized SubscriptionManager getInstance() {
+ if (instance == null) {
+ instance = new
SubscriptionManagerImpl(SimpleEventingIntegrationTest.URL_SUBSCRIPTION_MANAGER);
+ }
+ return instance;
+ }
+
+ public static synchronized void destroy() {
+ instance = null;
+ }
+
+}
Propchange:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SingletonSubscriptionManagerContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SingletonSubscriptionManagerContainer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingEventSource.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingEventSource.java?rev=1484290&r1=1484289&r2=1484290&view=diff
==============================================================================
---
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingEventSource.java
(original)
+++
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingEventSource.java
Sun May 19 15:09:53 2013
@@ -22,7 +22,7 @@ package org.apache.cxf.ws.eventing.base.
import javax.jws.WebService;
import
org.apache.cxf.ws.eventing.backend.manager.SubscriptionManagerInterfaceForEventSources;
-import
org.apache.cxf.ws.eventing.base.aux.SingletonSubscriptionManagerContainer;
+import org.apache.cxf.ws.eventing.base.SingletonSubscriptionManagerContainer;
import org.apache.cxf.ws.eventing.eventsource.AbstractEventSource;
/**
Modified:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingSubscriptionManager.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingSubscriptionManager.java?rev=1484290&r1=1484289&r2=1484290&view=diff
==============================================================================
---
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingSubscriptionManager.java
(original)
+++
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/services/TestingSubscriptionManager.java
Sun May 19 15:09:53 2013
@@ -22,7 +22,7 @@ package org.apache.cxf.ws.eventing.base.
import javax.jws.WebService;
import
org.apache.cxf.ws.eventing.backend.manager.SubscriptionManagerInterfaceForManagers;
-import
org.apache.cxf.ws.eventing.base.aux.SingletonSubscriptionManagerContainer;
+import org.apache.cxf.ws.eventing.base.SingletonSubscriptionManagerContainer;
import org.apache.cxf.ws.eventing.manager.AbstractSubscriptionManager;
Modified:
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java?rev=1484290&r1=1484289&r2=1484290&view=diff
==============================================================================
---
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
(original)
+++
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
Sun May 19 15:09:53 2013
@@ -39,8 +39,8 @@ import org.apache.cxf.ws.eventing.Subscr
import org.apache.cxf.ws.eventing.backend.notification.NotificatorService;
import org.apache.cxf.ws.eventing.backend.notification.SubscriptionEndStatus;
import org.apache.cxf.ws.eventing.base.SimpleEventingIntegrationTest;
+import org.apache.cxf.ws.eventing.base.SingletonSubscriptionManagerContainer;
import org.apache.cxf.ws.eventing.base.TestUtil;
-import
org.apache.cxf.ws.eventing.base.aux.SingletonSubscriptionManagerContainer;
import
org.apache.cxf.ws.eventing.integration.eventsink.TestingEndToEndpointImpl;
import org.junit.Assert;
import org.junit.Test;
