diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-11-20 15:24:46 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-11-21 10:45:02 +0200 |
| commit | 62f8f102fab8933f2209b8aa7fe9b56ef3c7fa78 (patch) | |
| tree | c73c0af1da735c79190a5d54206a92e9b653f692 /server/src/com/vaadin/annotations | |
| parent | 600ec7d4ffcf019e77752185d0ce3c6ec04c520b (diff) | |
| download | vaadin-framework-62f8f102fab8933f2209b8aa7fe9b56ef3c7fa78.tar.gz vaadin-framework-62f8f102fab8933f2209b8aa7fe9b56ef3c7fa78.zip | |
Rename DependencyResource to PublishedFile (#10224)
Change-Id: I18bd5fbaba7d443cab0626ddd477626995b5f16a
Diffstat (limited to 'server/src/com/vaadin/annotations')
| -rw-r--r-- | server/src/com/vaadin/annotations/JavaScript.java | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/annotations/StyleSheet.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/server/src/com/vaadin/annotations/JavaScript.java b/server/src/com/vaadin/annotations/JavaScript.java index 1a2fdf7583..95e74ddc1a 100644 --- a/server/src/com/vaadin/annotations/JavaScript.java +++ b/server/src/com/vaadin/annotations/JavaScript.java @@ -29,7 +29,7 @@ import com.vaadin.server.ClientConnector; * method for the corresponding client-side connector is invoked. * <p> * Absolute URLs including protocol and host are used as is on the client-side. - * Relative urls are mapped to APP/CONNECTOR/[url] which are by default served + * Relative urls are mapped to APP/PUBLISHED/[url] which are by default served * from the classpath relative to the class where the annotation is defined. * <p> * Example: {@code @JavaScript( "http://host.com/file1.js", "file2.js"})} on the diff --git a/server/src/com/vaadin/annotations/StyleSheet.java b/server/src/com/vaadin/annotations/StyleSheet.java index e1a9efd696..18e78f3530 100644 --- a/server/src/com/vaadin/annotations/StyleSheet.java +++ b/server/src/com/vaadin/annotations/StyleSheet.java @@ -28,6 +28,10 @@ import com.vaadin.server.ClientConnector; * framework ensures the referenced style sheets are loaded before the init * method for the corresponding client-side connector is invoked. * <p> + * Absolute URLs including protocol and host are used as is on the client-side. + * Relative urls are mapped to APP/PUBLISHED/[url] which are by default served + * from the classpath relative to the class where the annotation is defined. + * <p> * Example: {@code @StyleSheet( "http://host.com/file1.css", "file2.css"})} on * the class com.example.MyConnector would load the file * http://host.com/file1.css as is and file2.css from /com/example/file2.css on |