You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by el...@apache.org on 2009/07/14 17:16:14 UTC
svn commit: r793931 [1/2] - in /incubator/wink/trunk: src/site/apt/
wink-client/src/main/java/org/apache/wink/client/
wink-client/src/main/java/org/apache/wink/client/internal/
wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/
wink...
Author: elib
Date: Tue Jul 14 15:16:12 2009
New Revision: 793931
URL: http://svn.apache.org/viewvc?rev=793931&view=rev
Log:
removing "Symphony" references [WINK-27]
Removed:
incubator/wink/trunk/src/site/apt/security.apt
Modified:
incubator/wink/trunk/src/site/apt/downloads.apt
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java
incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/atom/AtomTest.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java
incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/bookmarks.properties
incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/apps/HelloWorld/build.xml
incubator/wink/trunk/wink-examples/apps/QADefect/build.xml
incubator/wink/trunk/wink-examples/apps/QADefect/readme.txt
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/build.xml
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/readme.txt
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/qadefectContext-server.xml
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/apps/SimpleDefects/build.xml
incubator/wink/trunk/wink-examples/client/QADefects-client/build.xml
incubator/wink/trunk/wink-examples/client/QADefects-client/readme.txt
incubator/wink/trunk/wink-examples/core/CustomContext/build.xml
incubator/wink/trunk/wink-examples/core/CustomContext/pom.xml
incubator/wink/trunk/wink-examples/core/CustomContext/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/build.xml
incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/pom.xml
incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/core/Jaxb/build.xml
incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml
incubator/wink/trunk/wink-examples/core/Jaxb/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/core/Preconditions/build.xml
incubator/wink/trunk/wink-examples/core/Preconditions/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/Asset/build.xml
incubator/wink/trunk/wink-examples/ext/Asset/pom.xml
incubator/wink/trunk/wink-examples/ext/Asset/readme.txt
incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml
incubator/wink/trunk/wink-examples/ext/DynamicResource/pom.xml
incubator/wink/trunk/wink-examples/ext/DynamicResource/readme.txt
incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/webapp/WEB-INF/bookmarks.properties
incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/DynamicResource/src/site/apt/index.apt
incubator/wink/trunk/wink-examples/ext/History/build.xml
incubator/wink/trunk/wink-examples/ext/History/readme.txt
incubator/wink/trunk/wink-examples/ext/History/src/main/webapp/WEB-INF/configuration.properties
incubator/wink/trunk/wink-examples/ext/History/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/history.properties
incubator/wink/trunk/wink-examples/ext/LinkBuilders/build.xml
incubator/wink/trunk/wink-examples/ext/LinkBuilders/pom.xml
incubator/wink/trunk/wink-examples/ext/LinkBuilders/readme.txt
incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/build.xml
incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/pom.xml
incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/readme.txt
incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/Scope/build.xml
incubator/wink/trunk/wink-examples/ext/Scope/pom.xml
incubator/wink/trunk/wink-examples/ext/Scope/readme.txt
incubator/wink/trunk/wink-examples/ext/Scope/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/Spring/build.xml
incubator/wink/trunk/wink-examples/ext/Spring/pom.xml
incubator/wink/trunk/wink-examples/ext/Spring/readme.txt
incubator/wink/trunk/wink-examples/ext/Spring/src/main/webapp/WEB-INF/bookmarks-context.xml
incubator/wink/trunk/wink-examples/ext/Spring/src/main/webapp/WEB-INF/bookmarks.properties
incubator/wink/trunk/wink-examples/ext/Spring/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/WebDAV/build.xml
incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-scripts/wink-dist/build.xml
incubator/wink/trunk/wink-scripts/wink-dist/readme.txt
incubator/wink/trunk/wink-scripts/wink-site-deploy/pom.xml
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ServletWinkApplicationTest.java
incubator/wink/trunk/wink-server/src/test/resources/org/apache/wink/server/internal/ErrorResponseTestNoMessage.properties
incubator/wink/trunk/wink-server/src/test/resources/org/apache/wink/server/internal/ErrorResponseTestNoTrace.properties
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Response.java
incubator/wink/trunk/wink-webdav/src/site/apt/index.apt
Modified: incubator/wink/trunk/src/site/apt/downloads.apt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/src/site/apt/downloads.apt?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/src/site/apt/downloads.apt (original)
+++ incubator/wink/trunk/src/site/apt/downloads.apt Tue Jul 14 15:16:12 2009
@@ -37,7 +37,7 @@
*-----------+----------------------------------------------+
|| Version || Artifact || Description
*-----------+----------------------------------------------+
-| @PROJECT_VERSION@ | {{{@RESPOSITORY_LOCATION@/@DEPLOY_DIRECTORY@/com/hp/sw/bto/ast/symphony/rest/symphony-sdk-dist/@PROJECT_VERSION@/}symphony-sdk-dist:@PROJECT_VERSION@}} | distribution zip - includes sdk jars, dependencies jars, javadocs and sources. |
+| @PROJECT_VERSION@ | {{{@RESPOSITORY_LOCATION@/@DEPLOY_DIRECTORY@/org/apache/wink-dist/@PROJECT_VERSION@/}wink-dist:@PROJECT_VERSION@}} | distribution zip - includes sdk jars, dependencies jars, javadocs and sources. |
*-----------+----------------------------------------------+
** Client Module Distribution
@@ -47,5 +47,5 @@
*-----------+----------------------------------------------+
|| Version || Artifact || Description
*-----------+----------------------------------------------+
-| @PROJECT_VERSION@ | {{{@RESPOSITORY_LOCATION@/@DEPLOY_DIRECTORY@/com/hp/sw/bto/ast/symphony/rest/symphony-client/@PROJECT_VERSION@/}symphony-client:@PROJECT_VERSION@}} |
+| @PROJECT_VERSION@ | {{{@RESPOSITORY_LOCATION@/@DEPLOY_DIRECTORY@/org/apache/wink/wink-client/@PROJECT_VERSION@/}wink-client:@PROJECT_VERSION@}} |
*-----------+----------------------------------------------+
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java Tue Jul 14 15:16:12 2009
@@ -6,18 +6,18 @@
* 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.wink.client;
@@ -73,7 +73,7 @@
}
private void initDefaultApplication() {
- // TODO: use SimpleSymphonyAplication
+ // TODO: use SimpleWinkAplication
applications(new WinkApplication() {
@Override
public Set<Class<?>> getClasses() {
@@ -119,7 +119,7 @@
/**
* Get the proxy host
- *
+ *
* @return the proxy host
*/
public final String getProxyHost() {
@@ -128,7 +128,7 @@
/**
* Set the proxy host
- *
+ *
* @param proxyHost
* proxy host
* @return this client configuration
@@ -144,7 +144,7 @@
/**
* Get the proxy port
- *
+ *
* @return the proxy port
*/
public final int getProxyPort() {
@@ -153,7 +153,7 @@
/**
* Set the proxy port
- *
+ *
* @param proxyPort
* proxy port
* @return this client configuration
@@ -172,7 +172,7 @@
/**
* Get the connect timeout in milliseconds
- *
+ *
* @return the connect timeout in milliseconds
*/
public final int getConnectTimeout() {
@@ -181,7 +181,7 @@
/**
* Set the connect timeout in milliseconds
- *
+ *
* @param connectTimeout
* the connect timeout in milliseconds
* @return this client configuration
@@ -197,7 +197,7 @@
/**
* Get the read timeout in milliseconds
- *
+ *
* @return the read timeout in milliseconds
*/
public final int getReadTimeout() {
@@ -206,7 +206,7 @@
/**
* Set the read timeout in milliseconds
- *
+ *
* @param readTimeout
* the read timeout in milliseconds
* @return this client configuration
@@ -222,7 +222,7 @@
/**
* Returns whether to client will automatically follow redirects
- *
+ *
* @return true if client will automatically follow redirects; false otherwise
*/
public final boolean isFollowRedirects() {
@@ -231,7 +231,7 @@
/**
* Set whether to client will automatically follow redirects
- *
+ *
* @param followRedirects
* whether to client will automatically follow redirects
* @return this client configuration
@@ -247,7 +247,7 @@
/**
* Get an unmodifiable list of the client handlers
- *
+ *
* @return an unmodifiable list of the client handlers
*/
public final List<ClientHandler> getHandlers() {
@@ -256,7 +256,7 @@
/**
* Add client handlers
- *
+ *
* @param handlers
* the handlers to add
* @return this client configuration
@@ -284,7 +284,7 @@
* handlers.
* <p>
* This method should be overridden in order to provide an alternate connection handler.
- *
+ *
* @return the connection handler
*/
protected ConnectionHandler getConnectionHandler() {
@@ -293,7 +293,7 @@
/**
* Get an unmodifiable list of the applications
- *
+ *
* @return
*/
public final List<Application> getApplications() {
@@ -302,7 +302,7 @@
/**
* Add applications
- *
+ *
* @param applications
* the applications to add
* @return this client configuration
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java Tue Jul 14 15:16:12 2009
@@ -142,7 +142,7 @@
}
if (application instanceof WinkApplication) {
- processSymphonyApplication((WinkApplication)application);
+ processWinkApplication((WinkApplication)application);
}
}
@@ -167,7 +167,7 @@
}
}
- private void processSymphonyApplication(WinkApplication sApplication) {
+ private void processWinkApplication(WinkApplication sApplication) {
Set<Object> instances = sApplication.getInstances();
double priority = sApplication.getPriority();
if (instances == null) {
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java Tue Jul 14 15:16:12 2009
@@ -52,7 +52,7 @@
public class ResourceImpl implements Resource {
- private static final String USER_AGENT = "Symphony Client v1.0";
+ private static final String USER_AGENT = "Wink Client v0.1";
private ProvidersRegistry providersRegistry;
private ClientConfig config;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java Tue Jul 14 15:16:12 2009
@@ -42,8 +42,8 @@
*/
public abstract class UriTemplateProcessor implements Comparable<UriTemplateProcessor>, Cloneable {
- protected static final String TEMPLATE_TAIL_NAME = "symphony.TemplateTail";
- protected static final String TEMPLATE_HEAD_NAME = "symphony.TemplateHead";
+ protected static final String TEMPLATE_TAIL_NAME = "wink.TemplateTail";
+ protected static final String TEMPLATE_HEAD_NAME = "wink.TemplateHead";
protected static final String TEMPLATE_TAIL_PATTERN = "(/.*)?";
protected String template;
Modified: incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers (original)
+++ incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers Tue Jul 14 15:16:12 2009
@@ -19,7 +19,7 @@
# The priority of the providers is the following:
# 1. Media Type: n/m > n/* > *.*
-# 2. Priority property, if the provider was loaded by SymphonyApplication,
+# 2. Priority property, if the provider was loaded by WinkApplication,
# by default the priority is set to 0.5
# 3. Order of the providers. The later provider was added, the higher priority it has.
# This means that if this file is added by a single Application, which occurs by default,
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java Tue Jul 14 15:16:12 2009
@@ -30,9 +30,9 @@
public class SimpleWinkApplicationTest extends TestCase {
- public void testSimpleSymphonyApplication() {
- SimpleWinkApplication simpleSymphonyApplication = new SimpleWinkApplication("org//apache//wink//common//internal//application//custom.app");
- Set<Class<?>> classes = simpleSymphonyApplication.getClasses();
+ public void testSimpleWinkApplication() {
+ SimpleWinkApplication simpleWinkApplication = new SimpleWinkApplication("org//apache//wink//common//internal//application//custom.app");
+ Set<Class<?>> classes = simpleWinkApplication.getClasses();
assertTrue(classes.contains(FileProvider.class));
assertTrue(classes.contains(SourceProvider.DOMSourceProvider.class));
}
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/atom/AtomTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/atom/AtomTest.java?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/atom/AtomTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/atom/AtomTest.java Tue Jul 14 15:16:12 2009
@@ -6,18 +6,18 @@
* 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.wink.common.model.atom;
@@ -58,214 +58,214 @@
public class AtomTest extends TestCase {
-
+
private static final String ATOM_TEXT_TEXT = "<title type=\"text\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">title</title>\n";
private static final String ATOM_TEXT_HTML = "<title type=\"html\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\"><h1>title</h1></title>\n";
- private static final String ATOM_TEXT_XHTML =
- "<title type=\"xhtml\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
+ private static final String ATOM_TEXT_XHTML =
+ "<title type=\"xhtml\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
" <div xmlns=\""+RestConstants.NAMESPACE_XHTML+"\">\n" +
" <h1>title</h1>\n" +
- " </div>\n" +
+ " </div>\n" +
"</title>\n";
- private static final String ATOM_TEXT_XHTML_WITH_DIV =
- "<title type=\"xhtml\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
+ private static final String ATOM_TEXT_XHTML_WITH_DIV =
+ "<title type=\"xhtml\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
" <div xmlns=\""+RestConstants.NAMESPACE_XHTML+"\">\n" +
" <h1>\n" +
" <div>title</div>\n" +
" </h1>\n" +
- " </div>\n" +
+ " </div>\n" +
"</title>\n";
-
-
+
+
private static final String ATOM_CONTENT_TEXT = "<content type=\"text\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">title</content>\n";
private static final String ATOM_CONTENT_HTML = "<content type=\"html\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\"><h1>title</h1></content>\n";
- private static final String ATOM_CONTENT_XHTML =
- "<content type=\"xhtml\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
+ private static final String ATOM_CONTENT_XHTML =
+ "<content type=\"xhtml\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
" <div xmlns=\""+RestConstants.NAMESPACE_XHTML+"\">\n" +
" <h1>title</h1>\n" +
- " </div>\n" +
+ " </div>\n" +
"</content>\n";
- private static final String ATOM_CONTENT_XML =
+ private static final String ATOM_CONTENT_XML =
"<content type=\"application/xml\" xml:lang=\"en-us\" xml:base=\"http://title/base\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
" <x xmlns=\"http://x/\">title</x>\n" +
"</content>\n";
-
+
private static final String ATOM_ENTRY_1 = replaceTimeToken(
- "<entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
- " <id>1</id>\n" +
- " <updated>@TIME@</updated>\n" +
- " <title type=\"text\">title</title>\n" +
- " <summary type=\"text\">summary</summary>\n" +
- " <published>@TIME@</published>\n" +
- " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
- " <author>\n" +
- " <email>author@hp.com</email>\n" +
- " <name>author</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </author>\n" +
- " <contributor>\n" +
- " <email>cont@hp.com</email>\n" +
- " <name>cont</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </contributor>\n" +
+ "<entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
+ " <id>1</id>\n" +
+ " <updated>@TIME@</updated>\n" +
+ " <title type=\"text\">title</title>\n" +
+ " <summary type=\"text\">summary</summary>\n" +
+ " <published>@TIME@</published>\n" +
+ " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
+ " <author>\n" +
+ " <email>author@hp.com</email>\n" +
+ " <name>author</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </author>\n" +
+ " <contributor>\n" +
+ " <email>cont@hp.com</email>\n" +
+ " <name>cont</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </contributor>\n" +
" <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
"</entry>\n");
private static final String ATOM_ENTRY_2 = replaceTimeToken(
- "<entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
- " <id>2</id>\n" +
- " <updated>@TIME@</updated>\n" +
- " <title type=\"text\">title</title>\n" +
- " <summary type=\"text\">summary</summary>\n" +
- " <published>@TIME@</published>\n" +
- " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
- " <author>\n" +
- " <email>author@hp.com</email>\n" +
- " <name>author</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </author>\n" +
- " <contributor>\n" +
- " <email>cont@hp.com</email>\n" +
- " <name>cont</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </contributor>\n" +
+ "<entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
+ " <id>2</id>\n" +
+ " <updated>@TIME@</updated>\n" +
+ " <title type=\"text\">title</title>\n" +
+ " <summary type=\"text\">summary</summary>\n" +
+ " <published>@TIME@</published>\n" +
+ " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
+ " <author>\n" +
+ " <email>author@hp.com</email>\n" +
+ " <name>author</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </author>\n" +
+ " <contributor>\n" +
+ " <email>cont@hp.com</email>\n" +
+ " <name>cont</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </contributor>\n" +
" <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
- " <content type=\"text/plain\">Gustaf's Knäckebröd</content>\n" +
+ " <content type=\"text/plain\">Gustaf's Knäckebröd</content>\n" +
"</entry>\n");
private static final String ATOM_ENTRY_3 = replaceTimeToken(
- "<entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
- " <id>3</id>\n" +
- " <updated>@TIME@</updated>\n" +
- " <title type=\"text\">title</title>\n" +
- " <summary type=\"text\">summary</summary>\n" +
- " <published>@TIME@</published>\n" +
- " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
- " <author>\n" +
- " <email>author@hp.com</email>\n" +
- " <name>author</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </author>\n" +
- " <contributor>\n" +
- " <email>cont@hp.com</email>\n" +
- " <name>cont</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </contributor>\n" +
+ "<entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
+ " <id>3</id>\n" +
+ " <updated>@TIME@</updated>\n" +
+ " <title type=\"text\">title</title>\n" +
+ " <summary type=\"text\">summary</summary>\n" +
+ " <published>@TIME@</published>\n" +
+ " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
+ " <author>\n" +
+ " <email>author@hp.com</email>\n" +
+ " <name>author</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </author>\n" +
+ " <contributor>\n" +
+ " <email>cont@hp.com</email>\n" +
+ " <name>cont</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </contributor>\n" +
" <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
- " <content type=\"application/xml\">\n" +
+ " <content type=\"application/xml\">\n" +
" <x1 xmlns=\"xxx\" xmlns:y=\"yyy\">\n" +
" <x2>\n" +
" <y:y1>Gustaf's Knäckebröd</y:y1>\n" +
" </x2>\n" +
- " </x1>\n" +
- " </content>\n" +
+ " </x1>\n" +
+ " </content>\n" +
"</entry>\n");
-
+
private static final String ATOM_FEED_1 = replaceTimeToken(
- "<feed xml:lang=\"en-us\" xml:base=\"http://feed/base\" anyAttr=\"anyAttrValue\" xmlns:opensearch=\"http://a9.com/-/spec/opensearch/1.1/\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
- " <id>id</id>\n" +
- " <updated>@TIME@</updated>\n" +
- " <title type=\"text\">title</title>\n" +
- " <subtitle type=\"text\">subtitle</subtitle>\n" +
- " <opensearch:itemsPerPage>5</opensearch:itemsPerPage>\n" +
- " <opensearch:startIndex>6</opensearch:startIndex>\n" +
+ "<feed xml:lang=\"en-us\" xml:base=\"http://feed/base\" anyAttr=\"anyAttrValue\" xmlns:opensearch=\"http://a9.com/-/spec/opensearch/1.1/\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
+ " <id>id</id>\n" +
+ " <updated>@TIME@</updated>\n" +
+ " <title type=\"text\">title</title>\n" +
+ " <subtitle type=\"text\">subtitle</subtitle>\n" +
+ " <opensearch:itemsPerPage>5</opensearch:itemsPerPage>\n" +
+ " <opensearch:startIndex>6</opensearch:startIndex>\n" +
" <opensearch:totalResults>7</opensearch:totalResults>\n" +
" <opensearch:Query searchTerms=\"query 1\"/>\n" +
" <opensearch:Query searchTerms=\"query 2\"/>\n" +
- " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
- " <author>\n" +
- " <email>author@hp.com</email>\n" +
- " <name>author</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </author>\n" +
- " <contributor>\n" +
- " <email>cont@hp.com</email>\n" +
- " <name>cont</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </contributor>\n" +
- " <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
- " <generator version=\"1.0\" uri=\"http://generator/uri\" xml:lang=\"en-us\" xml:base=\"http://generator/base\">symphony</generator>\n" +
- " <icon>icon</icon>\n" +
- " <logo>logo</logo>\n" +
- " <rights type=\"text\">rights</rights>\n" +
- " <entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\">\n" +
- " <id>1</id>\n" +
- " <updated>@TIME@</updated>\n" +
- " <title type=\"text\">title</title>\n" +
- " <summary type=\"text\">summary</summary>\n" +
- " <published>@TIME@</published>\n" +
- " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
- " <author>\n" +
- " <email>author@hp.com</email>\n" +
- " <name>author</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </author>\n" +
- " <contributor>\n" +
- " <email>cont@hp.com</email>\n" +
- " <name>cont</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </contributor>\n" +
- " <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
- " <content type=\"application/xml\">\n" +
+ " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
+ " <author>\n" +
+ " <email>author@hp.com</email>\n" +
+ " <name>author</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </author>\n" +
+ " <contributor>\n" +
+ " <email>cont@hp.com</email>\n" +
+ " <name>cont</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </contributor>\n" +
+ " <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
+ " <generator version=\"1.0\" uri=\"http://generator/uri\" xml:lang=\"en-us\" xml:base=\"http://generator/base\">wink</generator>\n" +
+ " <icon>icon</icon>\n" +
+ " <logo>logo</logo>\n" +
+ " <rights type=\"text\">rights</rights>\n" +
+ " <entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\">\n" +
+ " <id>1</id>\n" +
+ " <updated>@TIME@</updated>\n" +
+ " <title type=\"text\">title</title>\n" +
+ " <summary type=\"text\">summary</summary>\n" +
+ " <published>@TIME@</published>\n" +
+ " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
+ " <author>\n" +
+ " <email>author@hp.com</email>\n" +
+ " <name>author</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </author>\n" +
+ " <contributor>\n" +
+ " <email>cont@hp.com</email>\n" +
+ " <name>cont</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </contributor>\n" +
+ " <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
+ " <content type=\"application/xml\">\n" +
" <x1 xmlns=\"xxx\" xmlns:y=\"yyy\">\n" +
" <x2>\n" +
" <y:y1>Gustaf's Knäckebröd</y:y1>\n" +
" </x2>\n" +
- " </x1>\n" +
- " </content>\n" +
- " </entry>\n" +
+ " </x1>\n" +
+ " </content>\n" +
+ " </entry>\n" +
"</feed>\n");
private static final String ATOM_FEED_2 = replaceTimeToken(
- "<feed xml:lang=\"en-us\" xml:base=\"http://feed/base\" anyAttr=\"anyAttrValue\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
- " <id>id</id>\n" +
- " <updated>@TIME@</updated>\n" +
- " <title type=\"text\">title</title>\n" +
- " <subtitle type=\"text\">subtitle</subtitle>\n" +
- " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
- " <author>\n" +
- " <email>author@hp.com</email>\n" +
- " <name>author</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </author>\n" +
- " <contributor>\n" +
- " <email>cont@hp.com</email>\n" +
- " <name>cont</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </contributor>\n" +
- " <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
- " <generator version=\"1.0\" uri=\"http://generator/uri\" xml:lang=\"en-us\" xml:base=\"http://generator/base\">symphony</generator>\n" +
- " <icon>icon</icon>\n" +
- " <logo>logo</logo>\n" +
- " <rights type=\"text\">rights</rights>\n" +
- " <entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\">\n" +
- " <id>1</id>\n" +
- " <updated>@TIME@</updated>\n" +
- " <title type=\"text\">title</title>\n" +
- " <summary type=\"text\">summary</summary>\n" +
- " <published>@TIME@</published>\n" +
- " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
- " <author>\n" +
- " <email>author@hp.com</email>\n" +
- " <name>author</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </author>\n" +
- " <contributor>\n" +
- " <email>cont@hp.com</email>\n" +
- " <name>cont</name>\n" +
- " <uri>http://uri</uri>\n" +
- " </contributor>\n" +
- " <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
- " <content type=\"application/xml\">\n" +
+ "<feed xml:lang=\"en-us\" xml:base=\"http://feed/base\" anyAttr=\"anyAttrValue\" xmlns=\"http://www.w3.org/2005/Atom\">\n" +
+ " <id>id</id>\n" +
+ " <updated>@TIME@</updated>\n" +
+ " <title type=\"text\">title</title>\n" +
+ " <subtitle type=\"text\">subtitle</subtitle>\n" +
+ " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
+ " <author>\n" +
+ " <email>author@hp.com</email>\n" +
+ " <name>author</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </author>\n" +
+ " <contributor>\n" +
+ " <email>cont@hp.com</email>\n" +
+ " <name>cont</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </contributor>\n" +
+ " <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
+ " <generator version=\"1.0\" uri=\"http://generator/uri\" xml:lang=\"en-us\" xml:base=\"http://generator/base\">wink</generator>\n" +
+ " <icon>icon</icon>\n" +
+ " <logo>logo</logo>\n" +
+ " <rights type=\"text\">rights</rights>\n" +
+ " <entry xml:lang=\"en-us\" xml:base=\"http://entry/base\" anyAttr=\"anyAttrValue\">\n" +
+ " <id>1</id>\n" +
+ " <updated>@TIME@</updated>\n" +
+ " <title type=\"text\">title</title>\n" +
+ " <summary type=\"text\">summary</summary>\n" +
+ " <published>@TIME@</published>\n" +
+ " <link href=\"href\" type=\"text/plain\" rel=\"rel\" hreflang=\"en-us\" title=\"title\" length=\"10\"/>\n" +
+ " <author>\n" +
+ " <email>author@hp.com</email>\n" +
+ " <name>author</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </author>\n" +
+ " <contributor>\n" +
+ " <email>cont@hp.com</email>\n" +
+ " <name>cont</name>\n" +
+ " <uri>http://uri</uri>\n" +
+ " </contributor>\n" +
+ " <category label=\"label\" scheme=\"scheme\" term=\"term\"/>\n" +
+ " <content type=\"application/xml\">\n" +
" <x1 xmlns=\"xxx\" xmlns:y=\"yyy\">\n" +
" <x2>\n" +
" <y:y1>Gustaf's Knäckebröd</y:y1>\n" +
" </x2>\n" +
- " </x1>\n" +
- " </content>\n" +
- " </entry>\n" +
+ " </x1>\n" +
+ " </content>\n" +
+ " </entry>\n" +
"</feed>\n");
-
+
private static JAXBContext ctx;
-
+
static {
try {
ctx = JAXBContext.newInstance(AtomFeed.class, AtomEntry.class, AtomText.class);
@@ -273,17 +273,17 @@
throw new RuntimeException(e);
}
}
-
+
public void testAtomTextMarshal() throws Exception {
Marshaller m = JAXBUtils.createMarshaller(ctx);
-
+
AtomText text = new AtomText();
text.setBase("http://title/base");
text.setLang("en-us");
-
+
JAXBNamespacePrefixMapper mapper = new JAXBNamespacePrefixMapper(RestConstants.NAMESPACE_ATOM);
mapper.omitNamespace(RestConstants.NAMESPACE_OPENSEARCH);
-
+
// test type TEXT
text.setType(AtomTextType.text);
text.setValue("title");
@@ -291,7 +291,7 @@
StringWriter writer = new StringWriter();
AtomJAXBUtils.marshal(m, element, null, mapper, writer);
assertEquals(ATOM_TEXT_TEXT, writer.toString());
-
+
// test type HTML
text.setType(AtomTextType.html);
text.setValue("<h1>title</h1>");
@@ -299,7 +299,7 @@
writer = new StringWriter();
AtomJAXBUtils.marshal(m, element, null, mapper, writer);
assertEquals(ATOM_TEXT_HTML, writer.toString());
-
+
// test type XHTML
text.setType(AtomTextType.xhtml);
text.setValue("<h1>title</h1>");
@@ -308,7 +308,7 @@
AtomJAXBUtils.marshal(m, element, null, mapper, writer);
assertEquals(ATOM_TEXT_XHTML, writer.toString());
}
-
+
public void testAtomTextUnmarshal() throws Exception {
Unmarshaller u = JAXBUtils.createUnmarshaller(ctx);
Object element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_TEXT_TEXT));
@@ -320,7 +320,7 @@
assertEquals("http://title/base", text.getBase());
assertEquals("title", text.getValue());
assertEquals(AtomTextType.text, text.getType());
-
+
element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_TEXT_HTML));
assertNotNull(element);
assertTrue(element instanceof AtomText);
@@ -330,7 +330,7 @@
assertEquals("http://title/base", text.getBase());
assertEquals("<h1>title</h1>", text.getValue());
assertEquals(AtomTextType.html, text.getType());
-
+
element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_TEXT_XHTML));
assertNotNull(element);
assertTrue(element instanceof AtomText);
@@ -341,10 +341,10 @@
assertEquals("<h1 xmlns=\""+RestConstants.NAMESPACE_XHTML+"\">title</h1>", text.getValue());
assertEquals(AtomTextType.xhtml, text.getType());
}
-
+
public void testAtomTextUnmarshalXhtml() throws Exception {
Unmarshaller u = JAXBUtils.createUnmarshaller(ctx);
-
+
Object element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_TEXT_XHTML_WITH_DIV));
assertNotNull(element);
assertTrue(element instanceof AtomText);
@@ -358,21 +358,21 @@
public void testAtomContentMarshal() throws Exception {
Marshaller m = JAXBUtils.createMarshaller(ctx);
-
+
JAXBNamespacePrefixMapper mapper = new JAXBNamespacePrefixMapper(RestConstants.NAMESPACE_ATOM);
mapper.omitNamespace(RestConstants.NAMESPACE_OPENSEARCH);
AtomContent content = new AtomContent();
content.setBase("http://title/base");
content.setLang("en-us");
-
+
content.setType("text");
content.setValue("title");
JAXBElement<AtomContent> element = (new ObjectFactory()).createContent(content);
StringWriter writer = new StringWriter();
AtomJAXBUtils.marshal(m, element, null, mapper, writer);
assertEquals(ATOM_CONTENT_TEXT, writer.toString());
-
+
content.setType("html");
content.setValue("<h1>title</h1>");
element = (new ObjectFactory()).createContent(content);
@@ -394,7 +394,7 @@
AtomJAXBUtils.marshal(m, element, null, mapper, writer);
assertEquals(ATOM_CONTENT_XML, writer.toString());
}
-
+
public void testAtomContentUnmarshal() throws Exception {
Unmarshaller u = JAXBUtils.createUnmarshaller(ctx);
Object element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_CONTENT_TEXT));
@@ -416,7 +416,7 @@
assertEquals("http://title/base", content.getBase());
assertEquals("<h1>title</h1>", content.getValue());
assertEquals("html", content.getType());
-
+
element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_CONTENT_XHTML));
assertNotNull(element);
assertTrue(element instanceof AtomContent);
@@ -437,7 +437,7 @@
assertEquals("<x xmlns=\"http://x/\">title</x>", content.getValue());
assertEquals("application/xml", content.getType());
}
-
+
public void testAtomEntryMarshal() throws Exception {
Marshaller m = AtomEntry.getMarshaller();
@@ -446,7 +446,7 @@
StringWriter writer = new StringWriter();
AtomJAXBUtils.marshal(m, element, null, writer);
assertEquals(ATOM_ENTRY_1, writer.toString());
-
+
entry = getEntryWithPlainTextContent("2");
element = (new ObjectFactory()).createEntry(entry);
writer = new StringWriter();
@@ -459,14 +459,14 @@
AtomJAXBUtils.marshal(m, element, null, writer);
assertEquals(ATOM_ENTRY_3, writer.toString());
}
-
+
public void testAtomEntryUnmarshal() throws Exception {
Unmarshaller u = AtomEntry.getUnmarshaller();
Object element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_ENTRY_1));
assertNotNull(element);
assertTrue(element instanceof AtomEntry);
-
+
AtomEntry entry = AtomEntry.unmarshal(new StringReader(ATOM_ENTRY_1));
assertEquals("en-us", entry.getLang());
assertEquals("http://entry/base", entry.getBase());
@@ -491,7 +491,7 @@
assertEquals("label", entry.getCategories().get(0).getLabel());
assertEquals("scheme", entry.getCategories().get(0).getScheme());
assertEquals("term", entry.getCategories().get(0).getTerm());
-
+
element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_ENTRY_2));
assertNotNull(element);
assertTrue(element instanceof AtomEntry);
@@ -501,7 +501,7 @@
assertNotNull(entry.getContent());
assertEquals("text/plain", entry.getContent().getType());
assertEquals("Gustaf's Knäckebröd", entry.getContent().getValue());
-
+
element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_ENTRY_3));
assertNotNull(element);
assertTrue(element instanceof AtomEntry);
@@ -515,20 +515,20 @@
public void testAtomFeedMarshal() throws Exception {
Marshaller m = AtomFeed.getMarshaller();
-
+
AtomFeed feed = getFeed();
JAXBElement<AtomFeed> element = (new ObjectFactory()).createFeed(feed);
StringWriter writer = new StringWriter();
AtomJAXBUtils.marshal(m, element, null, writer);
assertEquals(ATOM_FEED_1, writer.toString());
}
-
+
public void testAtomFeedUnmarshal() throws Exception {
Unmarshaller u = AtomFeed.getUnmarshaller();
Object element = AtomJAXBUtils.unmarshal(u, new StringReader(ATOM_FEED_1));
assertNotNull(element);
assertTrue(element instanceof AtomFeed);
-
+
AtomFeed feed = AtomFeed.unmarshal(new StringReader(ATOM_FEED_1));
assertEquals("en-us", feed.getLang());
assertEquals("http://feed/base", feed.getBase());
@@ -564,7 +564,7 @@
assertEquals("query 1", openSearchQuery.get(0).getSearchTerms());
assertEquals("query 2", openSearchQuery.get(1).getSearchTerms());
}
-
+
public void testAtomFeedMarshalUnmarshal() throws Exception {
Marshaller m = AtomFeed.getMarshaller();
Unmarshaller u = AtomFeed.getUnmarshaller();
@@ -574,7 +574,7 @@
AtomJAXBUtils.marshal(m, element, null, feed.getNamespacePrefixMapper(), writer);
assertEquals(ATOM_FEED_1, writer.toString());
}
-
+
public void testAtomFeedMarshalUnmarshalWithoutOpenSearch() throws Exception {
Marshaller m = AtomFeed.getMarshaller();
Unmarshaller u = AtomFeed.getUnmarshaller();
@@ -615,7 +615,7 @@
link3.setRel("rel2");
entry.getLinks().add(link5NoType);
-
+
List<AtomLink> links = entry.getLinks("rel1", "type1");
assertEquals(1, links.size());
assertEquals("href1", links.get(0).getHref());
@@ -624,7 +624,7 @@
assertEquals(2, links.size());
assertEquals("href2", links.get(0).getHref());
assertEquals("href3", links.get(1).getHref());
-
+
links = entry.getLinksByRelation("rel2");
assertEquals(2, links.size());
assertEquals("href2", links.get(0).getHref());
@@ -648,14 +648,14 @@
} catch(NullPointerException e) {
// passed!
}
-
+
try {
entry.getLinks("", null);
fail("expected NullPointerException");
} catch(NullPointerException e) {
// passed!
}
-
+
try {
entry.getLinks("", null);
fail("expected NullPointerException");
@@ -664,7 +664,7 @@
}
}
-
+
private AtomFeed getFeed() throws Exception {
AtomFeed feed = new AtomFeed();
feed.setBase("http://feed/base");
@@ -673,7 +673,7 @@
generator.setBase("http://generator/base");
generator.setLang("en-us");
generator.setUri("http://generator/uri");
- generator.setValue("symphony");
+ generator.setValue("wink");
generator.setVersion("1.0");
feed.setGenerator(generator);
feed.setIcon("icon");
@@ -681,14 +681,14 @@
feed.setItemsPerPage(5);
feed.setStartIndex(6);
feed.setTotalResults(7);
-
+
OpenSearchQuery query = new OpenSearchQuery();
query.setSearchTerms("query 1");
feed.addOpenSearchQuery(query);
query = new OpenSearchQuery();
query.setSearchTerms("query 2");
feed.addOpenSearchQuery(query);
-
+
feed.setLang("en-us");
feed.setLogo("logo");
AtomText rights = new AtomText();
@@ -703,7 +703,7 @@
title.setType(AtomTextType.text);
title.setValue("title");
feed.setTitle(title);
- feed.setUpdated(getDate());
+ feed.setUpdated(getDate());
AtomPerson author = new AtomPerson();
author.setEmail("author@hp.com");
author.setName("author");
@@ -730,7 +730,7 @@
feed.getEntries().add(getEntryWithXmlContent("1"));
return feed;
}
-
+
private static Date getDate() {
return getCalendar().toGregorianCalendar().getTime();
}
@@ -747,12 +747,12 @@
XMLGregorianCalendar xmlGregCal = datatypeFactory.newXMLGregorianCalendar(calendar);
return xmlGregCal;
}
-
+
private static String replaceTimeToken(String string) {
XMLGregorianCalendar calendar = getCalendar();
return string.replace("@TIME@", calendar.toXMLFormat());
}
-
+
private AtomEntry getEntryWithoutContent(String id) throws Exception {
AtomEntry entry = new AtomEntry();
entry.setId(id);
@@ -812,5 +812,5 @@
entry.setContent(content);
return entry;
}
-
+
}
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java Tue Jul 14 15:16:12 2009
@@ -6,18 +6,18 @@
* 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.wink.common.uri;
import static org.junit.Assert.assertArrayEquals;
@@ -622,7 +622,6 @@
assertEquals("varA", "a%3Ab", result.getFirst("varA"));
// character ":" is reserved, however hp-soa requires to match it
- // bug #41880: symphony misinterprets special characters (:,)
result = matcher.match("/prefix/a:b");
assertNotNull("match ok :", result);
assertEquals("match size :", 1, result.size());
Modified: incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/bookmarks.properties
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/bookmarks.properties?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/bookmarks.properties (original)
+++ incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/bookmarks.properties Tue Jul 14 15:16:12 2009
@@ -17,5 +17,4 @@
## under the License.
##
-symphony.generator=BookmarksExample
wink.defaultUrisRelative=false
\ No newline at end of file
Modified: incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/web.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/web.xml Tue Jul 14 15:16:12 2009
@@ -36,7 +36,7 @@
</init-param>
<init-param>
- <param-name>symphony.propertiesLocation</param-name>
+ <param-name>propertiesLocation</param-name>
<param-value>/WEB-INF/bookmarks.properties</param-value>
</init-param>
</servlet>
Modified: incubator/wink/trunk/wink-examples/apps/HelloWorld/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/HelloWorld/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/HelloWorld/build.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/HelloWorld/build.xml Tue Jul 14 15:16:12 2009
@@ -20,7 +20,7 @@
<project name="HelloWorld" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example Hello World
+ Ant build file for Wink example Hello World
</description>
<property name="final.war.name" value="HelloWorld.war" />
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/build.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/build.xml Tue Jul 14 15:16:12 2009
@@ -20,7 +20,7 @@
<project name="QADefects" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example QA Defects
+ Ant build file for Wink example QA Defects
</description>
<property name="final.war.name" value="QADefect.war" />
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/readme.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/readme.txt?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/readme.txt (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/readme.txt Tue Jul 14 15:16:12 2009
@@ -11,7 +11,7 @@
- The list of all defects is returned as an Atom feed on this URI:
http://localhost:8080/QADefect/rest/defects
--Symphony features used in this example:
+-Wink features used in this example:
Asset, ServiceDocument, LinkBuilders, SyndFeed, SyndEntry, Html Representation
Build
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/WEB-INF/web.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/WEB-INF/web.xml Tue Jul 14 15:16:12 2009
@@ -23,7 +23,7 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>Symphony SDK demo</display-name>
+ <display-name>Wink demo</display-name>
<description>Demonstration of SDK features</description>
<servlet>
Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/build.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="QADefectWithSpring" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example QADefectWithSpring
+ Ant build file for Wink example QADefectWithSpring
</description>
<property name="final.war.name" value="QADefectWithSpring.war" />
@@ -37,7 +37,7 @@
<property name="final.war" location="${basedir}/${final.war.name}" />
<property name="main" location="${basedir}/src/main" />
<property name="webapp" location="${main}/webapp" />
-
+
<target name="init">
<!-- Create the time stamp -->
@@ -45,8 +45,8 @@
<!-- Create the build directory structure used by compile -->
<mkdir dir="${build.classes}" />
</target>
-
-
+
+
<target name="compile" depends="init" description="compile the source ">
<!-- Set classpath for SDK lib -->
@@ -58,7 +58,7 @@
<!-- Compile the java code -->
<javac srcdir="${main}/java" destdir="${build.classes}">
<classpath refid="sdk.classpath" />
-
+
</javac>
</target>
@@ -67,7 +67,7 @@
<!-- Create the war file -->
<war destfile="${final.war}" webxml="${webapp}/WEB-INF/web.xml" basedir="${webapp}" excludes="WEB-INF/**">
-
+
<webinf dir="${webapp}/WEB-INF" includes="**/*" />
<classes dir="${build.classes}" includes="**/*" />
<lib dir="${sdk.lib}" includes="*.jar" />
Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/readme.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/readme.txt?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/readme.txt (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/readme.txt Tue Jul 14 15:16:12 2009
@@ -8,7 +8,7 @@
- The list of all defects is returned as an Atom feed on this URI:
http://localhost:8080/QADefectWithSpring/rest/defects
-- Symphony features used in this example:
+- Wink features used in this example:
ServiceDocument, DynamicResource, App Categories, LinkBuilders, SyndFeed, SyndEntry, Html Representation
Spring integration.
Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/qadefectContext-server.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/qadefectContext-server.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/qadefectContext-server.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/qadefectContext-server.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -58,7 +58,7 @@
<ref local="resources.DefectTest" />
<ref local="resources.tests" />
<ref local="resources.categories" />
- <ref local="symphony.HtmlServiceDocumentResource" />
+ <ref local="wink.HtmlServiceDocumentResource" />
</set>
</property>
</bean>
@@ -132,10 +132,10 @@
</bean>
- <bean id="symphony.HtmlServiceDocumentResource" class="org.apache.wink.server.internal.resources.HtmlServiceDocumentResource">
+ <bean id="wink.HtmlServiceDocumentResource" class="org.apache.wink.server.internal.resources.HtmlServiceDocumentResource">
</bean>
- <bean id="symphony.customPropertiesFactory"
+ <bean id="qaDefect.customPropertiesFactory"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="locations">
<list>
@@ -145,14 +145,14 @@
</property>
</bean>
- <bean id="symphony-1.6.placeholderConfigurer"
+ <bean id="wink.placeholderConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
<property name="propertiesArray">
<list>
<props>
- <prop key="symphony.propertiesFactory">symphony.customPropertiesFactory
+ <prop key="winkPropertiesFactory">qaDefect.customPropertiesFactory
</prop>
</props>
</list>
Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/web.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/WEB-INF/web.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -23,12 +23,12 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>Symphony SDK demo</display-name>
+ <display-name>Wink Demo</display-name>
<description>Demonstration of SDK features</description>
<!--
Location of file that defines the Spring root application context for
- Symphony SDK. The Spring context specified here will be loaded by
+ Wink. The Spring context specified here will be loaded by
ContextLoaderListener. SDK Spring context provides resource
registration, service configuration, output MIME type mapping, and
error mapping.
Modified: incubator/wink/trunk/wink-examples/apps/SimpleDefects/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/SimpleDefects/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/SimpleDefects/build.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/SimpleDefects/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="SimpleDefects" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example Simple Defects
+ Ant build file for Wink example Simple Defects
</description>
<property name="final.war.name" value="SimpleDefects.war" />
@@ -46,7 +46,7 @@
<!-- Create the build directory structure used by compile -->
<mkdir dir="${build.classes}" />
</target>
-
+
<target name="compile" depends="init" description="compile the source ">
<!-- Set classpath for SDK lib -->
<path id="sdk.classpath">
@@ -57,7 +57,7 @@
<!-- Compile the java code -->
<javac srcdir="${main}/java" destdir="${build.classes}">
<classpath refid="sdk.classpath" />
-
+
</javac>
</target>
@@ -66,7 +66,7 @@
<!-- Create the war file -->
<war destfile="${final.war}" webxml="${webapp}/WEB-INF/web.xml" basedir="${webapp}" excludes="WEB-INF/**">
-
+
<webinf dir="${webapp}/WEB-INF" includes="**/*" />
<classes dir="${build.classes}" includes="**/*" />
<lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
Modified: incubator/wink/trunk/wink-examples/client/QADefects-client/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/client/QADefects-client/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/client/QADefects-client/build.xml (original)
+++ incubator/wink/trunk/wink-examples/client/QADefects-client/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="QADefectsClient" default="dist" basedir=".">
<description>
- Ant build file for Symphony Client example QADefects
+ Ant build file for Wink Client example QADefects
</description>
<property name="example.jar.name" value="QADefects-client.jar" />
@@ -72,7 +72,7 @@
<fileset dir="${client.components}" includes="*.jar" />
</classpath>
</manifestclasspath>
-
+
<!-- Create the jar file -->
<jar destfile="${example.jar}" basedir="${build.classes}">
<manifest>
Modified: incubator/wink/trunk/wink-examples/client/QADefects-client/readme.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/client/QADefects-client/readme.txt?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/client/QADefects-client/readme.txt (original)
+++ incubator/wink/trunk/wink-examples/client/QADefects-client/readme.txt Tue Jul 14 15:16:12 2009
@@ -3,7 +3,7 @@
Description
===============================================================================
-- a simple example that introduces Symphony Client usage
+- a simple example that introduces Wink Client usage
- demonstrate the consumption of an Atom feed of defects from the QADefect
service example which can be found at SDK_HOME/examples/apps/QADefect
Modified: incubator/wink/trunk/wink-examples/core/CustomContext/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/CustomContext/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/CustomContext/build.xml (original)
+++ incubator/wink/trunk/wink-examples/core/CustomContext/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="CustomContext" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example CustomContext
+ Ant build file for Wink example CustomContext
</description>
<property name="final.war.name" value="CustomContext.war" />
Modified: incubator/wink/trunk/wink-examples/core/CustomContext/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/CustomContext/pom.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/CustomContext/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/core/CustomContext/pom.xml Tue Jul 14 15:16:12 2009
@@ -39,7 +39,7 @@
<build>
<finalName>CustomContext</finalName>
</build>
- <!-- Dependency on Symphony SDK library -->
+ <!-- Dependency on Wink library -->
<dependencies>
<dependency>
<groupId>org.apache.wink</groupId>
Modified: incubator/wink/trunk/wink-examples/core/CustomContext/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/CustomContext/src/main/webapp/WEB-INF/web.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/CustomContext/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/core/CustomContext/src/main/webapp/WEB-INF/web.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -23,7 +23,7 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>Symphony SDK demo</display-name>
+ <display-name>Wink Demo</display-name>
<description>Demonstration of SDK features</description>
<servlet>
Modified: incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/build.xml (original)
+++ incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="CustomExceptionMapper" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example Bookmarks
+ Ant build file for Wink example Bookmarks
</description>
<property name="final.war.name" value="CustomExceptionMapper.war" />
Modified: incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/pom.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/pom.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -39,7 +39,7 @@
<build>
<finalName>CustomExceptionMapper</finalName>
</build>
- <!-- Dependency on Symphony SDK library -->
+ <!-- Dependency on Wink library -->
<dependencies>
<dependency>
<groupId>org.apache.wink</groupId>
Modified: incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/src/main/webapp/WEB-INF/web.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/src/main/webapp/WEB-INF/web.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -23,7 +23,7 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>Symphony SDK demo</display-name>
+ <display-name>Wink Demo</display-name>
<description>Demonstration of SDK features</description>
<servlet>
Modified: incubator/wink/trunk/wink-examples/core/Jaxb/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Jaxb/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/Jaxb/build.xml (original)
+++ incubator/wink/trunk/wink-examples/core/Jaxb/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="Bookmarks" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example Bookmarks
+ Ant build file for Wink example Bookmarks
</description>
<property name="final.war.name" value="Jaxb.war" />
Modified: incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -49,7 +49,7 @@
</plugin>
</plugins>
</build>
- <!-- Dependency on Symphony SDK library -->
+ <!-- Dependency on Wink library -->
<dependencies>
<dependency>
<groupId>org.apache.wink</groupId>
Modified: incubator/wink/trunk/wink-examples/core/Jaxb/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Jaxb/src/main/webapp/WEB-INF/web.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/Jaxb/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/core/Jaxb/src/main/webapp/WEB-INF/web.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -23,7 +23,7 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>Symphony SDK demo</display-name>
+ <display-name>Wink Demo</display-name>
<description>Demonstration of SDK features</description>
<servlet>
Modified: incubator/wink/trunk/wink-examples/core/Preconditions/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Preconditions/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/Preconditions/build.xml (original)
+++ incubator/wink/trunk/wink-examples/core/Preconditions/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="Preconditions" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example Preconditions
+ Ant build file for Wink example Preconditions
</description>
<property name="final.war.name" value="Preconditions.war" />
@@ -45,7 +45,7 @@
<!-- Create the build directory structure used by compile -->
<mkdir dir="${build.classes}" />
</target>
-
+
<target name="compile" depends="init" description="compile the source ">
<!-- Set classpath for SDK lib -->
<path id="sdk.classpath">
@@ -56,7 +56,7 @@
<!-- Compile the java code -->
<javac srcdir="${main}/java" destdir="${build.classes}">
<classpath refid="sdk.classpath" />
-
+
</javac>
</target>
@@ -65,7 +65,7 @@
<!-- Create the war file -->
<war destfile="${final.war}" webxml="${webapp}/WEB-INF/web.xml" basedir="${webapp}" excludes="WEB-INF/**">
-
+
<webinf dir="${webapp}/WEB-INF" includes="**/*" />
<classes dir="${build.classes}" includes="**/*" />
<lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
Modified: incubator/wink/trunk/wink-examples/core/Preconditions/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Preconditions/src/main/webapp/WEB-INF/web.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/Preconditions/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/core/Preconditions/src/main/webapp/WEB-INF/web.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -23,7 +23,7 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>Symphony SDK demo</display-name>
+ <display-name>Wink Demo</display-name>
<description>Demonstration of SDK features</description>
<servlet>
Modified: incubator/wink/trunk/wink-examples/ext/Asset/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/Asset/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/Asset/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/Asset/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="Asset" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example Asset
+ Ant build file for Wink example Asset
</description>
<property name="final.war.name" value="Asset.war" />
Modified: incubator/wink/trunk/wink-examples/ext/Asset/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/Asset/pom.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/Asset/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/Asset/pom.xml Tue Jul 14 15:16:12 2009
@@ -39,7 +39,7 @@
<build>
<finalName>Asset</finalName>
</build>
- <!-- Dependency on Symphony SDK library -->
+ <!-- Dependency on Wink library -->
<dependencies>
<dependency>
<groupId>org.apache.wink</groupId>
Modified: incubator/wink/trunk/wink-examples/ext/Asset/readme.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/Asset/readme.txt?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/Asset/readme.txt (original)
+++ incubator/wink/trunk/wink-examples/ext/Asset/readme.txt Tue Jul 14 15:16:12 2009
@@ -3,7 +3,7 @@
Description
===============================================================================
-- This is a simple example of an application that uses Symphony Asset concept.
+- This is a simple example of an application that uses Wink Asset concept.
UsersAsset asset encapsulates a logic of mapping a collection of Users to different media types (atom, xml, json).
The UsersAsset can be reused by different applications.
- The service is used to get the list of existing users
Modified: incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml?rev=793931&r1=793930&r2=793931&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml Tue Jul 14 15:16:12 2009
@@ -7,9 +7,9 @@
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
@@ -20,7 +20,7 @@
<project name="DynamicResource" default="dist" basedir=".">
<description>
- Ant build file for Symphony SDK example DynamicResource
+ Ant build file for Wink example DynamicResource
</description>
<property name="final.war.name" value="DynamicResource.war" />