You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2012/10/07 14:19:08 UTC
svn commit: r1395283 - in /incubator/wookie/trunk: WebContent/WEB-INF/
WebContent/wservices/notsupported/
connector/java/src-test/org/apache/wookie/tests/connector/framework/impl/
parser/java/ src-tests/org/apache/wookie/tests/conformance/ src-tests/or...
Author: scottbw
Date: Sun Oct 7 12:19:07 2012
New Revision: 1395283
URL: http://svn.apache.org/viewvc?rev=1395283&view=rev
Log:
Removed "wservices" - now all widgets are deployed directly into /deploy - similar to how apps are deployed on Tomcat for example. See WOOKIE-232
Removed:
incubator/wookie/trunk/WebContent/wservices/notsupported/index.htm
Modified:
incubator/wookie/trunk/WebContent/WEB-INF/web.xml
incubator/wookie/trunk/connector/java/src-test/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
incubator/wookie/trunk/parser/java/README.txt
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
incubator/wookie/trunk/src/widgetserver.properties
incubator/wookie/trunk/widgets/templates/walkthrough/README.txt
Modified: incubator/wookie/trunk/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/WEB-INF/web.xml?rev=1395283&r1=1395282&r2=1395283&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/WEB-INF/web.xml (original)
+++ incubator/wookie/trunk/WebContent/WEB-INF/web.xml Sun Oct 7 12:19:07 2012
@@ -66,7 +66,7 @@
</filter>
<filter-mapping>
<filter-name>Localized Resource Filter</filter-name>
- <url-pattern>/wservices/*</url-pattern>
+ <url-pattern>/deploy/*</url-pattern>
</filter-mapping>
<servlet>
Modified: incubator/wookie/trunk/connector/java/src-test/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/connector/java/src-test/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java?rev=1395283&r1=1395282&r2=1395283&view=diff
==============================================================================
--- incubator/wookie/trunk/connector/java/src-test/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java (original)
+++ incubator/wookie/trunk/connector/java/src-test/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java Sun Oct 7 12:19:07 2012
@@ -108,7 +108,7 @@ public class WookieConnectorService {
assertEquals("255", widget.getWidth());
assertEquals("383", widget.getHeight());
assertEquals("Apache Wookie (Incubating) Team", widget.getAuthor());
- assertEquals("http://localhost:8080/wookie/wservices/wookie.apache.org/widgets/simplechat/icon.png", widget.getIcon().toString());
+ assertEquals("http://localhost:8080/wookie/deploy/wookie.apache.org/widgets/simplechat/icon.png", widget.getIcon().toString());
assertEquals("http://wookie.apache.org/widgets/simplechat", widget.getIdentifier());
assertEquals("Licensed under the Apache 2.0 License (see http://www.apache.org/licenses/LICENSE-2.0). Smileys created by macpoupou and licensed under Creative Commons Attribution License 3.0. See http://ismileys.free.fr/smileys/ for more information.", widget.getLicense());
}
Modified: incubator/wookie/trunk/parser/java/README.txt
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/README.txt?rev=1395283&r1=1395282&r2=1395283&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/README.txt (original)
+++ incubator/wookie/trunk/parser/java/README.txt Sun Oct 7 12:19:07 2012
@@ -12,7 +12,7 @@ W3CWidgetFactory fac = new W3CWidgetFact
fac.setOutputFolder = my_output_dir; // folder on the local file system widgets will be saved into
fac.setStartPageProcessor = new MyStartPageProcessorImpl(); // class that injects scripts or does any other start file post-processing
fac.setLocales = new String[]{"en","fr","nl"}; // supported locales
-fac.setLocalPath = "/wservices"; // local base path for widget URL
+fac.setLocalPath = "/deploy"; // local base path for widget URL
fac.setFeatures = new String[]{"http://wave.google.com"}; // supported features
W3CWidget widget = fac.parse(new File(my_widget_package_file));
Modified: incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java?rev=1395283&r1=1395282&r2=1395283&view=diff
==============================================================================
--- incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java (original)
+++ incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java Sun Oct 7 12:19:07 2012
@@ -1283,7 +1283,7 @@ public class PackagingAndConfiguration e
String start = getStartFile(response);
// split off the end file name
- // http://localhost:8080/wookie/wservices/ + uid + / + name + ?idkey=...
+ // http://localhost:8080/wookie/deploy/ + uid + / + name + ?idkey=...
URL url;
try {
url = new URL(start);
@@ -1316,7 +1316,7 @@ public class PackagingAndConfiguration e
private String getLocalIconPath(Element widget, Element iconElem){
String id = widget.getAttributeValue("id");
id = WidgetPackageUtils.convertIdToFolderName(id);
- String baseUrl = "http://localhost:8080/wookie/wservices/"+id+"/";
+ String baseUrl = "http://localhost:8080/wookie/deploy/"+id+"/";
if(iconElem == null) return null;
String iconUrl = iconElem.getAttributeValue("src");
String icon = StringUtils.difference(baseUrl,iconUrl);
Modified: incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java?rev=1395283&r1=1395282&r2=1395283&view=diff
==============================================================================
--- incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java (original)
+++ incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java Sun Oct 7 12:19:07 2012
@@ -291,7 +291,7 @@ public class WidgetsControllerTest exten
Document doc = builder.build(post.getResponseBodyAsStream());
Element iconElement = doc.getRootElement().getChild("icon", doc.getRootElement().getNamespace());
assertNotNull(iconElement);
- assertEquals("http://localhost:8080/wookie/wservices/uploadtest_2/icon.png", iconElement.getAttributeValue("src"));
+ assertEquals("http://localhost:8080/wookie/deploy/uploadtest_2/icon.png", iconElement.getAttributeValue("src"));
post.releaseConnection();
}
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java?rev=1395283&r1=1395282&r2=1395283&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java Sun Oct 7 12:19:07 2012
@@ -105,18 +105,18 @@ public class PersistenceManagerFactory
widgetDescription.setDescription("This widget is a placeholder for when no corresponding widget is found for a given type");
widget.getDescriptions().add(widgetDescription);
IContent widgetStartFile = persistenceManager.newInstance(IContent.class);
- widgetStartFile.setSrc(WidgetRuntimeHelper.getWebContextPath() + "/wservices/notsupported/index.htm");
+ widgetStartFile.setSrc(WidgetRuntimeHelper.getWebContextPath() + "/deploy/notsupported/index.htm");
widget.getContentList().add(widgetStartFile);
IContent widgetBUStartFile = persistenceManager.newInstance(IContent.class);
- widgetBUStartFile.setSrc(WidgetRuntimeHelper.getWebContextPath() + "/wservices/notsupported/locales/bu/index.htm");
+ widgetBUStartFile.setSrc(WidgetRuntimeHelper.getWebContextPath() + "/deploy/notsupported/locales/bu/index.htm");
widgetBUStartFile.setLang("bu");
widget.getContentList().add(widgetBUStartFile);
IContent widgetFRStartFile = persistenceManager.newInstance(IContent.class);
- widgetFRStartFile.setSrc(WidgetRuntimeHelper.getWebContextPath() + "/wservices/notsupported/locales/fr/index.htm");
+ widgetFRStartFile.setSrc(WidgetRuntimeHelper.getWebContextPath() + "/deploy/notsupported/locales/fr/index.htm");
widgetFRStartFile.setLang("fr");
widget.getContentList().add(widgetFRStartFile);
IContent widgetENStartFile = persistenceManager.newInstance(IContent.class);
- widgetENStartFile.setSrc(WidgetRuntimeHelper.getWebContextPath() + "/wservices/notsupported/locales/en/index.htm");
+ widgetENStartFile.setSrc(WidgetRuntimeHelper.getWebContextPath() + "/deploy/notsupported/locales/en/index.htm");
widgetENStartFile.setLang("en");
widget.getContentList().add(widgetENStartFile);
IIcon widgetIcon = persistenceManager.newInstance(IIcon.class);
Modified: incubator/wookie/trunk/src/widgetserver.properties
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/widgetserver.properties?rev=1395283&r1=1395282&r2=1395283&view=diff
==============================================================================
--- incubator/wookie/trunk/src/widgetserver.properties (original)
+++ incubator/wookie/trunk/src/widgetserver.properties Sun Oct 7 12:19:07 2012
@@ -26,7 +26,7 @@ widget.email.port=25
# these
#
widget.useruploadfolder=/upload
-widget.widgetfolder=/wservices
+widget.widgetfolder=/deploy
# Set hot_deploy to true, and .wgt files dropped into widget.deployfolder
# will automatically be added to the server
widget.deployfolder=/deploy
Modified: incubator/wookie/trunk/widgets/templates/walkthrough/README.txt
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/walkthrough/README.txt?rev=1395283&r1=1395282&r2=1395283&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/walkthrough/README.txt (original)
+++ incubator/wookie/trunk/widgets/templates/walkthrough/README.txt Sun Oct 7 12:19:07 2012
@@ -71,7 +71,7 @@ questions=URL in the querystring part of
URL can be relative for questions included in the widget or absolute for
questions located anywhere.
-e.g. http://wookie.server/wookie/wservices/wookie.apache.org/widgets/walkabout/
+e.g. http://wookie.server/wookie/deploy/wookie.apache.org/widgets/walkabout/
index.html?questions=xml/more_questions.xml
# Using the widget