diff options
| author | Henri Sara <henri.sara@gmail.com> | 2017-05-15 22:34:43 +0300 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2017-05-15 22:34:43 +0300 |
| commit | e788fa906b968a298414e60cbb15cc7d6389b8a1 (patch) | |
| tree | 2ee323f033d9ea05768e56795462e9617597809e /osgi-integration | |
| parent | 91e0eb1ce19aec5f634261534674960b7b7af399 (diff) | |
| download | vaadin-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 'osgi-integration')
| -rw-r--r-- | osgi-integration/src/main/java/com/vaadin/osgi/servlet/VaadinServletRegistration.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/osgi-integration/src/main/java/com/vaadin/osgi/servlet/VaadinServletRegistration.java b/osgi-integration/src/main/java/com/vaadin/osgi/servlet/VaadinServletRegistration.java index c74e830b45..d7ec6289ce 100644 --- a/osgi-integration/src/main/java/com/vaadin/osgi/servlet/VaadinServletRegistration.java +++ b/osgi-integration/src/main/java/com/vaadin/osgi/servlet/VaadinServletRegistration.java @@ -33,8 +33,8 @@ import org.osgi.service.component.annotations.ReferencePolicy; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; import org.osgi.service.log.LogService; -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; import com.vaadin.server.Constants; import com.vaadin.server.VaadinServlet; @@ -118,7 +118,7 @@ public class VaadinServletRegistration { } private String getResourcePath() throws ResourceBundleInactiveException { - VaadinResourceService service = OSGiVaadinResources.getService(); + VaadinResourceService service = OsgiVaadinResources.getService(); return String.format("/%s", service.getResourcePathPrefix()); } |