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/06 14:31:47 UTC
svn commit: r791462 - in /incubator/wink/trunk:
wink-client/src/main/java/org/apache/wink/client/
wink-common/src/main/java/org/apache/wink/common/
wink-common/src/main/java/org/apache/wink/common/internal/application/
wink-common/src/main/java/org/apa...
Author: elman
Date: Mon Jul 6 12:31:45 2009
New Revision: 791462
URL: http://svn.apache.org/viewvc?rev=791462&view=rev
Log:
eliminate "symphony"
See [WINK-42]
Added:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/WinkApplication.java
- copied, changed from r791394, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/SymphonyApplication.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
- copied, changed from r791394, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java
incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers
- copied unchanged from r791394, incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/symphony.app
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/css/wink-default.css
- copied unchanged from r791394, incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/css/symphony_hp.css
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/css/wink-default.css
- copied unchanged from r791394, incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/css/symphony_hp.css
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletWinkApplication.java
- copied, changed from r791394, incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletSymphonyApplication.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java
- copied, changed from r791394, incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractSymphonyServlet.java
incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/css/wink-default.css
- copied unchanged from r791394, incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/css/symphony_hp.css
incubator/wink/trunk/wink-server/src/main/resources/META-INF/server/wink-providers
- copied unchanged from r791394, incubator/wink/trunk/wink-server/src/main/resources/META-INF/server/symphony.app
incubator/wink/trunk/wink-server/src/main/resources/META-INF/wink-alternate-shortcuts.properties
- copied unchanged from r791394, incubator/wink/trunk/wink-server/src/main/resources/META-INF/symphony-alternateShortcutsMap.properties
incubator/wink/trunk/wink-server/src/main/resources/META-INF/wink-default.properties
- copied unchanged from r791394, incubator/wink/trunk/wink-server/src/main/resources/META-INF/configuration-default.properties
incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml
- copied, changed from r791394, incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/symphonyCoreContext-server.xml
Removed:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/SymphonyApplication.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java
incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/symphony.app
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/css/symphony_hp.css
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/css/symphony_hp.css
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletSymphonyApplication.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractSymphonyServlet.java
incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/css/symphony_hp.css
incubator/wink/trunk/wink-server/src/main/resources/META-INF/configuration-default.properties
incubator/wink/trunk/wink-server/src/main/resources/META-INF/server/symphony.app
incubator/wink/trunk/wink-server/src/main/resources/META-INF/symphony-alternateShortcutsMap.properties
incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/symphonyCoreContext-server.xml
Modified:
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-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleSymphonyApplicationTest.java
incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/server/internal/servlet/MockServletInvocationTest.java
incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/SpringAwareTestCase.java
incubator/wink/trunk/wink-examples/ (props changed)
incubator/wink/trunk/wink-examples/apps/ (props changed)
incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/apps/HelloWorld/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp
incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/client/ (props changed)
incubator/wink/trunk/wink-examples/core/ (props changed)
incubator/wink/trunk/wink-examples/core/CustomContext/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/core/CustomExceptionMapper/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/core/Jaxb/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/core/Preconditions/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/ (props changed)
incubator/wink/trunk/wink-examples/ext/Asset/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/MyApplication.java
incubator/wink/trunk/wink-examples/ext/History/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/Scope/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-scripts/ (props changed)
incubator/wink/trunk/wink-scripts/wink-dist/ (props changed)
incubator/wink/trunk/wink-scripts/wink-site-deploy/ (props changed)
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/application/ServletApplicationFileLoader.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/utils/RegistrationUtils.java
incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlCollection.jsp
incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlEntry.jsp
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithEmptyPathTest.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/ServletSymphonyApplicationTest.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/Registrar.java
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=791462&r1=791461&r2=791462&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 Mon Jul 6 12:31:45 2009
@@ -32,7 +32,7 @@
import org.apache.wink.client.handlers.ClientHandler;
import org.apache.wink.client.handlers.ConnectionHandler;
import org.apache.wink.client.internal.handlers.HttpURLConnectionHandler;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
/**
@@ -74,7 +74,7 @@
private void initDefaultApplication() {
// TODO: use SimpleSymphonyAplication
- applications(new SymphonyApplication() {
+ applications(new WinkApplication() {
@Override
public Set<Class<?>> getClasses() {
Set<Class<?>> set = new HashSet<Class<?>>();
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=791462&r1=791461&r2=791462&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 Mon Jul 6 12:31:45 2009
@@ -29,7 +29,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wink.client.internal.ResourceImpl;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.application.ApplicationValidator;
import org.apache.wink.common.internal.factory.OFFactoryRegistry;
import org.apache.wink.common.internal.factory.ScopeOFFactory;
@@ -141,8 +141,8 @@
processClasses(classes);
}
- if (application instanceof SymphonyApplication) {
- processSymphonyApplication((SymphonyApplication)application);
+ if (application instanceof WinkApplication) {
+ processSymphonyApplication((WinkApplication)application);
}
}
@@ -167,7 +167,7 @@
}
}
- private void processSymphonyApplication(SymphonyApplication sApplication) {
+ private void processSymphonyApplication(WinkApplication sApplication) {
Set<Object> instances = sApplication.getInstances();
double priority = sApplication.getPriority();
if (instances == null) {
Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/WinkApplication.java (from r791394, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/SymphonyApplication.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/WinkApplication.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/WinkApplication.java&p1=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/SymphonyApplication.java&r1=791394&r2=791462&rev=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/SymphonyApplication.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/WinkApplication.java Mon Jul 6 12:31:45 2009
@@ -24,7 +24,10 @@
import javax.ws.rs.core.Application;
-public class SymphonyApplication extends Application {
+/**
+ * Enhances javax.ws.rs.core.Application with <tt>getPriority</tt> and <tt>getInstances</tt> methods.
+ */
+public class WinkApplication extends Application {
public static final double DEFAULT_PRIORITY = 0.5;
@@ -34,7 +37,7 @@
}
/**
- * Returns the SymophonyApplication priority.
+ * Returns the Application priority.
*
* @return priority
*/
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java Mon Jul 6 12:31:45 2009
@@ -46,7 +46,7 @@
public class ApplicationFileLoader {
private static final Logger logger = LoggerFactory.getLogger(ApplicationFileLoader.class);
- private static final String CORE_APPLICATION = "META-INF/core/symphony.app";
+ private static final String CORE_APPLICATION = "META-INF/core/wink-providers";
private final Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
/**
@@ -83,7 +83,7 @@
loadClasses(appConfigFileStream);
}
- protected void loadClasses(InputStream is) {
+ final protected void loadClasses(InputStream is) {
try {
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(is));
String line;
Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java (from r791394, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java&p1=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java&r1=791394&r2=791462&rev=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java Mon Jul 6 12:31:45 2009
@@ -26,22 +26,33 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.utils.FileLoader;
-
/**
- * Provides a naive implementation for SymphonyApplication. Looks for names of
- * the classes in <tt>/WEB-INF/application</tt> file.
+ * <p>
+ * Loads one or more flat application files using the
+ * <tt>ApplicationFileLoader</tt>.
+ * <p>
+ * The implementation is lazy, meaning the files will be loaded on the first use
+ * and only once.
+ * <p>
+ * This implementation search for files using the <tt>FileLoader</tt>. See
+ * <tt>ServletWinkApplication</tt> that loads files using
+ * <tt>ServletFileLoader</tt>.
+ *
+ * @see org.apache.wink.common.internal.utils.FileLoader
+ * @see org.apache.wink.common.internal.application.ApplicationFileLoader
+ * @see org.apache.wink.server.internal.application.ServletWinkApplication
*/
-public class SimpleSymphonyApplication extends SymphonyApplication {
+public class SimpleWinkApplication extends WinkApplication {
- private static final Logger logger = LoggerFactory.getLogger(SimpleSymphonyApplication.class);
+ private static final Logger logger = LoggerFactory.getLogger(SimpleWinkApplication.class);
private static final String FILE_SEPARATOR = ";";
- private Set<Class<?>> jaxRSClasses;
- private String applicationConfigFiles;
+ private final String applicationConfigFiles;
+ private Set<Class<?>> jaxRSClasses;
- public SimpleSymphonyApplication(String applicationConfigFiles) {
+ public SimpleWinkApplication(String applicationConfigFiles) {
this.applicationConfigFiles = applicationConfigFiles;
}
@@ -50,18 +61,19 @@
if (jaxRSClasses != null) {
return jaxRSClasses;
}
- jaxRSClasses = loadImplAppConfigFiles(applicationConfigFiles);
+ jaxRSClasses = loadImplAppConfigFiles();
return jaxRSClasses;
}
- private Set<Class<?>> loadImplAppConfigFiles(String applicationConfigFiles) {
+ private Set<Class<?>> loadImplAppConfigFiles() {
Set<Class<?>> jaxRSClasses = new LinkedHashSet<Class<?>>();
if (applicationConfigFiles != null) {
String[] applicationConfigFilesArray = applicationConfigFiles.split(FILE_SEPARATOR);
for (String applicationConfigFile : applicationConfigFilesArray) {
applicationConfigFile = applicationConfigFile.trim();
try {
- jaxRSClasses.addAll(getApplicationFileLoader(getFileStream(applicationConfigFile)).getClasses());
+ jaxRSClasses.addAll(getApplicationFileLoader(
+ getFileStream(applicationConfigFile)).getClasses());
} catch (FileNotFoundException e) {
logger.warn("Could not find {}. Ignoring.", applicationConfigFile);
}
@@ -70,7 +82,8 @@
return jaxRSClasses;
}
- protected ApplicationFileLoader getApplicationFileLoader(InputStream is) throws FileNotFoundException {
+ protected ApplicationFileLoader getApplicationFileLoader(InputStream is)
+ throws FileNotFoundException {
return new ApplicationFileLoader(is);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java Mon Jul 6 12:31:45 2009
@@ -75,7 +75,7 @@
if (targetException instanceof RuntimeException) {
throw (RuntimeException) targetException;
}
- throw new ObjectCreationException(e);
+ throw new ObjectCreationException(targetException);
} catch (Exception e) {
throw new ObjectCreationException(e);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java Mon Jul 6 12:31:45 2009
@@ -47,7 +47,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.application.ApplicationValidator;
import org.apache.wink.common.internal.factory.OFFactoryRegistry;
import org.apache.wink.common.internal.factory.ObjectFactory;
@@ -145,11 +145,11 @@
}
public boolean addProvider(Class<?> cls) {
- return addProvider(cls, SymphonyApplication.DEFAULT_PRIORITY);
+ return addProvider(cls, WinkApplication.DEFAULT_PRIORITY);
}
public boolean addProvider(Object provider) {
- return addProvider(provider, SymphonyApplication.DEFAULT_PRIORITY);
+ return addProvider(provider, WinkApplication.DEFAULT_PRIORITY);
}
@SuppressWarnings("unchecked")
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleSymphonyApplicationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleSymphonyApplicationTest.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleSymphonyApplicationTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleSymphonyApplicationTest.java Mon Jul 6 12:31:45 2009
@@ -21,7 +21,7 @@
import java.util.Set;
-import org.apache.wink.common.internal.application.SimpleSymphonyApplication;
+import org.apache.wink.common.internal.application.SimpleWinkApplication;
import org.apache.wink.common.internal.providers.entity.FileProvider;
import org.apache.wink.common.internal.providers.entity.SourceProvider;
@@ -31,7 +31,7 @@
public class SimpleSymphonyApplicationTest extends TestCase {
public void testSimpleSymphonyApplication() {
- SimpleSymphonyApplication simpleSymphonyApplication = new SimpleSymphonyApplication("org//apache//wink//common//internal//application//custom.app");
+ SimpleWinkApplication simpleSymphonyApplication = new SimpleWinkApplication("org//apache//wink//common//internal//application//custom.app");
Set<Class<?>> classes = simpleSymphonyApplication.getClasses();
assertTrue(classes.contains(FileProvider.class));
assertTrue(classes.contains(SourceProvider.DOMSourceProvider.class));
Modified: incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/server/internal/servlet/MockServletInvocationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/server/internal/servlet/MockServletInvocationTest.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/server/internal/servlet/MockServletInvocationTest.java (original)
+++ incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/server/internal/servlet/MockServletInvocationTest.java Mon Jul 6 12:31:45 2009
@@ -87,7 +87,7 @@
String propertiesFile = getPropertiesFile();
if (propertiesFile != null) {
- servletConfig.addInitParameter("symphony.propertiesLocation", propertiesFile);
+ servletConfig.addInitParameter("propertiesLocation", propertiesFile);
}
tls.set(this);
Modified: incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/SpringAwareTestCase.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/SpringAwareTestCase.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/SpringAwareTestCase.java (original)
+++ incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/SpringAwareTestCase.java Mon Jul 6 12:31:45 2009
@@ -54,7 +54,7 @@
*/
protected List<String> getAdditionalContextNames() {
ArrayList<String> arrayList = new ArrayList<String>();
- arrayList.add("META-INF/server/symphonyCoreContext-server.xml");
+ arrayList.add("META-INF/server/wink-core-context.xml");
return arrayList;
}
Propchange: incubator/wink/trunk/wink-examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 6 12:31:45 2009
@@ -0,0 +1 @@
+target
Propchange: incubator/wink/trunk/wink-examples/apps/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 6 12:31:45 2009
@@ -0,0 +1 @@
+target
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=791462&r1=791461&r2=791462&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 Mon Jul 6 12:31:45 2009
@@ -31,7 +31,7 @@
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
Modified: incubator/wink/trunk/wink-examples/apps/HelloWorld/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/HelloWorld/src/main/webapp/WEB-INF/web.xml?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/HelloWorld/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/HelloWorld/src/main/webapp/WEB-INF/web.xml Mon Jul 6 12:31:45 2009
@@ -1,22 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- 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.
--->
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file 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.
+ -->
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
@@ -34,7 +31,7 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
</servlet>
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp Mon Jul 6 12:31:45 2009
@@ -69,7 +69,7 @@
%>
<STYLE TYPE="text/css">
-<%@include file="css/symphony_hp.css" %>
+<%@include file="css/wink-default.css" %>
</STYLE>
</head>
<body>
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp Mon Jul 6 12:31:45 2009
@@ -27,7 +27,7 @@
<%@page import="org.apache.wink.common.model.atom.AtomConstants"%><html>
<head>
<STYLE TYPE="text/css">
-<%@include file="css/symphony_hp.css"%>
+<%@include file="css/wink-default.css"%>
</STYLE>
</head>
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=791462&r1=791461&r2=791462&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 Mon Jul 6 12:31:45 2009
@@ -30,7 +30,7 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
<load-on-startup>0</load-on-startup>
Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlCollection.jsp Mon Jul 6 12:31:45 2009
@@ -69,7 +69,7 @@
%>
<STYLE TYPE="text/css">
-<%@include file="css/symphony_hp.css" %>
+<%@include file="css/wink-default.css" %>
</STYLE>
</head>
<body>
Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/webapp/HtmlDefaultRepresentation/defaultHtmlEntry.jsp Mon Jul 6 12:31:45 2009
@@ -27,7 +27,7 @@
<%@page import="org.apache.wink.common.model.atom.AtomConstants"%><html>
<head>
<STYLE TYPE="text/css">
-<%@include file="css/symphony_hp.css"%>
+<%@include file="css/wink-default.css"%>
</STYLE>
</head>
Modified: incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/webapp/WEB-INF/web.xml?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/webapp/WEB-INF/web.xml Mon Jul 6 12:31:45 2009
@@ -30,7 +30,7 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
<load-on-startup>0</load-on-startup>
Propchange: incubator/wink/trunk/wink-examples/client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 6 12:31:45 2009
@@ -0,0 +1 @@
+target
Propchange: incubator/wink/trunk/wink-examples/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 6 12:31:45 2009
@@ -0,0 +1 @@
+target
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=791462&r1=791461&r2=791462&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 Mon Jul 6 12:31:45 2009
@@ -30,7 +30,7 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
</servlet>
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=791462&r1=791461&r2=791462&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 Mon Jul 6 12:31:45 2009
@@ -30,8 +30,8 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
- <param-value>/WEB-INF/application</param-value>
+ <param-name>applicationConfigLocation</param-name>
+ <param-value>/WEB-INF/application</param-value>
</init-param>
</servlet>
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=791462&r1=791461&r2=791462&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 Mon Jul 6 12:31:45 2009
@@ -30,7 +30,7 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
</servlet>
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=791462&r1=791461&r2=791462&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 Mon Jul 6 12:31:45 2009
@@ -30,7 +30,7 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
<load-on-startup>0</load-on-startup>
Propchange: incubator/wink/trunk/wink-examples/ext/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 6 12:31:45 2009
@@ -0,0 +1 @@
+target
Modified: incubator/wink/trunk/wink-examples/ext/Asset/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/Asset/src/main/webapp/WEB-INF/web.xml?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/Asset/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/Asset/src/main/webapp/WEB-INF/web.xml Mon Jul 6 12:31:45 2009
@@ -34,7 +34,7 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
</servlet>
Modified: incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/MyApplication.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/MyApplication.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/MyApplication.java (original)
+++ incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/MyApplication.java Mon Jul 6 12:31:45 2009
@@ -22,10 +22,10 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
-public class MyApplication extends SymphonyApplication {
+public class MyApplication extends WinkApplication {
@Override
public Set<Object> getInstances() {
Modified: incubator/wink/trunk/wink-examples/ext/History/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/History/src/main/webapp/WEB-INF/web.xml?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/History/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/History/src/main/webapp/WEB-INF/web.xml Mon Jul 6 12:31:45 2009
@@ -34,7 +34,7 @@
<param-value>/WEB-INF/configuration.properties</param-value>
</init-param>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application</param-value>
</init-param>
<load-on-startup>0</load-on-startup>
Modified: incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/webapp/WEB-INF/web.xml?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/webapp/WEB-INF/web.xml Mon Jul 6 12:31:45 2009
@@ -34,8 +34,8 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
- <param-value>/WEB-INF/application</param-value>
+ <param-name>applicationConfigLocation</param-name>
+ <param-value>/WEB-INF/application</param-value>
</init-param>
</servlet>
Modified: incubator/wink/trunk/wink-examples/ext/Scope/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/Scope/src/main/webapp/WEB-INF/web.xml?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/Scope/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/Scope/src/main/webapp/WEB-INF/web.xml Mon Jul 6 12:31:45 2009
@@ -34,8 +34,8 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
- <param-value>/WEB-INF/application</param-value>
+ <param-name>applicationConfigLocation</param-name>
+ <param-value>/WEB-INF/application</param-value>
</init-param>
</servlet>
Modified: incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/webapp/WEB-INF/web.xml?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/webapp/WEB-INF/web.xml Mon Jul 6 12:31:45 2009
@@ -36,7 +36,7 @@
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<init-param>
- <param-name>symphony.applicationConfigLocation</param-name>
+ <param-name>applicationConfigLocation</param-name>
<param-value>/WEB-INF/application-dav;/WEB-INF/application</param-value>
</init-param>
<load-on-startup>0</load-on-startup>
Propchange: incubator/wink/trunk/wink-scripts/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 6 12:31:45 2009
@@ -0,0 +1 @@
+target
Propchange: incubator/wink/trunk/wink-scripts/wink-dist/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 6 12:31:45 2009
@@ -0,0 +1 @@
+target
Propchange: incubator/wink/trunk/wink-scripts/wink-site-deploy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 6 12:31:45 2009
@@ -0,0 +1 @@
+target
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Mon Jul 6 12:31:45 2009
@@ -75,11 +75,10 @@
*/
public class DeploymentConfiguration {
- private static final String ALTERNATIVE_SHORTCUTS = "META-INF/symphony-alternateShortcutsMap.properties";
- private static final Logger logger = LoggerFactory.getLogger(DeploymentConfiguration.class);
+ private static final Logger logger = LoggerFactory.getLogger(DeploymentConfiguration.class);
+ private static final String ALTERNATIVE_SHORTCUTS = "META-INF/wink-alternate-shortcuts.properties";
private static final String VALIDATE_LOCATION_HEADER = "wink.validateLocationHeader";
-
-
+
// handler chains
private RequestHandlersChain requestHandlersChain;
private ResponseHandlersChain responseHandlersChain;
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java Mon Jul 6 12:31:45 2009
@@ -25,7 +25,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
@@ -42,7 +42,7 @@
* by getInstances.
*
* @see Application
- * @see SymphonyApplication
+ * @see WinkApplication
*/
public class ApplicationProcessor {
@@ -75,14 +75,14 @@
processClasses(classes);
}
- if (application instanceof SymphonyApplication) {
- processSymphonyApplication((SymphonyApplication) application);
+ if (application instanceof WinkApplication) {
+ processSymphonyApplication((WinkApplication) application);
}
logger.debug("Processing of Application completed.");
}
- private void processSymphonyApplication(SymphonyApplication sApplication) {
+ private void processSymphonyApplication(WinkApplication sApplication) {
Set<Object> instances = sApplication.getInstances();
double priority = sApplication.getPriority();
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java Mon Jul 6 12:31:45 2009
@@ -30,7 +30,7 @@
public class ServletApplicationFileLoader extends ApplicationFileLoader {
- private static final String SERVER_CORE_APPLICATION = "META-INF/server/symphony.app";
+ private static final String SERVER_CORE_APPLICATION = "META-INF/server/wink-providers";
public ServletApplicationFileLoader() throws FileNotFoundException {
super();
Copied: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletWinkApplication.java (from r791394, incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletSymphonyApplication.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletWinkApplication.java?p2=incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletWinkApplication.java&p1=incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletSymphonyApplication.java&r1=791394&r2=791462&rev=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletSymphonyApplication.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletWinkApplication.java Mon Jul 6 12:31:45 2009
@@ -27,15 +27,15 @@
import javax.servlet.ServletContext;
import org.apache.wink.common.internal.application.ApplicationFileLoader;
-import org.apache.wink.common.internal.application.SimpleSymphonyApplication;
+import org.apache.wink.common.internal.application.SimpleWinkApplication;
import org.apache.wink.server.internal.utils.ServletFileLoader;
-public class ServletSymphonyApplication extends SimpleSymphonyApplication {
+public class ServletWinkApplication extends SimpleWinkApplication {
- private ServletContext servletContext;
+ private final ServletContext servletContext;
- public ServletSymphonyApplication(ServletContext servletContext, String applicationConfigFiles) {
+ public ServletWinkApplication(ServletContext servletContext, String applicationConfigFiles) {
super(applicationConfigFiles);
this.servletContext = servletContext;
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java Mon Jul 6 12:31:45 2009
@@ -38,7 +38,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.http.HttpStatus;
import org.apache.wink.common.internal.application.ApplicationValidator;
import org.apache.wink.common.internal.factory.OFFactoryRegistry;
@@ -83,7 +83,7 @@
* the object to add
*/
public void addResource(Object instance) {
- addResource(instance, SymphonyApplication.DEFAULT_PRIORITY);
+ addResource(instance, WinkApplication.DEFAULT_PRIORITY);
}
/**
@@ -93,7 +93,7 @@
* the resource class to add
*/
public void addResource(Class<?> clazz) {
- addResource(clazz, SymphonyApplication.DEFAULT_PRIORITY);
+ addResource(clazz, WinkApplication.DEFAULT_PRIORITY);
}
/**
Copied: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java (from r791394, incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractSymphonyServlet.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java?p2=incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java&p1=incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractSymphonyServlet.java&r1=791394&r2=791462&rev=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractSymphonyServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java Mon Jul 6 12:31:45 2009
@@ -19,40 +19,35 @@
*******************************************************************************/
package org.apache.wink.server.internal.servlet;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import org.apache.wink.server.internal.RequestProcessor;
-public abstract class AbstractSymphonyServlet extends HttpServlet {
+/**
+ * Base class for RestServlet and AdminServlet
+ */
+public abstract class AbstractRestServlet extends HttpServlet {
- private static final String REQUEST_PROCESSOR_ATTRIBUTE = "symphony.requestProcessorAttribute";
+ private static final String REQUEST_PROCESSOR_ATTRIBUTE = "requestProcessorAttribute";
private static final long serialVersionUID = 7721777326714438571L;
- private ServletContext servletContext;
private String requestProcessorAttribute;
@Override
public void init() throws ServletException {
super.init();
- servletContext = getServletContext();
requestProcessorAttribute = getInitParameter(REQUEST_PROCESSOR_ATTRIBUTE);
}
protected RequestProcessor getRequestProcessor() {
- return RequestProcessor.getRequestProcessor(servletContext, requestProcessorAttribute);
+ return RequestProcessor.getRequestProcessor(getServletContext(), requestProcessorAttribute);
}
protected void storeRequestProcessorOnServletContext(RequestProcessor requestProcessor) {
- requestProcessor.storeRequestProcessorOnServletContext(servletContext,
+ requestProcessor.storeRequestProcessorOnServletContext(getServletContext(),
requestProcessorAttribute);
}
-// protected void registerApplication(Application application) {
-// RegistrationUtils.registerApplication(application, servletContext,
-// requestProcessorAttribute);
-//
-// }
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java Mon Jul 6 12:31:45 2009
@@ -55,7 +55,7 @@
import org.apache.wink.server.internal.registry.ResourceRegistry;
-public class AdminServlet extends AbstractSymphonyServlet {
+public class AdminServlet extends AbstractRestServlet {
private static final long serialVersionUID = -5972412568762942420L;
private static final String APPLICATION_XML = "application/xml";
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java Mon Jul 6 12:31:45 2009
@@ -33,20 +33,20 @@
import org.slf4j.LoggerFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.server.internal.RequestProcessor;
-import org.apache.wink.server.internal.application.ServletSymphonyApplication;
+import org.apache.wink.server.internal.application.ServletWinkApplication;
import org.apache.wink.server.internal.utils.ServletFileLoader;
/**
* <p>
- * Main servlet that is used by Symphony runtime to handle the incoming request.
+ * Main servlet that is used by the runtime to handle the incoming request.
* <p>
* The init-params are supported:
* <ul>
- * <li><b>symphony.propertiesLocation</b> - custom properties file</li>
- * <li><b>symphony.applicationConfigLocation</b> - locations of flat application
+ * <li><b>propertiesLocation</b> - custom properties file</li>
+ * <li><b>applicationConfigLocation</b> - locations of flat application
* configuration files. Relevant only if the no
* <tt>javax.ws.rs.core.Application</tt> is provided.</li>
- * <li><b>symphony.deploymentConfiguration</b> - custom deployment configuration
+ * <li><b>deploymentConfiguration</b> - custom deployment configuration
* class name. The deployment configuration must extend
* <tt>org.apache.wink.server.internal.DeploymentConfiguration</tt>.</li>
* </ul>
@@ -56,16 +56,16 @@
* <tt>org.springframework.web.context.ContextLoaderListener</tt> must be
* configured and the whole customization should occur via the spring context.
*/
-public class RestServlet extends AbstractSymphonyServlet {
+public class RestServlet extends AbstractRestServlet {
- private static final long serialVersionUID = 8797036173835816706L;
+ private static final long serialVersionUID = 8797036173835816706L;
- private static final Logger logger = LoggerFactory.getLogger(RestServlet.class);
- private static final String APPLICATION_INIT_PARAM = "javax.ws.rs.Application";
- private static final String PROPERTIES_DEFAULT_FILE = "META-INF/configuration-default.properties";
- private static final String PROPERTIES_INIT_PARAM = "symphony.propertiesLocation";
- private static final String SYMPHONY_APP_LOCATION_PARAM = "symphony.applicationConfigLocation";
- private static final String SYMPHONY_DEPLYMENT_CONF_PARAM = "symphony.deploymentConfiguration";
+ private static final Logger logger = LoggerFactory.getLogger(RestServlet.class);
+ private static final String APPLICATION_INIT_PARAM = "javax.ws.rs.Application";
+ private static final String PROPERTIES_DEFAULT_FILE = "META-INF/wink-default.properties";
+ private static final String PROPERTIES_INIT_PARAM = "propertiesLocation";
+ private static final String APP_LOCATION_PARAM = "applicationConfigLocation";
+ private static final String DEPLYMENT_CONF_PARAM = "deploymentConfiguration";
@Override
public void init() throws ServletException {
@@ -127,7 +127,7 @@
protected DeploymentConfiguration createDeploymentConfiguration()
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
- String initParameter = getInitParameter(SYMPHONY_DEPLYMENT_CONF_PARAM);
+ String initParameter = getInitParameter(DEPLYMENT_CONF_PARAM);
if (initParameter != null) {
Class<?> confClass = Class.forName(initParameter);
return (DeploymentConfiguration) confClass.newInstance();
@@ -144,12 +144,12 @@
appClass = (Class<Application>) Class.forName(initParameter);
return appClass.newInstance();
}
- String appLocationParameter = getInitParameter(SYMPHONY_APP_LOCATION_PARAM);
+ String appLocationParameter = getInitParameter(APP_LOCATION_PARAM);
if (appLocationParameter == null) {
- String message = SYMPHONY_APP_LOCATION_PARAM + " was not defined.";
+ String message = APP_LOCATION_PARAM + " was not defined.";
logger.warn(message);
}
- return new ServletSymphonyApplication(getServletContext(), appLocationParameter);
+ return new ServletWinkApplication(getServletContext(), appLocationParameter);
}
private Properties loadProperties(String resourceName, Properties defaultProperties)
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/utils/RegistrationUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/utils/RegistrationUtils.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/utils/RegistrationUtils.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/utils/RegistrationUtils.java Mon Jul 6 12:31:45 2009
@@ -25,7 +25,7 @@
import javax.servlet.ServletContext;
import javax.ws.rs.core.Application;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.server.internal.RequestProcessor;
public class RegistrationUtils {
@@ -85,7 +85,7 @@
requestProcessor.getConfiguration().addApplication(application);
}
- public static class InnerApplication extends SymphonyApplication {
+ public static class InnerApplication extends WinkApplication {
private Set<Class<?>> classes = null;
private Set<Object> instances = null;
Modified: incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlCollection.jsp
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlCollection.jsp?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlCollection.jsp (original)
+++ incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlCollection.jsp Mon Jul 6 12:31:45 2009
@@ -69,7 +69,7 @@
%>
<STYLE TYPE="text/css">
-<%@include file="css/symphony_hp.css" %>
+<%@include file="css/wink-default.css" %>
</STYLE>
</head>
<body>
Modified: incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlEntry.jsp?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlEntry.jsp (original)
+++ incubator/wink/trunk/wink-server/src/main/resources/HtmlDefaultRepresentation/defaultHtmlEntry.jsp Mon Jul 6 12:31:45 2009
@@ -27,7 +27,7 @@
<%@page import="org.apache.wink.common.model.atom.AtomConstants"%><html>
<head>
<STYLE TYPE="text/css">
-<%@include file="css/symphony_hp.css"%>
+<%@include file="css/wink-default.css"%>
</STYLE>
</head>
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java Mon Jul 6 12:31:45 2009
@@ -30,7 +30,7 @@
import javax.ws.rs.core.MediaType;
import org.apache.wink.common.AbstractDynamicResource;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.utils.MediaTypeUtils;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
@@ -40,7 +40,7 @@
public class AbstractResourceBeanTest extends MockServletInvocationTest {
- public static class InnerApplication extends SymphonyApplication {
+ public static class InnerApplication extends WinkApplication {
@Override
public Set<Object> getInstances() {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java Mon Jul 6 12:31:45 2009
@@ -28,7 +28,7 @@
import javax.ws.rs.core.MediaType;
import org.apache.wink.common.AbstractDynamicResource;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.annotations.Workspace;
import org.apache.wink.common.internal.utils.MediaTypeUtils;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
@@ -39,7 +39,7 @@
public class AbstractResourceWithDuplicateWorkspaceTest extends MockServletInvocationTest {
- public static class InnerApplication extends SymphonyApplication {
+ public static class InnerApplication extends WinkApplication {
@Override
public Set<Object> getInstances() {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithEmptyPathTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithEmptyPathTest.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithEmptyPathTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithEmptyPathTest.java Mon Jul 6 12:31:45 2009
@@ -28,7 +28,7 @@
import javax.ws.rs.core.MediaType;
import org.apache.wink.common.AbstractDynamicResource;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -36,7 +36,7 @@
public class AbstractResourceWithEmptyPathTest extends MockServletInvocationTest {
- public static class InnerApplication extends SymphonyApplication {
+ public static class InnerApplication extends WinkApplication {
@Override
public Set<Object> getInstances() {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java Mon Jul 6 12:31:45 2009
@@ -28,7 +28,7 @@
import javax.ws.rs.core.Application;
import org.apache.wink.common.AbstractDynamicResource;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.factory.OFFactoryRegistry;
import org.apache.wink.common.internal.providers.entity.FileProvider;
import org.apache.wink.common.internal.providers.entity.StreamingOutputProvider;
@@ -131,7 +131,7 @@
private static final AbstractDynamicResource DynamicResource = new AbstractDynamicResource() {
};
- private static class SymphonyApplicationMock extends SymphonyApplication {
+ private static class SymphonyApplicationMock extends WinkApplication {
@Override
public Set<Class<?>> getClasses() {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ServletSymphonyApplicationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ServletSymphonyApplicationTest.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ServletSymphonyApplicationTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ServletSymphonyApplicationTest.java Mon Jul 6 12:31:45 2009
@@ -24,7 +24,7 @@
import org.apache.wink.common.internal.providers.entity.FileProvider;
import org.apache.wink.common.internal.providers.entity.SourceProvider;
-import org.apache.wink.server.internal.application.ServletSymphonyApplication;
+import org.apache.wink.server.internal.application.ServletWinkApplication;
import org.apache.wink.test.mock.ServletContextMock;
import junit.framework.TestCase;
@@ -50,7 +50,7 @@
}
public void testSimpleSymphonyApplication() {
- ServletSymphonyApplication simpleSymphonyApplication = new ServletSymphonyApplication(
+ ServletWinkApplication simpleSymphonyApplication = new ServletWinkApplication(
new ServletContextImpl(), "org//apache//wink//server//internal//application//custom.app");
Set<Class<?>> classes = simpleSymphonyApplication.getClasses();
assertTrue(classes.contains(FileProvider.class));
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/Registrar.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/Registrar.java?rev=791462&r1=791461&r2=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/Registrar.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/Registrar.java Mon Jul 6 12:31:45 2009
@@ -22,15 +22,15 @@
import java.util.Set;
-import org.apache.wink.common.SymphonyApplication;
+import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
import org.apache.wink.server.internal.application.ApplicationProcessor;
import org.apache.wink.server.internal.registry.ResourceRegistry;
-public class Registrar extends SymphonyApplication {
+public class Registrar extends WinkApplication {
- private double priority = SymphonyApplication.DEFAULT_PRIORITY;
+ private double priority = WinkApplication.DEFAULT_PRIORITY;
private Set<Object> instances = null;
private Set<Class<?>> classes = null;
Copied: incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml (from r791394, incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/symphonyCoreContext-server.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml?p2=incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml&p1=incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/symphonyCoreContext-server.xml&r1=791394&r2=791462&rev=791462&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/symphonyCoreContext-server.xml (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml Mon Jul 6 12:31:45 2009
@@ -119,7 +119,7 @@
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="locations">
<list>
- <value>classpath:META-INF/configuration-default.properties
+ <value>classpath:META-INF/wink-default.properties
</value>
</list>
</property>