cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [5/8] cxf git commit: [CXF-7192] Removing cxf-rt-management-web module, to be restored on demand
Date Thu, 22 Dec 2016 14:23:27 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/browser/Links.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/browser/Links.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/browser/Links.java
deleted file mode 100644
index 63878be..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/browser/Links.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * 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.management.web.browser.client.service.browser;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.google.gwt.xml.client.Document;
-import com.google.gwt.xml.client.Node;
-import com.google.gwt.xml.client.NodeList;
-
-public class Links {
-    public static final Links EMPTY = new Links();
-
-    @Nullable
-    private String first;
-
-    @Nullable
-    private String previous;
-
-    @Nullable
-    private String self;
-
-    @Nullable
-    private String next;
-
-    @Nullable
-    private String last;
-
-    private Links() {
-    }
-
-    public Links(@Nonnull final Document document) {
-        new XmlParser().parseLinks(document);
-    }
-
-    public boolean firstAvailable() {
-        return available(first);
-    }
-
-    public boolean previousAvailable() {
-        return available(previous);
-    }
-
-    public boolean selfAvailable() {
-        return available(self);
-    }
-
-    public boolean nextAvailable() {
-        return available(next);
-    }
-
-    public boolean lastAvailable() {
-        return available(last);
-    }
-
-    @Nullable
-    public String getFirst() {
-        return first;
-    }
-
-    @Nullable
-    public String getPrevious() {
-        return previous;
-    }
-
-    @Nullable
-    public String getSelf() {
-        return self;
-    }
-
-    @Nullable
-    public String getNext() {
-        return next;
-    }
-
-    @Nullable
-    public String getLast() {
-        return last;
-    }
-
-    private boolean available(@Nullable final String link) {
-        return link != null && !"".equals(link);
-    }
-
-    private final class XmlParser {
-        private static final String FEED_TAG = "feed";
-        private static final String LINK_TAG = "link";
-
-        private static final String TYPE_ATTRIBUTE = "rel";
-        private static final String URL_ATTRIBUTE = "href";
-
-        private static final String FIRST_LINK = "first";
-        private static final String PREVIOUS_LINK = "previous";
-        private static final String SELF_LINK = "self";
-        private static final String NEXT_LINK = "next";
-        private static final String LAST_LINK = "last";
-
-        private XmlParser() {
-        }
-
-        private void parseLinks(@Nonnull final Document document) {
-            NodeList linkNodes = document.getElementsByTagName(LINK_TAG);
-
-            if (linkNodes != null) {
-                Node linkNode;
-                for (int i = 0; i < linkNodes.getLength(); i++) {
-                    linkNode = linkNodes.item(i);
-                    if (isLinkBelongToFeed(linkNode)) {
-                        setLink(linkNode);
-                    }
-                }
-            }
-        }
-
-        private boolean isLinkBelongToFeed(@Nonnull final Node node) {
-            return node.getParentNode() != null && FEED_TAG.equals(node.getParentNode().getNodeName());
-        }
-
-        private void setLink(@Nonnull final Node node) {
-            Node typeNode = node.getAttributes().getNamedItem(TYPE_ATTRIBUTE);
-            Node urlNode = node.getAttributes().getNamedItem(URL_ATTRIBUTE);
-
-            if (typeNode != null && urlNode != null) {
-                String typeValue = typeNode.getNodeValue();
-                String urlValue = urlNode.getNodeValue();
-
-                if (FIRST_LINK.equals(typeValue)) {
-                    first = urlValue;
-                } else if (PREVIOUS_LINK.equals(typeValue)) {
-                    previous = urlValue;
-                } else if (SELF_LINK.equals(typeValue)) {
-                    self = urlValue;
-                } else if (NEXT_LINK.equals(typeValue)) {
-                    next = urlValue;
-                } else if (LAST_LINK.equals(typeValue)) {
-                    last = urlValue;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/IdentifierGenerator.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/IdentifierGenerator.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/IdentifierGenerator.java
deleted file mode 100644
index 7a25caf..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/IdentifierGenerator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * 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.management.web.browser.client.service.settings;
-
-public interface IdentifierGenerator {
-    String generateUUID();
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/IdentifierGeneratorImpl.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/IdentifierGeneratorImpl.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/IdentifierGeneratorImpl.java
deleted file mode 100644
index 3028a9e..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/IdentifierGeneratorImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * 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.management.web.browser.client.service.settings;
-
-public class IdentifierGeneratorImpl implements IdentifierGenerator {
-
-    public final native String generateUUID() /*-{
-        return $wnd.Math.uuid();
-    }-*/;
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxy.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxy.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxy.java
deleted file mode 100644
index 35cd72c..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * 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.management.web.browser.client.service.settings;
-
-import com.google.gwt.http.client.RequestCallback;
-
-public interface RemoteStorageProxy {
-    
-    void saveSettings(RequestCallback callback);
-
-    void retrieveSettings(Settings settings, RequestCallback callback);
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java
deleted file mode 100644
index 7a1ad73..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * 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.management.web.browser.client.service.settings;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.core.client.JsArray;
-import com.google.gwt.http.client.RequestBuilder;
-import com.google.gwt.http.client.RequestCallback;
-import com.google.gwt.http.client.RequestException;
-import com.google.gwt.http.client.Response;
-import com.google.gwt.json.client.JSONObject;
-import com.google.gwt.json.client.JSONValue;
-import org.apache.cxf.management.web.browser.client.service.AbstractCallback;
-
-public class RemoteStorageProxyImpl implements RemoteStorageProxy {
-    private static final String HOSTED_MODE_ENDPOINT_URL = "settings";
-    private static final String RESOURCES_ENDPOINT_SUFFIX = "/resources/";
-    private static final String SETTINGS_ENDPOINT_SUFFIX = "/settings";
-    
-    private static final String CONTENT_TYPE_HEADER = "Content-Type";
-    private static final String ACCEPT_HEADER = "Accept";    
-    private static final String JSON_TYPE = "application/json";
-
-    private static final String SETTINGS_KEY = "settings";
-
-    private String endpointURL;
-
-    public void saveSettings(@Nonnull final RequestCallback callback) {
-        RequestBuilder builder = buildRequest(RequestBuilder.GET, buildEndpointURL());
-        execute(null, builder, callback);
-    }
-
-    public void retrieveSettings(@Nonnull final Settings settings, @Nonnull final RequestCallback callback) {
-        RequestBuilder builder = buildRequest(RequestBuilder.PUT, buildEndpointURL());
-        execute(Converter.convertToRemoteSettings(settings), builder, callback);
-    }
-
-    @Nonnull
-    private String buildEndpointURL() {
-        if (endpointURL == null) {
-            String baseURL = GWT.getHostPageBaseURL();
-            if (baseURL.endsWith(RESOURCES_ENDPOINT_SUFFIX)) {
-
-                // compute URL by replace "resources" suffix with "settings" suffix
-                endpointURL = cutResourcesSuffix(baseURL) + SETTINGS_ENDPOINT_SUFFIX;
-            } else {
-
-                // it ought to execute only in hosted mode, because there is diffrent base URL
-                endpointURL = HOSTED_MODE_ENDPOINT_URL;
-            }
-        }
-
-        return endpointURL;
-    }
-
-    @Nonnull
-    private String cutResourcesSuffix(@Nonnull final String url) {
-        return url.substring(0, url.lastIndexOf(RESOURCES_ENDPOINT_SUFFIX));
-    }
-
-    @Nonnull
-    private RequestBuilder buildRequest(@Nonnull final RequestBuilder.Method method,
-                                        @Nonnull final String url) {
-        assert !"".equals(url);
-        
-        RequestBuilder builder = new RequestBuilder(method, url);
-        builder.setHeader(CONTENT_TYPE_HEADER, JSON_TYPE);
-        builder.setHeader(ACCEPT_HEADER, JSON_TYPE);
-
-        return builder;
-    }
-
-    private void execute(@Nullable final RemoteSettings remoteSettings,
-                         @Nonnull final RequestBuilder builder,
-                         @Nonnull final RequestCallback callback) {
-        String json = null;
-        if (remoteSettings != null) {
-
-            // TODO add appropriate comment - wrap  
-            JSONObject rootElement = new JSONObject();
-            rootElement.put(SETTINGS_KEY, new JSONObject(remoteSettings));
-            json = rootElement.toString();
-        }
-
-        try {
-            builder.sendRequest(json, callback);
-        } catch (RequestException ex) {
-            
-            // TODO add custom exception
-            throw new RuntimeException(ex);
-        }
-    }
-
-    protected static class RemoteSettings extends JavaScriptObject {
-
-        protected RemoteSettings() {
-        }
-
-        public final native void setSubscriptions(@Nullable JsArray<RemoteSubscription> subscriptions) /*-{
-            this.subscriptions = subscriptions;
-        }-*/;
-
-        @Nonnull
-        public final native JsArray<RemoteSubscription> getSubscriptions() /*-{
-            if (this.subscriptions != null) {
-                return this.subscriptions;
-            } else {
-                return [];
-            }
-        }-*/;
-    }
-
-    protected static class RemoteSubscription extends JavaScriptObject {
-
-        protected RemoteSubscription() {
-        }
-
-        public final native void setId(@Nullable String id) /*-{
-            this.id = id;
-        }-*/;
-
-        @Nullable
-        public final native String getId() /*-{
-            return this.id;
-        }-*/;
-
-        public final native void setUrl(@Nullable String url) /*-{
-            this.url = url;
-        }-*/;
-
-        @Nullable
-        public final native String getUrl() /*-{
-            return this.url;
-        }-*/;        
-
-        public final native void setName(@Nullable String name) /*-{
-            this.name = name;
-        }-*/;
-
-        @Nullable
-        public final native String getName() /*-{
-            return this.name;
-        }-*/;
-    }
-
-    protected static final class Converter {
-
-        private Converter() {
-        }
-
-        @Nonnull
-        public static Settings convertToSettings(@Nonnull final RemoteSettings remoteSettings) {
-            Settings settings = new Settings();
-
-            JsArray<RemoteSubscription> remoteSubscriptions = remoteSettings.getSubscriptions();
-            for (int i = 0; i < remoteSubscriptions.length(); i++) {
-                settings.getSubscriptions().add(convertToSubscription(remoteSubscriptions.get(i)));
-            }
-
-            return settings;
-        }
-
-        @Nonnull
-        public static Subscription convertToSubscription(@Nonnull RemoteSubscription remoteSubscription) {
-            return new Subscription(remoteSubscription.getId(),
-                remoteSubscription.getName(), remoteSubscription.getUrl());
-        }
-
-        @SuppressWarnings("unchecked") @Nonnull
-        public static RemoteSettings convertToRemoteSettings(@Nonnull final Settings settings) {
-            RemoteSettings remoteSettings = (RemoteSettings) JavaScriptObject.createObject();
-
-            JsArray<RemoteSubscription> remoteSubscriptions =
-                (JsArray<RemoteSubscription>) JavaScriptObject.createArray();
-
-            for (Subscription subscription : settings.getSubscriptions()) {
-                remoteSubscriptions.push(convertToRemoteSubscription(subscription));
-            }
-
-            remoteSettings.setSubscriptions(remoteSubscriptions);
-
-            return remoteSettings;
-        }
-
-        @Nonnull
-        public static RemoteSubscription convertToRemoteSubscription(@Nonnull Subscription subscription) {
-            RemoteSubscription remoteSubscription = (RemoteSubscription) JavaScriptObject.createObject();
-
-            remoteSubscription.setId(subscription.getId());
-            remoteSubscription.setName(subscription.getName());
-            remoteSubscription.setUrl(subscription.getUrl());
-
-            return remoteSubscription;
-        }
-    }
-
-    public abstract static class Callback extends AbstractCallback<Settings> {
-
-        @Override @Nullable
-        protected Settings parse(@Nonnull final Response response) {
-            RemoteSettings result = null;
-
-            if (response.getText() != null && !"".equals(response.getText())) {
-
-                // TODO add appropriate comment - unwrap
-                JSONValue rootElement = new JSONObject(convertFromJSON(response.getText())).get(SETTINGS_KEY);
-                if (rootElement != null && rootElement.isObject() != null) {
-                    result = (RemoteSettings) rootElement.isObject().getJavaScriptObject();
-                }
-            }
-
-            return result != null ? Converter.convertToSettings(result) : null;
-        }
-
-        // TODO check if this method must be final regardless to GWT's guidelines
-        // CHECKSTYLE:OFF
-        @Nonnull
-        private final native JavaScriptObject convertFromJSON(@Nonnull final String json) /*-{
-            return $wnd.JSON.parse(json);
-        }-*/;
-        // CHECKSTYLE:ON
-    }
-
-    public static class NoActionCallback extends AbstractCallback<Settings> {
-
-        @Override
-        public void onSuccess(@Nullable final Settings obj) { }
-
-        @Override @Nullable
-        protected Settings parse(@Nonnull final Response response) {
-            return null;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/Settings.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/Settings.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/Settings.java
deleted file mode 100644
index e5ab3ab..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/Settings.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 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.management.web.browser.client.service.settings;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-public class Settings {
-    @Nullable
-    private Set<Subscription> subscriptions;
-
-    @Nonnull
-    public Set<Subscription> getSubscriptions() {
-        if (subscriptions == null) {
-            subscriptions = new LinkedHashSet<Subscription>();
-        }
-        return subscriptions;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/SettingsFacade.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/SettingsFacade.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/SettingsFacade.java
deleted file mode 100644
index 08c00ce..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/SettingsFacade.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * 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.management.web.browser.client.service.settings;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import org.apache.cxf.management.web.browser.client.event.ChangedSubscriptionsEvent;
-
-//TODO Remove StorageStrategy feature
-@Singleton
-public class SettingsFacade {
-
-    @Nonnull
-    private final RemoteStorageProxy remoteStorage;
-
-    @Nonnull
-    private final EventBus eventBus;
-
-    @Nullable
-    private StorageLayer storageLayer;
-
-    @Nonnull
-    private final IdentifierGenerator identifierGenerator;
-
-    private boolean initialized;
-
-    public enum StorageStrategy {
-        REMOTE
-    }    
-
-    @Inject
-    public SettingsFacade(@Nonnull final RemoteStorageProxy remoteStorage,
-                          @Nonnull final EventBus eventBus,
-                          @Nonnull final IdentifierGenerator identifierGenerator) {
-        this.remoteStorage = remoteStorage;
-        this.eventBus = eventBus;
-        this.identifierGenerator = identifierGenerator;
-    }
-
-    public void initialize(@Nonnull final StorageStrategy strategy) {
-        storageLayer = createStorageLayers(strategy);
-        storageLayer.initialize();
-        initialized = true;
-    }
-
-    public void addSubscription(@Nonnull final String name, @Nonnull final String url) {
-        assert !"".equals(name);
-        assert !"".equals(url);
-        assert storageLayer != null;
-        isValid();
-
-        String id = identifierGenerator.generateUUID();
-        assert id != null && !"".equals(id);
-
-        storageLayer.getSettings().getSubscriptions().add(new Subscription(id, name, url));
-        storageLayer.update();
-    }
-
-    public void updateSubscription(@Nonnull final Subscription subscription) {
-        assert subscription.getUrl() != null && !"".equals(subscription.getUrl());
-        assert storageLayer != null;
-        isValid();
-
-        storageLayer.getSettings().getSubscriptions().remove(subscription);
-        storageLayer.getSettings().getSubscriptions().add(subscription);
-        storageLayer.update();
-    }
-
-    public void removeSubscription(@Nonnull final Subscription subscription) {
-        assert subscription.getUrl() != null && !"".equals(subscription.getUrl());
-        assert storageLayer != null;
-        isValid();
-
-        storageLayer.getSettings().getSubscriptions().remove(subscription);
-        storageLayer.update();
-    }
-
-    @Nonnull
-    public List<Subscription> getSubscriptions() {
-        assert storageLayer != null;
-        isValid();
-
-        return new ArrayList<Subscription>(storageLayer.getSettings().getSubscriptions());
-    }
-
-    private void isValid() {
-        if (!initialized) {
-            throw new IllegalStateException("Storage layers not initialized");
-        }
-    }
-
-    @Nonnull
-    private StorageLayer createStorageLayers(@Nonnull final StorageStrategy storageStrategy) {
-        switch(storageStrategy) {
-        case REMOTE:
-            return new RemoteStorageLayer(remoteStorage, new MemoryStorageLayer());
-        default:
-            throw new IllegalArgumentException("Unknown storage strategy type");
-        }
-    }
-
-    private interface StorageLayer {
-
-        boolean initialize();
-
-        Settings getSettings();
-
-        void update(Settings settings);
-
-        void update();
-
-        void clear();
-    }
-
-    private static class MemoryStorageLayer implements StorageLayer {
-
-        @Nonnull
-        private Settings settings;
-
-        public boolean initialize() {
-            this.settings = new Settings();
-            return false;
-        }
-
-        @Nonnull
-        public Settings getSettings() {
-            return this.settings;
-        }
-
-        public void update(@Nonnull final Settings newSettings) {
-            this.settings = newSettings;
-        }
-
-        public void update() {
-        }
-
-        public void clear() {
-            this.settings = new Settings();
-        }
-    }
-
-    private class RemoteStorageLayer implements StorageLayer {
-
-        @Nonnull
-        private final StorageLayer parent;
-
-        @Nonnull
-        private final RemoteStorageProxy remoteStorage;
-
-        RemoteStorageLayer(@Nonnull final RemoteStorageProxy remoteStorage,
-                                  @Nonnull final StorageLayer parent) {
-            this.parent = parent;
-            this.remoteStorage = remoteStorage;
-        }
-
-        public boolean initialize() {
-            boolean isSuccess = parent.initialize();
-            
-            if (!isSuccess) {
-                remoteStorage.saveSettings(new RemoteStorageProxyImpl.Callback() {
-
-                    @Override
-                    public void onSuccess(@Nullable final Settings retrievedSettings) {
-                        Settings settings = retrievedSettings != null ? retrievedSettings : new Settings();
-
-                        parent.update(settings);
-
-                        eventBus.fireEvent(new ChangedSubscriptionsEvent());
-                    }
-                });
-            }
-
-            return true;
-        }
-
-        @Nonnull
-        public Settings getSettings() {
-            return parent.getSettings();
-        }
-
-        public void update(@Nonnull final Settings settings) {
-            assert settings != null;
-
-            parent.update(settings);
-
-            remoteStorage.retrieveSettings(settings, new RemoteStorageProxyImpl.NoActionCallback());
-        }
-        
-        public void update() {
-            update(parent.getSettings());
-        }
-
-        public void clear() {
-            parent.clear();
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/Subscription.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/Subscription.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/Subscription.java
deleted file mode 100644
index c8009e4..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/Subscription.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * 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.management.web.browser.client.service.settings;
-
-import javax.annotation.Nonnull;
-
-public class Subscription {
-    private String id;
-    private String name;
-    private String url;
-
-    public Subscription(@Nonnull final String id, @Nonnull final String name, @Nonnull final String url) {
-        assert !"".equals(id);
-        assert !"".equals(name);
-        assert !"".equals(url);
-
-        this.id = id;
-        this.name = name;
-        this.url = url;
-    }
-
-    @Nonnull
-    public String getId() {
-        return id;
-    }
-
-    @Nonnull
-    public String getName() {
-        return name;
-    }
-
-    @Nonnull
-    public String getUrl() {
-        return url;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Subscription that = (Subscription)o;
-
-        return !(id != null ? !id.equals(that.id) : that.id != null);
-    }
-
-    @Override
-    public int hashCode() {
-        return id != null ? id.hashCode() : 0;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/AbstractDialog.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/AbstractDialog.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/AbstractDialog.java
deleted file mode 100644
index 268db7c..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/AbstractDialog.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import javax.annotation.Nonnull;
-
-import com.google.gwt.user.client.ui.DialogBox;
-import com.google.gwt.user.client.ui.Widget;
-
-public abstract class AbstractDialog extends DialogBox {
-
-    protected void init(@Nonnull final String title, @Nonnull final Widget widget) {
-        setGlassEnabled(true);
-        setAnimationEnabled(false);
-        setAutoHideEnabled(true);
-
-        setText(title);
-        setWidget(widget);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/BasePresenter.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/BasePresenter.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/BasePresenter.java
deleted file mode 100644
index 25f513c..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/BasePresenter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nonnull;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.user.client.ui.HasWidgets;
-
-
-public abstract class BasePresenter implements Presenter {
-
-    @Nonnull
-    protected final EventBus eventBus;
-
-    @Nonnull
-    private final View view;
-
-    @Nonnull
-    private final BindStrategy bindStrategy;
-
-    @Nonnull
-    private final List<HandlerRegistration> handlerRegistrations;
-
-    public BasePresenter(@Nonnull final EventBus eventBus, @Nonnull final View view,
-                         @Nonnull final BindStrategy bindStrategy) {
-        this.eventBus = eventBus;
-        this.view = view;
-        this.bindStrategy = bindStrategy;
-        this.handlerRegistrations = new ArrayList<HandlerRegistration>();
-    }
-
-    public void go(HasWidgets container) {
-        bindStrategy.bind(container, view);
-    }
-
-    public void unbind() {
-        bindStrategy.unbind(view);
-        
-        for (HandlerRegistration handlerRegistration : handlerRegistrations) {
-            handlerRegistration.removeHandler();
-        }
-        handlerRegistrations.clear();
-    }
-
-    protected void registerHandler(@Nonnull final HandlerRegistration handlerRegistration) {
-        handlerRegistrations.add(handlerRegistration);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/BindStrategy.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/BindStrategy.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/BindStrategy.java
deleted file mode 100644
index f3c4365..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/BindStrategy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import javax.annotation.Nonnull;
-
-import com.google.gwt.user.client.ui.HasWidgets;
-
-//TODO view should decide how to present it - bindstrategy should be receive by View not inject to presenter
-public interface BindStrategy {
-    void bind(@Nonnull HasWidgets container, @Nonnull View view);
-    void unbind(@Nonnull View view);
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/DialogBindStrategyImpl.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/DialogBindStrategyImpl.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/DialogBindStrategyImpl.java
deleted file mode 100644
index 4c172d0..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/DialogBindStrategyImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import javax.annotation.Nonnull;
-
-import com.google.gwt.user.client.ui.DialogBox;
-import com.google.gwt.user.client.ui.HasWidgets;
-import com.google.inject.Singleton;
-
-@Singleton
-public class DialogBindStrategyImpl implements BindStrategy {
-    
-    public void bind(@Nonnull final HasWidgets container, @Nonnull final View view) {
-        assert view instanceof DialogBox;
-
-        ((DialogBox) view).center();
-    }
-
-    public void unbind(@Nonnull final View view) {
-        assert view instanceof DialogBox;
-
-        ((DialogBox) view).hide();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java
deleted file mode 100644
index be58e60..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.KeyPressEvent;
-import com.google.gwt.event.dom.client.KeyPressHandler;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.PopupPanel;
-import com.google.inject.Inject;
-
-import org.apache.cxf.management.web.browser.client.ui.resources.LogBrowserConstans;
-import org.apache.cxf.management.web.browser.client.ui.resources.LogBrowserResources;
-
-/**
- * A dialog box showing an error message, when bad things happen.
- */
-public class ErrorDialog extends PopupPanel {
-    
-    @Nonnull
-    private final LogBrowserResources resources;
-
-    @Nonnull
-    private final LogBrowserConstans contants;
-
-    @Nonnull
-    private final Button closeButton;
-
-    @Inject
-    protected ErrorDialog(@Nonnull final LogBrowserResources resources,
-                          @Nonnull final LogBrowserConstans contants) {
-        super(/* auto hide */false, /* modal */true);
-
-        this.resources = resources;
-        this.contants = contants;
-        this.closeButton = new Button();
-    }
-
-    /**
-     * Create a dialog box to nicely format an exception.
-     */
-    public void setException(@Nonnull final Throwable exception) {
-        String errorClassName = exception.getClass().getName();
-
-        // Remove unwanted package (which begins on 'java.lang.' or 'org.apache.cxf.')
-        if (errorClassName.startsWith("java.lang.")) {
-            errorClassName = errorClassName.substring("java.lang.".length());
-        } else if (errorClassName.startsWith("org.apache.cxf.")) {
-            errorClassName = errorClassName.substring(errorClassName.lastIndexOf('.') + 1);
-        }
-
-        // Remove unwanted suffixes from class name (i.e. 'Exception', 'Error')
-        if (errorClassName.endsWith("Exception")) {
-            errorClassName = errorClassName.substring(0, errorClassName.length() - "Exception".length());
-        } else if (errorClassName.endsWith("Error")) {
-            errorClassName = errorClassName.substring(0, errorClassName.length() - "Error".length());
-        }
-
-        initializeLayout(errorClassName, exception.getMessage());
-    }
-    
-    @Override
-    public void center() {
-        show();
-        closeButton.setFocus(true);
-    }
-
-    private void initializeLayout(@Nonnull final String errorName, @Nullable final String errorMessage) {
-
-        // Create error name and error message labels
-        Label errorNameLabel = new Label(errorName);
-        errorNameLabel.setStyleName(resources.css().errorDialogErrorType());
-
-        Label errorMessageLabel = null;
-        if (errorMessage != null && !"".equals(errorMessage)) {
-            errorMessageLabel = new Label(errorMessage);
-            DOM.setStyleAttribute(errorMessageLabel.getElement(), "whiteSpace", "pre");
-        }
-
-        // Initialize 'close' button
-        closeButton.setText(contants.errorDialogContineButton());
-        closeButton.addClickHandler(new ClickHandler() {
-
-            public void onClick(ClickEvent event) {
-                hide();
-            }
-        });
-        closeButton.addKeyPressHandler(new KeyPressHandler() {
-
-            public void onKeyPress(KeyPressEvent event) {
-
-                /*
-                if the close button is triggered by a key we need to consume the key
-                event, otherwise the key event would be propagated to the parent
-                screen and eventually trigger some unwanted action there after the
-                error dialog was closed
-                 */
-                event.stopPropagation();
-            }
-        });
-
-        // Create 'title' label
-        Label titleLabel = new Label();
-        titleLabel.setStyleName(resources.css().errorDialogTitle());
-        titleLabel.setText(contants.errorDialogTitle());
-
-        // Create wrapper panel for 'error name' and 'error message' labels
-        FlowPanel contentPanel = new FlowPanel();
-        contentPanel.add(errorNameLabel);
-        contentPanel.add(errorMessageLabel);
-
-        // Create wrapper panel for 'close' button
-        FlowPanel buttonsPanel = new FlowPanel();
-        buttonsPanel.setStyleName(resources.css().errorDialogButtons());
-        buttonsPanel.add(closeButton);
-
-        // Create main panel and add all remain widgets
-        FlowPanel centerPanel = new FlowPanel();
-        centerPanel.add(titleLabel);
-        centerPanel.add(contentPanel);
-        centerPanel.add(buttonsPanel);
-
-        // Add styles to window
-        setGlassEnabled(true);
-        getGlassElement().addClassName(resources.css().errorDialogGlass());
-        addStyleName(resources.css().errorDialog());
-
-        // Add main panel
-        add(centerPanel);
-
-        // Set window position
-        int left = Window.getScrollLeft() + 20;
-        int top = Window.getScrollTop() + 20;
-        setPopupPosition(left, top);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/Presenter.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/Presenter.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/Presenter.java
deleted file mode 100644
index 0312d11..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/Presenter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import com.google.gwt.user.client.ui.HasWidgets;
-
-public interface Presenter {
-    void go(HasWidgets container);
-
-    void unbind();
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/PresenterWidget.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/PresenterWidget.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/PresenterWidget.java
deleted file mode 100644
index 2c616b8..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/PresenterWidget.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import com.google.gwt.user.client.ui.HasWidgets;
-
-public interface PresenterWidget {
-    void bind(HasWidgets container, View view);
-    void unbind();
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/View.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/View.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/View.java
deleted file mode 100644
index eba64dd..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/View.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import com.google.gwt.user.client.ui.Widget;
-
-public interface View {
-    Widget asWidget();
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/WidgetBindStrategyImpl.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/WidgetBindStrategyImpl.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/WidgetBindStrategyImpl.java
deleted file mode 100644
index 8f2d463..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/WidgetBindStrategyImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 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.management.web.browser.client.ui;
-
-import javax.annotation.Nonnull;
-
-import com.google.gwt.user.client.ui.HasWidgets;
-import com.google.inject.Singleton;
-
-@Singleton
-public class WidgetBindStrategyImpl implements BindStrategy {
-
-    public void bind(@Nonnull final HasWidgets container, @Nonnull final View view) {
-        assert view.asWidget() != null;
-
-        container.clear();
-        container.add(view.asWidget());
-    }
-
-    public void unbind(@Nonnull final View view) {
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowsePresenter.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowsePresenter.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowsePresenter.java
deleted file mode 100644
index f03be58..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowsePresenter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * 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.management.web.browser.client.ui.browser;
-
-import javax.annotation.Nonnull;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
-
-import org.apache.cxf.management.web.browser.client.ui.BasePresenter;
-import org.apache.cxf.management.web.browser.client.ui.BindStrategy;
-import org.apache.cxf.management.web.browser.client.ui.common.NavigationHeaderPresenter;
-
-@Singleton
-public class BrowsePresenter extends BasePresenter implements BrowseView.Presenter {
-
-    @Inject
-    public BrowsePresenter(@Nonnull EventBus eventBus,
-                           @Nonnull BrowseView view,
-                           @Nonnull @Named("BindStrategyForBrowser") final BindStrategy bindStrategy,
-                           @Nonnull NavigationHeaderPresenter navigationHeaderPresenter,
-                           @Nonnull NavigationSidebarPresenter navigationSidebarPresenter,
-                           @Nonnull ViewerPresenter viewerPresenter) {
-        super(eventBus, view, bindStrategy);
-
-        navigationHeaderPresenter.go(view.getNaviagationHeaderSlot());
-        navigationSidebarPresenter.go(view.getNaviagationSidebarSlot());
-        viewerPresenter.go(view.getViewerSlot());
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseView.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseView.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseView.java
deleted file mode 100644
index 6f5bbd5..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseView.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * 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.management.web.browser.client.ui.browser;
-
-import com.google.gwt.user.client.ui.HasWidgets;
-
-import org.apache.cxf.management.web.browser.client.ui.View;
-
-public interface BrowseView extends View {
-    
-    public interface Presenter {
-    }
-
-    HasWidgets getNaviagationHeaderSlot();
-
-    HasWidgets getNaviagationSidebarSlot();
-
-    HasWidgets getViewerSlot();
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseView.ui.xml
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseView.ui.xml b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseView.ui.xml
deleted file mode 100644
index 4fd11cf..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseView.ui.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
-  -->
-<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui">
-    <ui:with field="res" type="org.apache.cxf.management.web.browser.client.ui.resources.LogBrowserResources"/>
-    <g:RootLayoutPanel>
-        <g:layer>
-            <g:DockLayoutPanel unit="EM">
-                <g:north size="2">
-                    <g:FlowPanel ui:field="navigationHeaderSlot"/>
-                </g:north>
-                <g:center>
-                    <g:SplitLayoutPanel>
-                        <g:west size="192">
-                            <g:FlowPanel styleName="{res.css.navigationSidebarSlot}" ui:field="navigationSidebarSlot"/>
-                        </g:west>
-                        <g:center>
-                            <g:FlowPanel styleName="{res.css.viewerSlot}" ui:field="viewerSlot"/>
-                        </g:center>
-                    </g:SplitLayoutPanel>
-                </g:center>
-            </g:DockLayoutPanel>
-        </g:layer>
-    </g:RootLayoutPanel>
-</ui:UiBinder>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseViewImpl.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseViewImpl.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseViewImpl.java
deleted file mode 100644
index 0c1b0e1..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/BrowseViewImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * 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.management.web.browser.client.ui.browser;
-
-import javax.annotation.Nonnull;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiTemplate;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.HasWidgets;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-@Singleton
-public class BrowseViewImpl extends Composite implements BrowseView {
-
-    @UiTemplate("BrowseView.ui.xml")
-    interface BrowseViewUiBinder extends UiBinder<Widget, BrowseViewImpl> { }
-
-    private static final BrowseViewUiBinder UI_BINDER = GWT.create(BrowseViewUiBinder.class);
-
-    @UiField @Nonnull
-    FlowPanel navigationHeaderSlot;
-
-    @UiField @Nonnull
-    FlowPanel navigationSidebarSlot;    
-
-    @UiField @Nonnull
-    FlowPanel viewerSlot;
-
-    @Inject
-    public BrowseViewImpl() {
-        initWidget(UI_BINDER.createAndBindUi(this));
-
-    }
-
-    public HasWidgets getNaviagationHeaderSlot() {
-        return navigationHeaderSlot;
-    }
-
-    public HasWidgets getNaviagationSidebarSlot() {
-        return navigationSidebarSlot;
-    }
-
-    public HasWidgets getViewerSlot() {
-        return viewerSlot;
-    }
-
-    @Nonnull
-    public Widget asWidget() {
-        return this;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaPresenter.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaPresenter.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaPresenter.java
deleted file mode 100644
index 8b9f1ebd..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaPresenter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * 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.management.web.browser.client.ui.browser;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
-import org.apache.cxf.management.web.browser.client.event.ChangedFilterOptionsEvent;
-import org.apache.cxf.management.web.browser.client.service.browser.FilterOptions;
-import org.apache.cxf.management.web.browser.client.service.browser.FilterOptions.Level;
-import org.apache.cxf.management.web.browser.client.ui.BasePresenter;
-import org.apache.cxf.management.web.browser.client.ui.BindStrategy;
-
-@Singleton
-public class EditCriteriaPresenter extends BasePresenter implements EditCriteriaView.Presenter {
-
-    @Nonnull
-    private final EditCriteriaView view;
-
-    @Inject
-    public EditCriteriaPresenter(@Nonnull final EventBus eventBus,
-            @Nonnull final EditCriteriaView view,
-            @Nonnull @Named("BindStrategyForEditCriteria") final BindStrategy bindStrategy) {
-        super(eventBus, view, bindStrategy);
-
-        this.view = view;
-        this.view.setPresenter(this);
-    }
-
-    public void onSaveButtonClicked() {
-        String phrase = view.getPhraseValue().getValue();
-        Date from = view.getFromValue().getValue();
-        Date to = view.getToValue().getValue();
-
-        List<Level> acceptedLevels = new ArrayList<FilterOptions.Level>();
-
-        if (view.getDebugValue().getValue()) {
-            acceptedLevels.add(Level.DEBUG);
-        }
-        if (view.getInfoValue().getValue()) {
-            acceptedLevels.add(Level.INFO);
-        }
-        if (view.getWarnValue().getValue()) {
-            acceptedLevels.add(Level.WARN);
-        }
-        if (view.getErrorValue().getValue()) {
-            acceptedLevels.add(Level.ERROR);
-        }
-
-        FilterOptions filterOptions;
-        if (from == null && to == null && acceptedLevels.isEmpty()) {
-            filterOptions = FilterOptions.EMPTY;
-        } else {
-            filterOptions = new FilterOptions(phrase, from, to, acceptedLevels);
-        }
-
-        eventBus.fireEvent(new ChangedFilterOptionsEvent(filterOptions));
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaView.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaView.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaView.java
deleted file mode 100644
index a1fef74..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaView.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * 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.management.web.browser.client.ui.browser;
-
-import java.util.Date;
-
-import com.google.gwt.user.client.ui.HasValue;
-import org.apache.cxf.management.web.browser.client.ui.View;
-
-public interface EditCriteriaView extends View {
-    
-    public interface Presenter {
-        void onSaveButtonClicked();
-    }
-
-    HasValue<String> getPhraseValue();
-
-    HasValue<Date> getFromValue();
-
-    HasValue<Date> getToValue();
-
-    HasValue<Boolean> getDebugValue();
-
-    HasValue<Boolean> getInfoValue();
-
-    HasValue<Boolean> getWarnValue();
-
-    HasValue<Boolean> getErrorValue();
-
-    void setPresenter(Presenter presenter);
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaView.ui.xml
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaView.ui.xml b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaView.ui.xml
deleted file mode 100644
index 0a8597a..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaView.ui.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
-  -->
-<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:dp="urn:import:com.google.gwt.user.datepicker.client">
-    <ui:with field="res" type="org.apache.cxf.management.web.browser.client.ui.resources.LogBrowserResources"/>
-    <g:HTMLPanel>
-        <table cellspacing="6">
-            <tr>
-                <td>
-                    <g:Label>Phrase:</g:Label>
-                </td>
-                <td>
-                    <g:TextBox ui:field="phraseTextBox" addStyleDependentNames="clear"/>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <g:Label>From:</g:Label>
-                </td>
-                <td>
-                    <dp:DateBox ui:field="fromDateBox"/>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <g:Label>To:</g:Label>
-                </td>
-                <td>
-                    <dp:DateBox ui:field="toDateBox"/>
-                </td>
-            </tr>
-            <tr>
-                <td valign="top">
-                    <g:Label>Levels:</g:Label>
-                </td>
-                <td>
-                    <g:VerticalPanel>
-                        <g:CheckBox ui:field="debugCheckBox">Debug</g:CheckBox>
-                        <g:CheckBox ui:field="warnCheckBox">Warning</g:CheckBox>
-                        <g:CheckBox ui:field="infoCheckBox">Information</g:CheckBox>
-                        <g:CheckBox ui:field="errorCheckBox">Error</g:CheckBox>
-                    </g:VerticalPanel>
-                </td>
-            </tr>
-        </table>
-        <g:FlowPanel addStyleNames="{res.css.editFeedDialogButtons}">
-            <g:Button ui:field="cancelButton">
-                Cancel
-            </g:Button>
-            <g:Button ui:field="saveButton" addStyleNames="{res.css.editFeedDialogAddButton}">
-                Save
-                        </g:Button>
-        </g:FlowPanel>
-    </g:HTMLPanel>
-</ui:UiBinder>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaViewImpl.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaViewImpl.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaViewImpl.java
deleted file mode 100644
index 1bf44c6..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EditCriteriaViewImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * 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.management.web.browser.client.ui.browser;
-
-import java.util.Date;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
-import com.google.gwt.uibinder.client.UiTemplate;
-import com.google.gwt.user.client.ui.CheckBox;
-import com.google.gwt.user.client.ui.HasValue;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.datepicker.client.DateBox;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import org.apache.cxf.management.web.browser.client.ui.AbstractDialog;
-import org.apache.cxf.management.web.browser.client.ui.resources.LogBrowserConstans;
-
-@Singleton
-public class EditCriteriaViewImpl extends AbstractDialog implements EditCriteriaView {
-    @UiTemplate("EditCriteriaView.ui.xml")
-    interface EditCriteriaViewUiBinder extends UiBinder<Widget, EditCriteriaViewImpl> { }
-
-    private static final EditCriteriaViewUiBinder UI_BINDER = GWT.create(EditCriteriaViewUiBinder.class);
-
-    @UiField @Nonnull TextBox phraseTextBox;
-    @UiField @Nonnull DateBox fromDateBox;
-    @UiField @Nonnull DateBox toDateBox;
-    @UiField @Nonnull CheckBox debugCheckBox;
-    @UiField @Nonnull CheckBox warnCheckBox;
-    @UiField @Nonnull CheckBox infoCheckBox;
-    @UiField @Nonnull CheckBox errorCheckBox;
-
-    @Nonnull private Presenter presenter;
-
-    @Inject
-    public EditCriteriaViewImpl(@Nonnull final LogBrowserConstans constans) {
-        init(constans.editCriteriaDialogTitle(), UI_BINDER.createAndBindUi(this));
-    }
-
-    @UiHandler("cancelButton")
-    void onCancelButtonClicked(@Nonnull final ClickEvent event) {
-        hide();
-    }
-
-    @UiHandler("saveButton")
-    void onSaveButtonClicked(@Nonnull final ClickEvent event) {
-        presenter.onSaveButtonClicked();
-        hide();
-    }
-
-    public HasValue<String> getPhraseValue() {
-        return phraseTextBox;
-    }
-
-    @Nonnull
-    public HasValue<Date> getFromValue() {
-        return fromDateBox;
-    }
-
-    @Nonnull
-    public HasValue<Date> getToValue() {
-        return toDateBox;
-    }
-
-    @Nonnull
-    public HasValue<Boolean> getDebugValue() {
-        return debugCheckBox;
-    }
-
-    @Nonnull
-    public HasValue<Boolean> getInfoValue() {
-        return infoCheckBox;
-    }
-
-    @Nonnull
-    public HasValue<Boolean> getWarnValue() {
-        return warnCheckBox;
-    }
-
-    @Nonnull
-    public HasValue<Boolean> getErrorValue() {
-        return errorCheckBox;
-    }
-
-    @Nullable
-    public Widget asWidget() {
-        return null;
-    }
-
-    public void setPresenter(Presenter presenter) {
-        this.presenter = presenter;
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EntryTable.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EntryTable.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EntryTable.java
deleted file mode 100644
index ba0afc3..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/EntryTable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * 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.management.web.browser.client.ui.browser;
-
-import org.apache.cxf.management.web.browser.client.service.browser.Entry;
-
-public class EntryTable extends SelectableTable<Entry> {
-    public EntryTable() {
-        super(/* hotkeys enabled */ true);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java
----------------------------------------------------------------------
diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java
deleted file mode 100644
index f1335e3..0000000
--- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * 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.management.web.browser.client.ui.browser;
-
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.http.client.URL;
-import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
-import org.apache.cxf.management.web.browser.client.event.ChangedFilterOptionsEvent;
-import org.apache.cxf.management.web.browser.client.event.ChangedFilterOptionsEventHandler;
-import org.apache.cxf.management.web.browser.client.event.ChangedSubscriptionsEvent;
-import org.apache.cxf.management.web.browser.client.event.ChangedSubscriptionsEventHandler;
-import org.apache.cxf.management.web.browser.client.event.GoToEditCriteriaEvent;
-import org.apache.cxf.management.web.browser.client.event.GoToSettingsEvent;
-import org.apache.cxf.management.web.browser.client.event.SelectedSubscriptionEvent;
-import org.apache.cxf.management.web.browser.client.service.browser.FilterOptions;
-import org.apache.cxf.management.web.browser.client.service.browser.FilterOptions.Level;
-import org.apache.cxf.management.web.browser.client.service.settings.SettingsFacade;
-import org.apache.cxf.management.web.browser.client.service.settings.Subscription;
-import org.apache.cxf.management.web.browser.client.ui.BasePresenter;
-import org.apache.cxf.management.web.browser.client.ui.BindStrategy;
-
-@Singleton
-public class NavigationSidebarPresenter extends BasePresenter implements NavigationSidebarView.Presenter {
-    @Nonnull private final NavigationSidebarView view;
-    @Nonnull private final SettingsFacade settingsManager;
-
-    @Nonnull private FilterOptions filterOptions = FilterOptions.EMPTY;
-
-    @Nullable private Subscription selectedSubscriptionInExplorer;
-    @Nullable private Subscription selectedSubscriptionInFilter;
-
-    @Nonnull private List<Subscription> subscriptions;
-
-    @Inject
-    public NavigationSidebarPresenter(@Nonnull final EventBus eventBus,
-            @Nonnull final NavigationSidebarView view,
-            @Nonnull @Named("BindStrategyForNavigationSidebar") final BindStrategy bindStrategy,
-            @Nonnull final SettingsFacade settingsManager) {
-        super(eventBus, view, bindStrategy);
-
-        this.view = view;
-        this.view.setPresenter(this);
-
-        this.settingsManager = settingsManager;
-
-        bind();
-
-        updateSubscriptions();
-    }
-
-    public void onExploreSubcriptionItemClicked(int row) {
-        assert row >= 0 && row < subscriptions.size();
-
-        selectedSubscriptionInExplorer = subscriptions.get(row);
-        selectedSubscriptionInFilter = null;
-
-        eventBus.fireEvent(new SelectedSubscriptionEvent(selectedSubscriptionInExplorer.getUrl()));
-    }
-
-    public void onFilterSubcriptionItemClicked(int row) {
-        assert row >= 0 && row < subscriptions.size();
-
-        selectedSubscriptionInFilter = subscriptions.get(row);
-        selectedSubscriptionInExplorer = null;
-
-        selectSubscriptionWithFilterOptions();
-    }
-
-    private void selectSubscriptionWithFilterOptions() {
-        assert selectedSubscriptionInFilter != null;
-
-        StringBuilder url = new StringBuilder(selectedSubscriptionInFilter.getUrl());
-
-        if (filterOptions != FilterOptions.EMPTY) {
-            url.append("?_s=");
-
-            DateTimeFormat dateTimeFormatter = DateTimeFormat.getFormat("yyyy-MM-dd");
-
-            boolean isFirstAttribute = true;
-
-            if (filterOptions.getPhrase() != null && !"".equals(filterOptions.getPhrase())) {
-                url.append("message==*");
-                url.append(filterOptions.getPhrase());
-                url.append("*;");
-                isFirstAttribute = false;
-            }
-
-            if (filterOptions.getFrom() != null) {
-                url.append("date=ge=");
-                url.append(dateTimeFormatter.format(filterOptions.getFrom()));
-                url.append(";");
-                isFirstAttribute = false;
-            }
-
-            if (filterOptions.getTo() != null) {
-                url.append("date=lt=");
-                url.append(dateTimeFormatter.format(filterOptions.getTo()));
-                url.append(";");
-                isFirstAttribute = false;
-            }
-
-            if (!filterOptions.getLevels().isEmpty()) {
-
-                // Add parenthesis only if not first attribute
-                if (!isFirstAttribute) {
-                    url.append("(");
-                }
-
-                for (Level level : filterOptions.getLevels()) {
-                    url.append("level==");
-                    url.append(level);
-                    url.append(",");
-                }
-
-                // Remove last ';' or ',' from URL
-                url.deleteCharAt(url.length() - 1);
-
-                // Add parenthesis only if not first attribute
-                if (!isFirstAttribute) {
-                    url.append(")");
-                }
-            } else {
-
-                // Remove last ';' or ',' from URL
-                url.deleteCharAt(url.length() - 1);
-            }
-        }
-
-        eventBus.fireEvent(new SelectedSubscriptionEvent(URL.encode(url.toString())));
-    }
-
-    public void onManageSubscriptionsButtonClicked() {
-        eventBus.fireEvent(new GoToSettingsEvent());
-    }
-
-    public void onEditCriteriaHyperinkClicked() {
-        eventBus.fireEvent(new GoToEditCriteriaEvent());
-    }
-
-    private void updateSubscriptions() {
-        subscriptions = settingsManager.getSubscriptions();
-        view.setSubscriptions(subscriptions);
-    }
-
-    private void bind() {
-        eventBus.addHandler(ChangedSubscriptionsEvent.TYPE, new ChangedSubscriptionsEventHandler() {
-
-            public void onChangedSubscriptions(ChangedSubscriptionsEvent event) {
-                updateSubscriptions();
-            }
-        });
-
-        eventBus.addHandler(ChangedFilterOptionsEvent.TYPE, new ChangedFilterOptionsEventHandler() {
-
-            public void onChangedFilterOptions(ChangedFilterOptionsEvent event) {
-                filterOptions = event.getFilterOptions();
-                if (selectedSubscriptionInFilter != null) {
-                    selectSubscriptionWithFilterOptions();
-                }
-            }
-        });
-    }
-}


Mime
View raw message