summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@gmail.com>2017-05-15 22:34:43 +0300
committerPekka Hyvönen <pekka@vaadin.com>2017-05-15 22:34:43 +0300
commite788fa906b968a298414e60cbb15cc7d6389b8a1 (patch)
tree2ee323f033d9ea05768e56795462e9617597809e /server
parent91e0eb1ce19aec5f634261534674960b7b7af399 (diff)
downloadvaadin-framework-e788fa906b968a298414e60cbb15cc7d6389b8a1.tar.gz
vaadin-framework-e788fa906b968a298414e60cbb15cc7d6389b8a1.zip
Rename OSGi classes for Java naming conventions (#9320)
- Rename OSGi to Osgi in class names. - Rename VaadinOSGiPortlet to OSGiVaadinPortlet for consistency with Spring, CDI etc. add-ons - Add missing javadoc
Diffstat (limited to 'server')
-rw-r--r--server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java b/server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java
index c68ed518ba..e04594273f 100644
--- a/server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java
+++ b/server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java
@@ -21,8 +21,8 @@ import org.osgi.service.component.annotations.Reference;
import org.osgi.service.http.HttpService;
import org.osgi.service.http.NamespaceException;
-import com.vaadin.osgi.resources.OSGiVaadinResources;
-import com.vaadin.osgi.resources.OSGiVaadinResources.ResourceBundleInactiveException;
+import com.vaadin.osgi.resources.OsgiVaadinResources;
+import com.vaadin.osgi.resources.OsgiVaadinResources.ResourceBundleInactiveException;
import com.vaadin.osgi.resources.VaadinResourceService;
/**
@@ -40,7 +40,7 @@ public class BootstrapContribution {
@Activate
void startup() throws NamespaceException, ResourceBundleInactiveException {
- VaadinResourceService service = OSGiVaadinResources.getService();
+ VaadinResourceService service = OsgiVaadinResources.getService();
for (String resourceName : RESOURCES) {
service.publishResource(resourceName, httpService);
}