You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/04/19 13:54:42 UTC
[09/15] incubator-tamaya git commit: TAMAYA-149 Final fixes
restabilizing modules after Tomcat is now used.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ComponentView.java
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ComponentView.java b/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ComponentView.java
deleted file mode 100644
index 7572510..0000000
--- a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ComponentView.java
+++ /dev/null
@@ -1,175 +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.tamaya.ui.views;
-
-import com.vaadin.navigator.View;
-import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Tree;
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.TypeLiteral;
-import org.apache.tamaya.spi.*;
-import org.apache.tamaya.ui.UIConstants;
-import org.apache.tamaya.ui.ViewProvider;
-import org.apache.tamaya.ui.components.VerticalSpacedLayout;
-import org.apache.tamaya.ui.services.MessageProvider;
-
-import javax.annotation.Priority;
-import java.util.List;
-import java.util.Map;
-
-
-public class ComponentView extends VerticalSpacedLayout implements View {
-
-
- @Priority(20)
- public static final class Provider implements ViewProvider{
-
- @Override
- public ViewLifecycle getLifecycle() {
- return ViewLifecycle.CREATE;
- }
-
- @Override
- public String getUrlPattern() {
- return "/components";
- }
-
- @Override
- public String getDisplayName() {
- return ServiceContextManager.getServiceContext().getService(MessageProvider.class)
- .getMessage("view.components.name");
- }
-
- @Override
- public View createView(){
- return new ComponentView();
- }
- }
-
-
- private Tree configTree = new Tree(ServiceContextManager.getServiceContext().getService(MessageProvider.class)
- .getMessage("default.label.components"));
-
-
- public ComponentView() {
- Label caption = new Label("Components");
- Label description = new Label(
- "This view shows the components currently active. This information may be useful when checking if an" +
- "configuration extension is loaded and for inspection of the configuration and property sources" +
- "invovlved.",
- ContentMode.HTML);
-
- fillComponentTree();
-
- addComponents(caption, description, configTree);
-
- caption.addStyleName(UIConstants.LABEL_HUGE);
- description.addStyleName(UIConstants.LABEL_LARGE);
-
- }
-
- private void fillComponentTree() {
- configTree.removeAllItems();
- Configuration config = ConfigurationProvider.getConfiguration();
-
- String currentParent = "General";
- configTree.addItem(currentParent);
- configTree.addItem("Configuration.class");
- configTree.setItemCaption("Configuration.class", "Configuration class = " + config.getClass().getName());
- configTree.setParent("Configuration.class", currentParent);
- configTree.setChildrenAllowed("Configuration.class", false);
-
- configTree.addItem("ConfigurationContext.class");
- configTree.setItemCaption("ConfigurationContext.class", "ConfigurationContext class = " + config.getContext().getClass().getName());
- configTree.setParent("ConfigurationContext.class", currentParent);
- configTree.setChildrenAllowed("ConfigurationContext.class", false);
-
- configTree.addItem("PropertyValueCombinationPolicy.class");
- configTree.setItemCaption("PropertyValueCombinationPolicy.class", PropertyValueCombinationPolicy.class.getSimpleName() + " class = " + config.getContext().getPropertyValueCombinationPolicy().getClass().getName());
- configTree.setParent("PropertyValueCombinationPolicy.class", currentParent);
- configTree.setChildrenAllowed("PropertyValueCombinationPolicy.class", false);
-
- configTree.addItem("ConfigurationContext.types");
- configTree.setItemCaption("ConfigurationContext.types", "Configurable types");
- configTree.setParent("ConfigurationContext.types", currentParent);
- for(Map.Entry<TypeLiteral<?>,List<PropertyConverter<?>>> en:config.getContext().getPropertyConverters().entrySet()){
- configTree.addItem(en.getKey());
- configTree.setItemCaption(en.getKey(), "Type = " + en.getKey().toString());
- configTree.setParent(en.getKey(), "ConfigurationContext.types");
- for(PropertyConverter conv: en.getValue()){
- configTree.addItem(conv);
- configTree.setItemCaption(conv, conv.getClass().getName());
- configTree.setChildrenAllowed(conv, false);
- configTree.setParent(conv, en.getKey());
- }
- }
- configTree.addItem("ConfigurationContext.filters");
- configTree.setItemCaption("ConfigurationContext.filters", "Property Filters");
- for(PropertyFilter filter: config.getContext().getPropertyFilters()){
- configTree.addItem(filter);
- configTree.setItemCaption(filter, filter.getClass().getName());
- configTree.setChildrenAllowed(filter, false);
- configTree.setParent(filter, "ConfigurationContext.filters");
- }
- configTree.addItem("ConfigurationContext.sources");
- configTree.setItemCaption("ConfigurationContext.sources", "Property Sources");
- for(PropertySource source: config.getContext().getPropertySources()){
- configTree.addItem(source);
- configTree.setItemCaption(source, "name = "+source.getName());
- configTree.setParent(source, "ConfigurationContext.sources");
-
- configTree.addItem(source.toString() + ".ordinal");
- configTree.setItemCaption(source.toString() + ".ordinal", "ordinal = "+source.getOrdinal());
- configTree.setParent(source.toString() + ".ordinal", source);
- configTree.setChildrenAllowed(source.toString() + ".ordinal", false);
- configTree.addItem(source.toString() + ".class");
- configTree.setItemCaption(source.toString() + ".class", "class = "+source.getClass().getName());
- configTree.setChildrenAllowed(source.toString() + ".class", false);
- configTree.setParent(source.toString() + ".class", source);
- Map<String,String> props = source.getProperties();
- configTree.addItem(props);
- configTree.setItemCaption(props, "properties:");
- configTree.setParent(props, source);
- for(Map.Entry propEn:props.entrySet()){
- String entryKey = props.hashCode() + propEn.getKey().toString();
- configTree.addItem(entryKey);
- configTree.setChildrenAllowed(entryKey, false);
- configTree.setItemCaption(entryKey, propEn.getKey() + "=" + propEn.getValue());
- configTree.setParent(entryKey, props);
- }
- }
- }
-
- private String getCaption(String key, String value) {
- int index = key.lastIndexOf('.');
- if(index<0){
- return key + " = " + value;
- }else{
- return key.substring(index+1) + " = " + value;
- }
- }
-
- @Override
- public void enter(ViewChangeListener.ViewChangeEvent event) {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ConfigView.java
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ConfigView.java b/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ConfigView.java
deleted file mode 100644
index e286bf2..0000000
--- a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ConfigView.java
+++ /dev/null
@@ -1,199 +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.tamaya.ui.views;
-
-import com.vaadin.navigator.View;
-import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.ui.*;
-import javafx.scene.control.TabPane;
-import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.spi.ServiceContextManager;
-import org.apache.tamaya.ui.UIConstants;
-import org.apache.tamaya.ui.ViewProvider;
-import org.apache.tamaya.ui.components.VerticalSpacedLayout;
-import org.apache.tamaya.ui.services.MessageProvider;
-
-import javax.annotation.Priority;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-
-
-public class ConfigView extends VerticalSpacedLayout implements View {
-
- @Priority(10)
- public static final class Provider implements ViewProvider{
-
- @Override
- public ViewLifecycle getLifecycle() {
- return ViewLifecycle.CREATE;
- }
-
- @Override
- public String getUrlPattern() {
- return "/config";
- }
-
- @Override
- public String getDisplayName() {
- return ServiceContextManager.getServiceContext().getService(MessageProvider.class)
- .getMessage("view.config.name");
- }
-
- @Override
- public View createView(){
- return new ConfigView();
- }
- }
-
- private TextField keyFilter = new TextField("Key filter");
- private TextField valueFilter = new TextField("Value filter");
- private Tree tree = new Tree("Current Configuration");
-
- public ConfigView() {
- Label caption = new Label("Raw Configuration");
- Label description = new Label(
- "This view shows the overall <b>raw</b> configuration tree. Dependening on your access rights you" +
- "may see partial or masked data. Similarly configuration can be <i>read-only</i> or <i>mutable</i>.",
- ContentMode.HTML);
-
- TabSheet tabPane = new TabSheet();
- VerticalLayout configLayout = new VerticalLayout();
-
- HorizontalLayout filters = new HorizontalLayout();
-
- Button filterButton = new Button("Filter", new Button.ClickListener() {
- @Override
- public void buttonClick(Button.ClickEvent clickEvent) {
- fillTree();
- }
- });
- filters.setDefaultComponentAlignment(Alignment.BOTTOM_LEFT);
- filters.addComponents(keyFilter, valueFilter, filterButton);
-
- fillTree();
- configLayout.addComponents(filters, tree);
- tabPane.addTab(configLayout, "Configuration");
- TextArea envProps = new TextArea();
- StringBuilder b = new StringBuilder();
- envProps.setHeight("100%");
- envProps.setWidth("100%");
- envProps.setSizeFull();
- envProps.setRows(System.getenv().size());
- for(Map.Entry<String,String> en:new TreeMap<>(System.getenv()).entrySet()){
- b.append(en.getKey()).append("=").append(en.getValue()).append('\n');
- }
- envProps.setValue(b.toString());
- envProps.setReadOnly(true);
- tabPane.addTab(envProps, "Environment Properties");
- TextArea sysProps = new TextArea();
- sysProps.setSizeFull();
- sysProps.setRows(System.getProperties().size());
- b.setLength(0);
- for(Map.Entry<Object,Object> en:new TreeMap<>(System.getProperties()).entrySet()){
- b.append(en.getKey()).append("=").append(en.getValue()).append('\n');
- }
- sysProps.setValue(b.toString());
- sysProps.setReadOnly(true);
- tabPane.addTab(sysProps, "System Properties");
- TextArea runtimeProps = new TextArea();
- runtimeProps.setRows(5);
- b.setLength(0);
- b.append("Available Processors : ").append(Runtime.getRuntime().availableProcessors()).append('\n');
- b.append("Free Memory : ").append(Runtime.getRuntime().freeMemory()).append('\n');
- b.append("Max Memory : ").append(Runtime.getRuntime().maxMemory()).append('\n');
- b.append("Total Memory : ").append(Runtime.getRuntime().totalMemory()).append('\n');
- b.append("Default Locale : ").append(Locale.getDefault()).append('\n');
- runtimeProps.setValue(b.toString());
- runtimeProps.setReadOnly(true);
- tabPane.addTab(runtimeProps, "Runtime Properties");
- runtimeProps.setSizeFull();
- addComponents(caption, description, tabPane);
-
- caption.addStyleName(UIConstants.LABEL_HUGE);
- description.addStyleName(UIConstants.LABEL_LARGE);
-
- }
-
- private void fillTree() {
- String keyFilterExp = this.keyFilter.getValue();
- if(keyFilterExp.isEmpty()){
- keyFilterExp = null;
- }
- String valueFilterExp = this.valueFilter.getValue();
- if(valueFilterExp.isEmpty()){
- valueFilterExp = null;
- }
- tree.removeAllItems();
- for(Map.Entry<String,String> entry: ConfigurationProvider.getConfiguration().getProperties().entrySet()){
- String key = entry.getKey();
- if(keyFilterExp!=null && !key.matches(keyFilterExp)){
- continue;
- }
- if(valueFilterExp!=null && !entry.getValue().matches(valueFilterExp)){
- continue;
- }
- tree.addItem(key);
- tree.setItemCaption(key, getCaption(key, entry.getValue()));
- tree.setChildrenAllowed(key, false);
- String parent = null;
- int start = 0;
- int index = key.indexOf('.', start);
- while(index>0){
- String subItem = key.substring(0,index);
- String caption = key.substring(start, index);
- tree.addItem(subItem);
- tree.setItemCaption(subItem, caption);
- if(parent!=null){
- tree.setParent(subItem, parent);
- }
- parent = subItem;
- start = index+1;
- index = key.indexOf('.', start);
- }
- String lastItem = key.substring(start);
- if(!lastItem.equals(key)){
- if(parent!=null){
- tree.setParent(key, parent);
- }else{
- // should not happen
- }
- }else{ // singl root entry
- if(parent!=null) {
- tree.setParent(key, parent);
- }
- }
- }
- }
-
- private String getCaption(String key, String value) {
- int index = key.lastIndexOf('.');
- if(index<0){
- return key + " = " + value;
- }else{
- return key.substring(index+1) + " = " + value;
- }
- }
-
- @Override
- public void enter(ViewChangeListener.ViewChangeEvent event) {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ErrorView.java
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ErrorView.java b/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ErrorView.java
deleted file mode 100644
index ef3fa2e..0000000
--- a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/ErrorView.java
+++ /dev/null
@@ -1,40 +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.tamaya.ui.views;
-
-import com.vaadin.navigator.View;
-import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.VerticalLayout;
-import org.apache.tamaya.ui.UIConstants;
-
-public class ErrorView extends VerticalLayout implements View {
-
- @Override
- public void enter(ViewChangeListener.ViewChangeEvent event) {
- setSizeFull();
- setMargin(true);
- Label label = new Label("Could not find a view with that name. You are most likely doing it wrong.");
- label.addStyleName(UIConstants.LABEL_FAILURE);
-
- addComponent(label);
- setComponentAlignment(label, Alignment.MIDDLE_CENTER);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/HomeView.java
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/HomeView.java b/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/HomeView.java
deleted file mode 100644
index 78297d2..0000000
--- a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/HomeView.java
+++ /dev/null
@@ -1,80 +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.tamaya.ui.views;
-
-import com.vaadin.navigator.View;
-import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.ui.Label;
-import org.apache.tamaya.spi.ServiceContextManager;
-import org.apache.tamaya.ui.CurrentUser;
-import org.apache.tamaya.ui.UIConstants;
-import org.apache.tamaya.ui.ViewProvider;
-import org.apache.tamaya.ui.components.VerticalSpacedLayout;
-import org.apache.tamaya.ui.services.MessageProvider;
-
-import javax.annotation.Priority;
-
-
-public class HomeView extends VerticalSpacedLayout implements View {
-
- @Priority(0)
- public static final class Provider implements ViewProvider{
-
- @Override
- public ViewLifecycle getLifecycle() {
- return ViewLifecycle.CREATE;
- }
-
- @Override
- public String getUrlPattern() {
- return "";
- }
-
- @Override
- public String getDisplayName() {
- return ServiceContextManager.getServiceContext().getService(MessageProvider.class)
- .getMessage("view.home.name");
- }
-
- @Override
- public View createView(){
- return new HomeView();
- }
- }
-
- public HomeView() {
- Label caption = new Label("Welcome, " + CurrentUser.get().getUserID());
- Label description = new Label(
- "<b>Apache Tamaya</b> is an API and extendable framework for accessing and managing configuration.<br/> \n" +
- "Please check the project's home page <a href='http://tamaya.incubator.apache.org'>http://tamaya.incubator.apache.org</a>.",
- ContentMode.HTML);
-
- addComponents(caption, description);
-
- caption.addStyleName(UIConstants.LABEL_HUGE);
- description.addStyleName(UIConstants.LABEL_LARGE);
-
- }
-
- @Override
- public void enter(ViewChangeListener.ViewChangeEvent event) {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginBox.java
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginBox.java b/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginBox.java
deleted file mode 100644
index 049d885..0000000
--- a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginBox.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.apache.tamaya.ui.views.login;
-
-import com.vaadin.event.ShortcutAction;
-import com.vaadin.ui.*;
-import org.apache.tamaya.spi.ServiceContextManager;
-import org.apache.tamaya.ui.UIConstants;
-import org.apache.tamaya.ui.User;
-import org.apache.tamaya.ui.event.EventBus;
-import org.apache.tamaya.ui.services.MessageProvider;
-import org.apache.tamaya.ui.services.UserService;
-
-
-public class LoginBox extends VerticalLayout {
-
- private UserService userService = new UserService() {
- @Override
- public User login(String userId, String credentials) {
- if("admin".equals(userId)){
- return new User("admin", "Administrator");
- }
- return null;
- }
- }; // TODO Load
- private TextField username;
- private PasswordField password;
-
- public LoginBox() {
- setWidth("400px");
- addStyleName(UIConstants.LOGIN_BOX);
- setSpacing(true);
- setMargin(true);
-
- addCaption();
- addForm();
- addButtons();
- }
-
- private void addCaption() {
- Label caption = new Label("Login to system");
- addComponent(caption);
-
- caption.addStyleName(UIConstants.LABEL_H1);
- }
-
- private void addForm() {
- FormLayout loginForm = new FormLayout();
- MessageProvider mp = ServiceContextManager.getServiceContext().getService(MessageProvider.class);
- username = new TextField(mp.getMessage("default.label.username"));
- password = new PasswordField(mp.getMessage("default.label.password"));
- loginForm.addComponents(username, password);
- addComponent(loginForm);
- loginForm.setSpacing(true);
- for(Component component:loginForm){
- component.setWidth("100%");
- }
- username.focus();
- }
-
- private void addButtons() {
- HorizontalLayout buttonsLayout = new HorizontalLayout();
- Button forgotButton = new Button("Forgot", new Button.ClickListener() {
- @Override
- public void buttonClick(Button.ClickEvent clickEvent) {
- Notification.show("Not implemented", Notification.Type.TRAY_NOTIFICATION);
- }
- });
- Button loginButton = new Button("Login", new Button.ClickListener() {
- @Override
- public void buttonClick(Button.ClickEvent clickEvent) {
- login();
- }
- });
- buttonsLayout.addComponents(forgotButton, loginButton);
- addComponent(buttonsLayout);
- buttonsLayout.setSpacing(true);
- forgotButton.addStyleName(UIConstants.BUTTON_LINK);
- loginButton.addStyleName(UIConstants.BUTTON_PRIMARY);
- loginButton.setClickShortcut(ShortcutAction.KeyCode.ENTER);
- setComponentAlignment(buttonsLayout, Alignment.BOTTOM_RIGHT);
- }
-
- private void login() {
- User user = userService.login(username.getValue(), password.getValue());
- if(user!=null){
- EventBus.post(new LoginEvent(user));
- }else{
- Notification.show("Login failed.", "Hint: use any non-empty strings", Notification.Type.WARNING_MESSAGE);
- username.focus();
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginEvent.java
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginEvent.java b/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginEvent.java
deleted file mode 100644
index b6ba2b4..0000000
--- a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginEvent.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.apache.tamaya.ui.views.login;
-
-import org.apache.tamaya.ui.User;
-
-public class LoginEvent {
- private User user;
-
- public LoginEvent(User user) {
- this.user = user;
- }
-
- public User getUser() {
- return user;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginView.java
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginView.java b/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginView.java
deleted file mode 100644
index e1181d1..0000000
--- a/sandbox/ui/src/main/java/org/apache/tamaya/ui/views/login/LoginView.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.apache.tamaya.ui.views.login;
-
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.VerticalLayout;
-
-public class LoginView extends VerticalLayout {
-
- public LoginView() {
- setSizeFull();
- setDefaultComponentAlignment(Alignment.MIDDLE_CENTER);
- addComponent(new LoginBox());
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/resources/META-INF/services/org.apache.tamaya.ui.ViewProvider
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/resources/META-INF/services/org.apache.tamaya.ui.ViewProvider b/sandbox/ui/src/main/resources/META-INF/services/org.apache.tamaya.ui.ViewProvider
deleted file mode 100644
index eeb467b..0000000
--- a/sandbox/ui/src/main/resources/META-INF/services/org.apache.tamaya.ui.ViewProvider
+++ /dev/null
@@ -1,21 +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 current 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.
-#
-org.apache.tamaya.ui.views.HomeView$Provider
-org.apache.tamaya.ui.views.ConfigView$Provider
-org.apache.tamaya.ui.views.ComponentView$Provider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/resources/META-INF/services/org.apache.tamaya.ui.services.MessageProvider
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/resources/META-INF/services/org.apache.tamaya.ui.services.MessageProvider b/sandbox/ui/src/main/resources/META-INF/services/org.apache.tamaya.ui.services.MessageProvider
deleted file mode 100644
index 6ce4a9f..0000000
--- a/sandbox/ui/src/main/resources/META-INF/services/org.apache.tamaya.ui.services.MessageProvider
+++ /dev/null
@@ -1,19 +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 current 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.
-#
-org.apache.tamaya.ui.internal.ConfigurationBasedMessageProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/resources/config/application.yml
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/resources/config/application.yml b/sandbox/ui/src/main/resources/config/application.yml
deleted file mode 100644
index a22ec36..0000000
--- a/sandbox/ui/src/main/resources/config/application.yml
+++ /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 current 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.
-#
-
-server:
- type: default
- maxThreads: 1024
- applicationConnectors:
- - type: http
- port: 8090
- adminConnectors:
- - type: http
- port: 8091
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/main/resources/ui/lang/tamaya.properties
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/main/resources/ui/lang/tamaya.properties b/sandbox/ui/src/main/resources/ui/lang/tamaya.properties
deleted file mode 100644
index 16880d4..0000000
--- a/sandbox/ui/src/main/resources/ui/lang/tamaya.properties
+++ /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 current 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.
-#
-project.name=Apache Tamaya
-default.label.logout=Log out
-default.label.unknown=<unknown>
-default.label.username=Username
-default.label.password=Password
-default.label.components=Components
-
-view.config.name=Configuration
-view.home.name=Home
-view.components.name=Components
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1a11d159/sandbox/ui/src/test/resources/config/application.yml
----------------------------------------------------------------------
diff --git a/sandbox/ui/src/test/resources/config/application.yml b/sandbox/ui/src/test/resources/config/application.yml
deleted file mode 100644
index 33c353c..0000000
--- a/sandbox/ui/src/test/resources/config/application.yml
+++ /dev/null
@@ -1,32 +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 current 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.
-#
-
-server:
- type: default
- maxThreads: 1024
- applicationConnectors:
- - type: http
- port: 8090
- - type: https
- port: 8453
- adminConnectors:
- - type: http
- port: 8091
- - type: https
- port: 8453
\ No newline at end of file