Propchange:
incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/jquery-1.7.1.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/jquery-1.7.1.js
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/directmemory/trunk/platforms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/platforms/pom.xml?rev=1294768&r1=1294767&r2=1294768&view=diff
==============================================================================
--- incubator/directmemory/trunk/platforms/pom.xml (original)
+++ incubator/directmemory/trunk/platforms/pom.xml Tue Feb 28 18:36:00 2012
@@ -22,13 +22,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>directmemory-parent</artifactId>
<groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.directmemory</groupId>
<artifactId>platforms</artifactId>
<packaging>pom</packaging>
<name>Apache DirectMemory :: Platforms</name>
Modified: incubator/directmemory/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/pom.xml?rev=1294768&r1=1294767&r2=1294768&view=diff
==============================================================================
--- incubator/directmemory/trunk/pom.xml (original)
+++ incubator/directmemory/trunk/pom.xml Tue Feb 28 18:36:00 2012
@@ -198,6 +198,7 @@ under the License.
<module>integrations</module>
<module>serializers</module>
<module>itests</module>
+ <module>examples</module>
</modules>
<scm>
@@ -271,6 +272,7 @@ under the License.
<checkstyle-plugin.version>2.9</checkstyle-plugin.version>
<site-plugin.version>3.0</site-plugin.version>
<source-plugin.version>2.1.2</source-plugin.version>
+ <asfTomcatMavenPluginVersion>2.0-beta-1</asfTomcatMavenPluginVersion>
<!-- Bundle Headers -->
<osgi.activator/>
@@ -339,6 +341,11 @@ under the License.
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>${asfTomcatMavenPluginVersion}</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-plugin.version}</version>
Modified:
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java?rev=1294768&r1=1294767&r2=1294768&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java
Tue Feb 28 18:36:00 2012
@@ -18,21 +18,6 @@ package org.apache.directmemory.server.s
* under the License.
*/
-import static java.lang.Integer.getInteger;
-import static org.apache.directmemory.DirectMemory.DEFAULT_CONCURRENCY_LEVEL;
-import static org.apache.directmemory.DirectMemory.DEFAULT_INITIAL_CAPACITY;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.MediaType;
-
import org.apache.commons.lang.StringUtils;
import org.apache.directmemory.DirectMemory;
import org.apache.directmemory.cache.CacheService;
@@ -43,6 +28,20 @@ import org.apache.directmemory.server.co
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static java.lang.Integer.getInteger;
+import static org.apache.directmemory.DirectMemory.DEFAULT_CONCURRENCY_LEVEL;
+import static org.apache.directmemory.DirectMemory.DEFAULT_INITIAL_CAPACITY;
+
/**
* TODO add some listener plugin mechanism to store figures/statistics on
cache access
*
@@ -67,14 +66,11 @@ public class DirectMemoryServlet
// TODO some configuration for cacheService.init( .... ); different
from sysproperties
//int numberOfBuffers, int size, int initialCapacity, int
concurrencyLevel
- cacheService = new DirectMemory<Object, Object>()
- .setNumberOfBuffers( getInteger(
"directMemory.numberOfBuffers", 1000 ) )
- .setSize( getInteger( "directMemory.size", 10 ) )
- .setInitialCapacity( getInteger(
"directMemory.initialCapacity",
-
DEFAULT_INITIAL_CAPACITY ) )
- .setConcurrencyLevel( getInteger(
"directMemory.concurrencyLevel",
-
DEFAULT_CONCURRENCY_LEVEL ) )
- .newCacheService();
+ cacheService = new DirectMemory<Object, Object>().setNumberOfBuffers(
+ getInteger( "directMemory.numberOfBuffers", 1000 ) ).setSize(
+ getInteger( "directMemory.size", 10 ) ).setInitialCapacity(
+ getInteger( "directMemory.initialCapacity",
DEFAULT_INITIAL_CAPACITY ) ).setConcurrencyLevel(
+ getInteger( "directMemory.concurrencyLevel",
DEFAULT_CONCURRENCY_LEVEL ) ).newCacheService();
//
@@ -83,6 +79,8 @@ public class DirectMemoryServlet
contentTypeHandlers.put(
DirectMemoryHttpConstants.JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER,
new JavaSerializedContentTypeHandler() );
contentTypeHandlers.put( MediaType.TEXT_PLAIN, new
TextPlainContentTypeHandler() );
+ log.info( "DirectMemoryServlet initialized" );
+
}
@Override
